Merge pull request #1335 from tpaviot/review/pytst

Move test suite to pytest

Author: tpaviot

ci/conda/run_test.bat

@@ -1,5 +1,5 @@
 cd ..\work\test
-pytest
+pytest -sv
 mypy test_mypy_classic_occ_bottle.py
 python core_display_tkinter_unittest.py
 python core_display_pyqt5_unittest.py

ci/conda/run_test.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 if [ "$(uname)" == "Linux" ]; then
     cd ../work/test
-    pytest
+    pytest -sv
     mypy test_mypy_classic_occ_bottle.py
 fi

test/test_core_extend_dataexchange.py

@@ -18,7 +18,6 @@
 ##along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import unittest
 
 from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeTorus
 from OCC.Core.TopoDS import TopoDS_Compound
@@ -61,107 +60,113 @@ def get_test_fullname(filename):
 A_TOPODS_SHAPE = BRepPrimAPI_MakeTorus(200, 50).Shape()
 
 
-class TestExtendDataExchange(unittest.TestCase):
-    def check_is_file(self, filename):
-        self.assertTrue(os.path.isfile(filename))
+def check_is_file(filename):
+    assert os.path.isfile(filename)
 
-    def test_read_step_file(self):
-        read_step_file(STEP_AP203_SAMPLE_FILE)
-        read_step_file(STEP_AP214_SAMPLE_FILE)
 
-    def test_read_step_file_multiple_shape_as_root(self):
-        t = read_step_file(STEP_MULTIPLE_ROOT, as_compound=True)
-        self.assertTrue(isinstance(t, TopoDS_Compound))
+def test_read_step_file():
+    read_step_file(STEP_AP203_SAMPLE_FILE)
+    read_step_file(STEP_AP214_SAMPLE_FILE)
 
-        l = read_step_file(STEP_MULTIPLE_ROOT, as_compound=False)
-        self.assertEqual(len(l), 3)
 
-    def test_read_step_file_names_colors(self):
-        read_step_file_with_names_colors(STEP_AP203_SAMPLE_FILE)
-        read_step_file_with_names_colors(STEP_AP214_SAMPLE_FILE)
+def test_read_step_file_multiple_shape_as_root():
+    t = read_step_file(STEP_MULTIPLE_ROOT, as_compound=True)
+    assert isinstance(t, TopoDS_Compound)
 
-    def test_read_iges_file(self):
-        read_iges_file(IGES_SAMPLE_FILE)
+    l = read_step_file(STEP_MULTIPLE_ROOT, as_compound=False)
+    assert len(l) == 3
 
-    def test_read_iges_45_shapes(self):
-        all_shapes = read_iges_file(
-            IGES_45_FACES, return_as_shapes=True, verbosity=True
-        )
-        self.assertEqual(len(all_shapes), 45)
 
-    def test_read_iges_45_shapes_as_one_compound(self):
-        shapes = read_iges_file(IGES_45_FACES, return_as_shapes=False, verbosity=True)
-        self.assertEqual(len(shapes), 1)
-        self.assertIsInstance(shapes[0], TopoDS_Compound)
-        topo_explorer = TopologyExplorer(shapes[0])
-        self.assertEqual(topo_explorer.number_of_faces(), 45)
+def test_read_step_file_names_colors():
+    read_step_file_with_names_colors(STEP_AP203_SAMPLE_FILE)
+    read_step_file_with_names_colors(STEP_AP214_SAMPLE_FILE)
 
-    def test_read_stl_file(self):
-        read_stl_file(STL_ASCII_SAMPLE_FILE)
-        read_stl_file(STL_BINARY_SAMPLE_FILE)
 
-    def test_export_shape_to_svg(self):
-        svg_filename = get_test_fullname("sample.svg")
-        export_shape_to_svg(A_TOPODS_SHAPE, svg_filename)
-        self.check_is_file(svg_filename)
+def test_read_iges_file():
+    read_iges_file(IGES_SAMPLE_FILE)
 
-    def test_read_gltf_ascii_file(self):
-        shp = read_gltf_file(GLTF_ASCII_SAMPLE_FILE)
 
-    def test_read_gltf_binary_file(self):
-        shp = read_gltf_file(GLTF_BINARY_SAMPLE_FILE)
+def test_read_iges_45_shapes():
+    all_shapes = read_iges_file(IGES_45_FACES, return_as_shapes=True, verbosity=True)
+    assert len(all_shapes) == 45
 
-    def test_write_step_ap203(self):
-        ap203_filename = get_test_fullname("sample_ap_203.stp")
-        write_step_file(A_TOPODS_SHAPE, ap203_filename, application_protocol="AP203")
-        self.check_is_file(ap203_filename)
 
-    def test_write_step_ap214(self):
-        as214_filename = get_test_fullname("sample_214.stp")
-        write_step_file(A_TOPODS_SHAPE, as214_filename, application_protocol="AP214IS")
-        self.check_is_file(as214_filename)
+def test_read_iges_45_shapes_as_one_compound():
+    shapes = read_iges_file(IGES_45_FACES, return_as_shapes=False, verbosity=True)
+    assert len(shapes) == 1
+    assert isinstance(shapes[0], TopoDS_Compound)
+    topo_explorer = TopologyExplorer(shapes[0])
+    assert topo_explorer.number_of_faces() == 45
 
-    def test_write_step_ap242(self):
-        ap242_filename = get_test_fullname("sample_242.stp")
-        write_step_file(A_TOPODS_SHAPE, ap242_filename, application_protocol="AP242DIS")
-        self.check_is_file(ap242_filename)
 
-    def test_write_iges(self):
-        iges_filename = get_test_fullname("sample.igs")
-        write_iges_file(A_TOPODS_SHAPE, iges_filename)
-        self.check_is_file(iges_filename)
+def test_read_stl_file():
+    read_stl_file(STL_ASCII_SAMPLE_FILE)
+    read_stl_file(STL_BINARY_SAMPLE_FILE)
 
-    def test_stl_ascii(self):
-        stl_ascii_filename = get_test_fullname("sample_ascii.stl")
-        write_stl_file(A_TOPODS_SHAPE, stl_ascii_filename, mode="ascii")
-        self.check_is_file(stl_ascii_filename)
 
-    def test_stl_binary(self):
-        stl_binary_filename = get_test_fullname("sample_binary.stl")
-        write_stl_file(A_TOPODS_SHAPE, stl_binary_filename, mode="binary")
-        self.check_is_file(stl_binary_filename)
+def test_export_shape_to_svg():
+    svg_filename = get_test_fullname("sample.svg")
+    export_shape_to_svg(A_TOPODS_SHAPE, svg_filename)
+    check_is_file(svg_filename)
 
-    def test_write_ply(self):
-        ply_filename = get_test_fullname("sample.ply")
-        write_ply_file(A_TOPODS_SHAPE, ply_filename)
-        self.check_is_file(ply_filename)
 
-    def test_write_obj(self):
-        obj_filename = get_test_fullname("sample.obj")
-        write_obj_file(A_TOPODS_SHAPE, obj_filename)
-        self.check_is_file(obj_filename)
+def test_read_gltf_ascii_file():
+    shp = read_gltf_file(GLTF_ASCII_SAMPLE_FILE)
 
-    def test_write_gltf(self):
-        gltf_filename = get_test_fullname("sample.gltf")
-        write_gltf_file(A_TOPODS_SHAPE, gltf_filename)
-        self.check_is_file(gltf_filename)
 
+def test_read_gltf_binary_file():
+    shp = read_gltf_file(GLTF_BINARY_SAMPLE_FILE)
 
-def suite():
-    test_suite = unittest.TestSuite()
-    test_suite.addTest(unittest.makeSuite(TestExtendDataExchange))
-    return test_suite
-
-
-if __name__ == "__main__":
-    unittest.main()
+
+def test_write_step_ap203():
+    ap203_filename = get_test_fullname("sample_ap_203.stp")
+    write_step_file(A_TOPODS_SHAPE, ap203_filename, application_protocol="AP203")
+    check_is_file(ap203_filename)
+
+
+def test_write_step_ap214():
+    as214_filename = get_test_fullname("sample_214.stp")
+    write_step_file(A_TOPODS_SHAPE, as214_filename, application_protocol="AP214IS")
+    check_is_file(as214_filename)
+
+
+def test_write_step_ap242():
+    ap242_filename = get_test_fullname("sample_242.stp")
+    write_step_file(A_TOPODS_SHAPE, ap242_filename, application_protocol="AP242DIS")
+    check_is_file(ap242_filename)
+
+
+def test_write_iges():
+    iges_filename = get_test_fullname("sample.igs")
+    write_iges_file(A_TOPODS_SHAPE, iges_filename)
+    check_is_file(iges_filename)
+
+
+def test_stl_ascii():
+    stl_ascii_filename = get_test_fullname("sample_ascii.stl")
+    write_stl_file(A_TOPODS_SHAPE, stl_ascii_filename, mode="ascii")
+    check_is_file(stl_ascii_filename)
+
+
+def test_stl_binary():
+    stl_binary_filename = get_test_fullname("sample_binary.stl")
+    write_stl_file(A_TOPODS_SHAPE, stl_binary_filename, mode="binary")
+    check_is_file(stl_binary_filename)
+
+
+def test_write_ply():
+    ply_filename = get_test_fullname("sample.ply")
+    write_ply_file(A_TOPODS_SHAPE, ply_filename)
+    check_is_file(ply_filename)
+
+
+def test_write_obj():
+    obj_filename = get_test_fullname("sample.obj")
+    write_obj_file(A_TOPODS_SHAPE, obj_filename)
+    check_is_file(obj_filename)
+
+
+def test_write_gltf():
+    gltf_filename = get_test_fullname("sample.gltf")
+    write_gltf_file(A_TOPODS_SHAPE, gltf_filename)
+    check_is_file(gltf_filename)

test/test_core_extend_shapefactory.py

@@ -37,67 +37,62 @@
 )
 from OCC.Extend.TopologyUtils import TopologyExplorer
 
+import pytest
 
-class TestExtendShapeFactory(unittest.TestCase):
-    def test_midpoint(self):
-        p1 = gp_Pnt(0, 0, 0)
-        p2 = gp_Pnt(4, 5, 6)
-        p3 = midpoint(p1, p2)
-        self.assertEqual([p3.X(), p3.Y(), p3.Z()], [2, 2.5, 3.0])
 
-    def test_measure_shape_volume(self):
-        # first the colume of a box a,b,c should be a*b*c
-        a = 10.0
-        b = 23.0
-        c = 98.1
-        box = BRepPrimAPI_MakeBox(a, b, c).Shape()
-        box_volume = measure_shape_volume(box)
-        self.assertAlmostEqual(box_volume, a * b * c, places=6)
-        # for a sphere of radius r, it should be 4/3.pi.r^3
-        r = 9.8775  # a random radius
-        sph = BRepPrimAPI_MakeSphere(r).Shape()
-        sph_volume = measure_shape_volume(sph)
-        self.assertAlmostEqual(sph_volume, 4.0 / 3.0 * math.pi * r**3, places=6)
+def test_midpoint():
+    p1 = gp_Pnt(0, 0, 0)
+    p2 = gp_Pnt(4, 5, 6)
+    p3 = midpoint(p1, p2)
+    assert [p3.X(), p3.Y(), p3.Z()] == [2, 2.5, 3.0]
 
-    def test_scale_shape(self):
-        box = BRepPrimAPI_MakeBox(10.0, 10.0, 10.0).Shape()
-        box2 = scale_shape(box, 2.0, 1.0, 1.0)
-        # volume should be double
-        box2_volume = measure_shape_volume(box2)
-        self.assertAlmostEqual(box2_volume, 2000.0, places=6)
 
-    def test_measure_shape_center_of_gravity(self):
-        # we compute the cog of a sphere centered at a point P
-        # then the cog must be P
-        x, y, z = 10.0, 3.0, -2.44  # random values for point P
-        radius = 20.0
-        vector = gp_Vec(x, y, z)
-        sph = translate_shp(BRepPrimAPI_MakeSphere(radius).Shape(), vector)
-        cog, mass, mass_property = measure_shape_mass_center_of_gravity(sph)
-        self.assertAlmostEqual(cog.X(), x, places=6)
-        self.assertAlmostEqual(cog.Y(), y, places=6)
-        self.assertAlmostEqual(cog.Z(), z, places=6)
-        self.assertAlmostEqual(mass, 4 / 3 * math.pi * radius**3, places=6)
-        self.assertEqual(mass_property, "Volume")
+def test_measure_shape_volume():
+    # first the colume of a box a,b,c should be a*b*c
+    a = 10.0
+    b = 23.0
+    c = 98.1
+    box = BRepPrimAPI_MakeBox(a, b, c).Shape()
+    box_volume = measure_shape_volume(box)
+    assert box_volume == pytest.approx(box_volume, a * b * c)
+    # for a sphere of radius r, it should be 4/3.pi.r^3
+    r = 9.8775  # a random radius
+    sph = BRepPrimAPI_MakeSphere(r).Shape()
+    sph_volume = measure_shape_volume(sph)
+    assert sph_volume == pytest.approx(4.0 / 3.0 * math.pi * r**3)
 
-    def test_edge_to_bezier(self):
-        b = BRepPrimAPI_MakeTorus(30, 10).Shape()
-        t = TopologyExplorer(b)
-        for ed in t.edges():
-            is_bezier, bezier_curve, degree = edge_to_bezier(ed)
-            self.assertTrue(isinstance(is_bezier, bool))
-            if not is_bezier:
-                self.assertTrue(degree is None)
-                self.assertTrue(bezier_curve is None)
-            else:
-                self.assertTrue(isinstance(degree, int))
 
+def test_scale_shape():
+    box = BRepPrimAPI_MakeBox(10.0, 10.0, 10.0).Shape()
+    box2 = scale_shape(box, 2.0, 1.0, 1.0)
+    # volume should be double
+    box2_volume = measure_shape_volume(box2)
+    assert pytest.approx(box2_volume) == 2000.0
 
-def suite():
-    test_suite = unittest.TestSuite()
-    test_suite.addTest(unittest.makeSuite(TestExtendShapeFactory))
-    return test_suite
 
+def test_measure_shape_center_of_gravity():
+    # we compute the cog of a sphere centered at a point P
+    # then the cog must be P
+    x, y, z = 10.0, 3.0, -2.44  # random values for point P
+    radius = 20.0
+    vector = gp_Vec(x, y, z)
+    sph = translate_shp(BRepPrimAPI_MakeSphere(radius).Shape(), vector)
+    cog, mass, mass_property = measure_shape_mass_center_of_gravity(sph)
+    assert cog.X() == pytest.approx(x)
+    assert cog.Y() == pytest.approx(y)
+    assert cog.Z() == pytest.approx(z)
+    assert mass == pytest.approx(4 / 3 * math.pi * radius**3)
+    assert mass_property == "Volume"
 
-if __name__ == "__main__":
-    unittest.main()
+
+def test_edge_to_bezier():
+    b = BRepPrimAPI_MakeTorus(30, 10).Shape()
+    t = TopologyExplorer(b)
+    for ed in t.edges():
+        is_bezier, bezier_curve, degree = edge_to_bezier(ed)
+        assert isinstance(is_bezier, bool)
+        if not is_bezier:
+            assert degree is None
+            assert bezier_curve is None
+        else:
+            assert isinstance(degree, int)