converted to roundtrip test

OpenSAGE · Feb 4, 2020 · 830a494 · 830a494
1 parent bb21110
commit 830a494
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/io_mesh_w3d/import_utils.py b/io_mesh_w3d/import_utils.py
@@ -18,8 +18,6 @@ def insensitive_path(path):
     directory = os.path.dirname(path)
     name = os.path.basename(path)
 
-    print(directory)
-    print(name)
     for io_streamname in os.listdir(directory):
         if io_streamname.lower() == name.lower():
             path = os.path.join(directory, io_streamname)

diff --git a/tests/shared/cases/test_import_utils.py b/tests/shared/cases/test_import_utils.py
@@ -44,16 +44,6 @@ def test_invalid_texture_file_extension(self):
             bpy.ops.wm.read_homefile(use_empty=True)
             os.remove(self.outpath() + 'texture' + extension)
 
-    def test_duplicate_shader_material_creation(self):
-        shader_mats = [get_shader_material(), get_shader_material()]
-
-        print('################## test')
-        for mat in shader_mats:
-            create_material_from_shader_material(self, 'meshName', mat)
-
-        self.assertEqual(1, len(bpy.data.materials))
-        self.assertTrue('meshName.ShaderMaterial.fx' in bpy.data.materials)
-
     def test_parent_is_none_if_parent_index_is_0_or_less_than_0(self):
         hlod = get_hlod()
         hierarchy = get_hierarchy()

diff --git a/tests/shared/cases/test_utils.py b/tests/shared/cases/test_utils.py
@@ -47,17 +47,35 @@ def test_vertex_material_no_attributes_roundtrip(self):
 
     def test_shader_material_roundtrip(self):
         mesh = get_mesh()
+        mesh.shader_materials = [get_shader_material()]
 
         copyfile(up(up(self.relpath())) + '/testfiles/texture.dds',
                  self.outpath() + 'texture.dds')
 
         for source in mesh.shader_materials:
             (material, _) = create_material_from_shader_material(
-                self, mesh, source)
-            principled = retrieve_principled_bsdf(material)
+                self, mesh.name(), source)
+            principled = node_shader_utils.PrincipledBSDFWrapper(material, is_readonly=True)
             actual = retrieve_shader_material(material, principled)
             compare_shader_materials(self, source, actual)
 
+    def test_duplicate_shader_material_roundtrip(self):
+        mesh = get_mesh()
+        mesh.shader_materials = [get_shader_material(), get_shader_material()]
+
+        materials = []
+        for mat in mesh.shader_materials:
+            (material, _) = create_material_from_shader_material(self, 'meshName', mat)
+            materials.append(material)
+
+        self.assertEqual(1, len(bpy.data.materials))
+        self.assertTrue('meshName.ShaderMaterial.fx' in bpy.data.materials)
+
+        for expected in mesh.shader_materials:
+            principled = node_shader_utils.PrincipledBSDFWrapper(material, is_readonly=True)
+            actual = retrieve_shader_material(material, principled)
+            compare_shader_materials(self, expected, actual)
+
     def test_shader_material_w3x_roundtrip(self):
         mesh = get_mesh()
         mesh.shader_materials = [get_shader_material(w3x=True)]