diff --git a/resources/definitions/cubicon_3dp_110f.def.json b/resources/definitions/cubicon_3dp_110f.def.json index 8f7f2a48b0..168b57cd66 100644 --- a/resources/definitions/cubicon_3dp_110f.def.json +++ b/resources/definitions/cubicon_3dp_110f.def.json @@ -8,7 +8,6 @@ "manufacturer": "Cubicon", "visible": true, "file_formats": "text/x-gcode", - "platform": "", "supports_usb_connection": false, "machine_extruder_trains": { "0": "cubicon_3dp_110f_extruder_0" diff --git a/resources/definitions/cubicon_3dp_210f.def.json b/resources/definitions/cubicon_3dp_210f.def.json index 852af1d4a0..cc99899f92 100644 --- a/resources/definitions/cubicon_3dp_210f.def.json +++ b/resources/definitions/cubicon_3dp_210f.def.json @@ -8,7 +8,6 @@ "manufacturer": "Cubicon", "visible": true, "file_formats": "text/x-gcode", - "platform": "", "supports_usb_connection": false, "machine_extruder_trains": { "0": "cubicon_3dp_210f_extruder_0" diff --git a/resources/definitions/cubicon_3dp_310f.def.json b/resources/definitions/cubicon_3dp_310f.def.json index e58849fba5..90d0e3f25c 100644 --- a/resources/definitions/cubicon_3dp_310f.def.json +++ b/resources/definitions/cubicon_3dp_310f.def.json @@ -8,7 +8,6 @@ "manufacturer": "Cubicon", "visible": true, "file_formats": "text/x-gcode", - "platform": "", "supports_usb_connection": false, "machine_extruder_trains": { "0": "cubicon_3dp_310f_extruder_0" diff --git a/resources/definitions/delta_go.def.json b/resources/definitions/delta_go.def.json index 968bf281a5..cd1fb180c2 100644 --- a/resources/definitions/delta_go.def.json +++ b/resources/definitions/delta_go.def.json @@ -8,7 +8,6 @@ "manufacturer": "Deltaprintr", "file_formats": "text/x-gcode", "platform_offset": [0, 0, 0], - "platform": "", "machine_extruder_trains": { "0": "delta_go_extruder_0" diff --git a/resources/definitions/printrbot_play_heated.def.json b/resources/definitions/printrbot_play_heated.def.json index 680496bf56..7987f55010 100644 --- a/resources/definitions/printrbot_play_heated.def.json +++ b/resources/definitions/printrbot_play_heated.def.json @@ -7,7 +7,6 @@ "author": "Chris Pearson", "manufacturer": "Printrbot", "file_formats": "text/x-gcode", - "platform": "", "machine_extruder_trains": { "0": "printrbot_play_heated_extruder_0" diff --git a/resources/definitions/ubuild-3d_mr_bot_280.def.json b/resources/definitions/ubuild-3d_mr_bot_280.def.json index 29ffa4cd6f..7eb65c3e78 100644 --- a/resources/definitions/ubuild-3d_mr_bot_280.def.json +++ b/resources/definitions/ubuild-3d_mr_bot_280.def.json @@ -9,7 +9,6 @@ "manufacturer": "uBuild-3D", "category": "Other", "file_formats": "text/x-gcode", - "platform": "mr_bot_280_platform.stl", "has_materials": true, "preferred_quality_type": "draft", "machine_extruder_trains": diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index c6dba27b23..e4a993c26a 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -18,7 +18,8 @@ Resources.addSearchPath(os.path.abspath(os.path.join(os.path.dirname(__file__), machine_filepaths = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "definitions")) - +all_meshes = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "meshes")) +all_images = os.listdir(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "images")) @pytest.fixture def definition_container(): @@ -44,5 +45,13 @@ def isDefinitionValid(definition_container, path, file_name): parser, is_valid = definition_container.readAndValidateSerialized(json) if not is_valid: print("The definition '{0}', has invalid data.".format(file_name)) + metadata = DefinitionContainer.deserializeMetadata(json, "whatever") + + # If the definition defines a platform file, it should be in /resources/meshes/ + if "platform" in metadata[0]: + assert metadata[0]["platform"] in all_meshes + + if "platform_texture" in metadata[0]: + assert metadata[0]["platform_texture"] in all_images return is_valid diff --git a/tests/Settings/TestProfiles.py b/tests/Settings/TestProfiles.py index 3d6b158205..cea797bd1c 100644 --- a/tests/Settings/TestProfiles.py +++ b/tests/Settings/TestProfiles.py @@ -41,6 +41,7 @@ def collectAllSettingIds(): definition_container.deserialize(data.read()) return definition_container.getAllKeys() + def collectAllVariants(): result = [] for root, directories, filenames in os.walk(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "resources", "variants"))):