Merge pull request #258 from ndem0/fix-tests

Fix not running test

Author: ndem0

tests/test_custom_deformation.py

@@ -1,12 +1,9 @@
-import filecmp
-import os
 from unittest import TestCase
 
 import numpy as np
 from pygem import CustomDeformation
 
 
-
 class TestCustomDeformation(TestCase):
     def get_cube_mesh_points(self):
         # Points that define a cube
@@ -23,13 +20,15 @@ def get_cube_mesh_points(self):
     def test_class_members_func(self):
         def move(x):
             return x + x**2
-        deform = CustomDeformation(move)
+        CustomDeformation(move)
 
     def test_ffd_sphere_mod(self):
         def move(x):
             x0, x1, x2 = x
             return [x0**2, x1, x2]
         deform = CustomDeformation(move)
-        mesh_points = self.get_cube_mesh_points() 
+        mesh_points = self.get_cube_mesh_points()
         mesh_points_test = deform(mesh_points)
+        mesh_points_ref = mesh_points.copy()
+        mesh_points_ref[:, 0] **= 2
         np.testing.assert_array_almost_equal(mesh_points_test, mesh_points_ref)

tests/test_custom_deformation_cad.py

@@ -1,29 +1,23 @@
-import filecmp
-import os
 from unittest import TestCase
 
 import numpy as np
 from pygem.cad import CustomDeformation
 from pygem.cad import CADDeformation
 
 
-
 class TestCustomDeformation(TestCase):
 
     def test_class_members_func(self):
         def move(x):
             return x + x**2
         deform = CustomDeformation(move)
 
-    def test_ffd_sphere_mod(self):
+    def test_customdeform_cad_type(self):
         def move(x):
             x0, x1, x2 = x
             return [x0**2, x1, x2]
         filename = 'tests/test_datasets/test_pipe_hollow.iges'
         orig_shape = CADDeformation.read_shape(filename)
         deform = CustomDeformation(move)
         new_shape = deform(orig_shape)
-        assert False
-        mesh_points = self.get_cube_mesh_points() 
-        mesh_points_test = deform(mesh_points)
-        np.testing.assert_array_almost_equal(mesh_points_test, mesh_points_ref)
+        assert type(new_shape) == type(orig_shape)

tests/test_ffdcad.py

@@ -47,9 +47,8 @@ def test_ffd_iges_pipe_mod_through_topods_shape(self):
                  cre_ = np.asarray(cre[i].split(',')[:-1], dtype=float)
                  np.testing.assert_array_almost_equal(cre_, ref_, decimal=6)
         self.addCleanup(os.remove, 'test_pipe_hollow_result.iges')
-        
-        
-        
+
+    """
     def test_ffd_step_pipe_mod_through_files(self):
         ffd = FFD(None,30,30,30,1e-4)
         ffd.read_parameters(
@@ -65,3 +64,5 @@ def test_ffd_step_pipe_mod_through_files(self):
                  cre_ = np.asarray(re.findall(r"[+-]? *(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?", cre[i]),dtype=float)
                  np.testing.assert_array_almost_equal(cre_, ref_, decimal=6)
         self.addCleanup(os.remove, 'test_pipe_result.step')
+    """
+