Skip to content

Commit

Permalink
Add test_json_product_assembly test cases - (Task #5)
Browse files Browse the repository at this point in the history 
Add:
- test_create_part_product_subassembly_with_root_part
- test_create_part_product_assembly_and_subassembly_with_root_part
- test_create_part_product_assembly_with_root_part_with_traverser (empty
test)

---
Task #5: Implement Import Functionality
  • Loading branch information
JAmmermann-DLR committed Nov 28, 2019
1 parent abbaab2 commit 5e03847
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 44 deletions.
3 changes: 3 additions & 0 deletions VirtualSatelliteCAD/json_io/json_definitions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@

RAD_TO_DEG = 180.0 / math.pi

JSON_PARTS = "Parts"
JSON_PRODUCTS = "Products"

JSON_ELEMENT_COLOR = "color"
JSON_ELEMENT_SHAPE = "shape"

Expand Down
77 changes: 52 additions & 25 deletions VirtualSatelliteCAD/test/json_io/products/test_json_product_assembly.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
from json_io.products.json_product_assembly import JsonProductAssembly
from freecad.active_document import ActiveDocument
from test.json_io.test_json_data import TEST_JSON_PRODUCT_WITH_CHILDREN,\
TEST_JSON_PRODUCT_WITHOUT_CHILDREN, TEST_JSON_PRODUCT_WITH_CHILD_WITH_CHILD
TEST_JSON_PRODUCT_WITHOUT_CHILDREN, TEST_JSON_PRODUCT_WITH_CHILDREN_WITH_CHILD


App = FreeCAD
Expand Down Expand Up @@ -91,27 +91,12 @@ def test_parse_with_children(self):

self.assertEqual(json_product_child_2.pos_x, 0, "Property is correctly set")
self.assertEqual(json_product_child_2.pos_y, 0, "Property is correctly set")
self.assertEqual(json_product_child_2.pos_z, 0.5, "Property is correctly set")
self.assertEqual(json_product_child_2.pos_z, 500.0, "Property is correctly set")

self.assertEqual(json_product_child_2.rot_x, 0.0, "Property is correctly set")
self.assertEqual(json_product_child_2.rot_y, 0.0, "Property is correctly set")
self.assertEqual(json_product_child_2.rot_z, 0.0, "Property is correctly set")

def test_parse_with_child_with_child(self):
# Same json as in test_parse_with_children, but BasePlateTop is now child of BasePlateBottom2

json_object = json.loads(TEST_JSON_PRODUCT_WITH_CHILD_WITH_CHILD)
json_product = JsonProductAssembly().parse_from_json(json_object)

# Check for the children
self.assertEquals(len(json_product.children), 1, "Parsed one children")

json_product_child_1 = json_product.children[0]
self.assertEqual(json_product_child_1.name, "BasePlateBottom2", "Parsed correct child")

json_product_child_2 = json_product_child_1.children[0]
self.assertEqual(json_product_child_2.name, "BasePlateTop", "Parsed correct child")

def test_parse_with_no_children(self):
json_data = TEST_JSON_PRODUCT_WITHOUT_CHILDREN

Expand Down Expand Up @@ -149,12 +134,54 @@ def test_create_part_product_assembly_with_root_part(self):
product_object = active_document.app_active_document.getObjectsByLabel(product_child2_part_name)[0]
self.assertIsNotNone(product_object, "Found an object under the given part name")

def test_create_part_product_subassembly_with_root_part(self):
json_data = TEST_JSON_PRODUCT_WITH_CHILDREN_WITH_CHILD
self.create_Test_Part()

active_document = ActiveDocument(self._WORKING_DIRECTORY).open_set_and_get_document("ProductSubassemblyRootPart")

json_object = json.loads(json_data)

subassembly = json_object["children"][0]
json_product = JsonProductAssembly().parse_from_json(subassembly)

json_product.write_to_freecad(active_document)
active_document.save_as("ProductSubassemblyRootPart")

# find the object by its label there should be two objects identifiable in the current export
self.assertEquals(len(json_product.children), 1, "correct amount of children")
self.assertEquals(len(active_document.app_active_document.RootObjects), 4, "Found correct amount of root objects 2 objects plus 2 sheets")

product_part_name = json_product.get_unique_name()
product_object = active_document.app_active_document.getObjectsByLabel(product_part_name)[0]
self.assertIsNotNone(product_object, "Found an object under the given part name")

product_child1_part_name = json_product.children[0].get_unique_name()
product_object = active_document.app_active_document.getObjectsByLabel(product_child1_part_name)[0]
self.assertIsNotNone(product_object, "Found an object under the given part name")

# TODO:
def test_create_part_product_assembly_and_subassembly_with_root_part(self):
json_data = TEST_JSON_PRODUCT_WITH_CHILDREN_WITH_CHILD
self.create_Test_Part()

json_object = json.loads(json_data)

subassembly = json_object["children"][0]

active_document = ActiveDocument(self._WORKING_DIRECTORY).open_set_and_get_document("BasePlateBottom2_e8794f3d_86ec_44c5_9618_8b7170c45484")

json_product = JsonProductAssembly().parse_from_json(subassembly)
json_product.write_to_freecad(active_document)
active_document.save_as("BasePlateBottom2_e8794f3d_86ec_44c5_9618_8b7170c45484")

# TODO: this assembly now has to use the other assembly
active_document = ActiveDocument(self._WORKING_DIRECTORY).open_set_and_get_document("ProductAssemblyAndSubassemblyRootPart")

json_product = JsonProductAssembly().parse_from_json(json_object)
json_product.write_to_freecad(active_document)
active_document.save_as("ProductAssemblyAndSubassemblyRootPart")

# TODO:
# test same json as above but with subassembvly as assemblychid

#TODO:
# test same as above, first create subassembly then with that the assembly

#TODO:
# test same as above, but with automated tree traverser
# TODO:
def test_create_part_product_assembly_with_root_part_with_traverser(self):
pass
52 changes: 33 additions & 19 deletions VirtualSatelliteCAD/test/json_io/test_json_data.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,14 @@
}
"""

TEST_JSON_PRODUCT_WITH_CHILD_WITH_CHILD = """{
TEST_JSON_PRODUCT_WITH_CHILDREN_WITH_CHILD = """{
"name": "BasePlateBottom1",
"uuid": "e8794f3d-86ec-44c5-9618-8b7170c45484",
"partUuid": "3d3708fd-5c6c-4af9-b710-d68778466084",
"partName": "BasePlate",
"posX": 10.0,
"posY": 15.0,
"posZ": 20.0,
"posX": 1.0,
"posY": 2.0,
"posZ": 3.0,
"rotX": 0.349,
"rotY": 0.698,
"rotZ": 1.046,
Expand All @@ -154,27 +154,41 @@
"posZ": 0.0,
"rotX": 0.0,
"children": [
{
"posX": 0.0,
"posY": 0.0,
"posZ": 0.5,
"rotX": 0.0,
"children": [
],
"rotZ": 0.0,
"rotY": 0.0,
"name": "BasePlateTop",
"uuid": "a199e3bd-3bc1-426d-8321-e9bd829339b3",
"partUuid": "3d3708fd-5c6c-4af9-b710-d68778466084",
"partName": "BasePlate"
}
{
"posX": 0.5,
"posY": 0.5,
"posZ": 0.5,
"rotX": 0.0,
"children": [
],
"rotZ": 0.0,
"rotY": 0.0,
"name": "BasePlateBottom3",
"uuid": "e8794f3d-86ec-44c5-9618-8b7170c45485",
"partUuid": "3d3708fd-5c6c-4af9-b710-d68778466084",
"partName": "BasePlate"
}
],
"rotZ": 0.0,
"rotZ": 0.3490659,
"rotY": 0.0,
"name": "BasePlateBottom2",
"uuid": "e8794f3d-86ec-44c5-9618-8b7170c45484",
"partUuid": "3d3708fd-5c6c-4af9-b710-d68778466084",
"partName": "BasePlate"
},
{
"posX": 0.0,
"posY": 0.0,
"posZ": 0.5,
"rotX": 0.0,
"children": [
],
"rotZ": 0.0,
"rotY": 0.0,
"name": "BasePlateTop",
"uuid": "a199e3bd-3bc1-426d-8321-e9bd829339b3",
"partUuid": "3d3708fd-5c6c-4af9-b710-d68778466084",
"partName": "BasePlate"
}
]
}
Expand Down

0 comments on commit 5e03847

Please sign in to comment.