From: mzn Date: Fri, 20 Jul 2018 10:52:56 +0000 (+0300) Subject: Rename checkBooleansResult to checkResult. X-Git-Tag: SHAPER_V9_1_0RC1~115 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b54b14804853fc7d2f8852d3d533088caa8f8b53;p=modules%2Fshaper.git Rename checkBooleansResult to checkResult. --- diff --git a/src/BuildPlugin/Test/TestCompSolid.py b/src/BuildPlugin/Test/TestCompSolid.py index 824358d77..24fe6bda5 100644 --- a/src/BuildPlugin/Test/TestCompSolid.py +++ b/src/BuildPlugin/Test/TestCompSolid.py @@ -148,7 +148,7 @@ expectType1 = [GeomAPI_Shape.SHAPE, GeomAPI_Shape.COMPSOLID] CompSolid_1 = createCompSolidStepByStep(boundaries1, expectType1) -model.checkBooleansResult(CompSolid_1, model, 1, [2], [2], [13], [54], [108]) +model.checkResult(CompSolid_1, model, 1, [2], [2], [13], [54], [108]) model.testHaveNamingSubshapes(CompSolid_1, model, Part_1_doc) # ============================================================================= @@ -178,7 +178,7 @@ expectType2 = [GeomAPI_Shape.SHAPE, GeomAPI_Shape.COMPSOLID] CompSolid_2 = createCompSolidStepByStep(boundaries2, expectType2) -model.checkBooleansResult(CompSolid_2, model, 1, [3], [3], [21], [88], [176]) +model.checkResult(CompSolid_2, model, 1, [3], [3], [21], [88], [176]) model.testHaveNamingSubshapes(CompSolid_2, model, Part_1_doc) model.end() diff --git a/src/BuildPlugin/Test/TestCompound.py b/src/BuildPlugin/Test/TestCompound.py index 6a25a8ec7..c55dda70f 100644 --- a/src/BuildPlugin/Test/TestCompound.py +++ b/src/BuildPlugin/Test/TestCompound.py @@ -84,7 +84,7 @@ Compound_1_objects = [model.selection("VERTEX", "Sketch_1/Vertex-SketchPoint_1") Compound_1 = model.addCompound(Part_1_doc, Compound_1_objects) model.do() -model.checkBooleansResult(Compound_1, model, 1, [11], [3], [22], [92], [186]) +model.checkResult(Compound_1, model, 1, [11], [3], [22], [92], [186]) model.end() diff --git a/src/BuildPlugin/Test/TestInterpolation.py b/src/BuildPlugin/Test/TestInterpolation.py index 805e6f97a..abeda2393 100644 --- a/src/BuildPlugin/Test/TestInterpolation.py +++ b/src/BuildPlugin/Test/TestInterpolation.py @@ -58,7 +58,7 @@ Tangent_2 = model.selection("EDGE", "Sketch_1/Edge-SketchLine_2") Interpolation_1 = model.addInterpolation(Part_1_doc, [p_1, p_2, p_3, p_4, p_5], False, False) model.do() -model.checkBooleansResult(Interpolation_1, model, 1, [0], [0], [0], [1], [2]) +model.checkResult(Interpolation_1, model, 1, [0], [0], [0], [1], [2]) # # ============================================================================= # # Test 2. Create curve 1-2-3-4-5-1, closed on, reorder off, without tangents @@ -66,7 +66,7 @@ model.checkBooleansResult(Interpolation_1, model, 1, [0], [0], [0], [1], [2]) Interpolation_2 = model.addInterpolation(Part_1_doc, [p_1, p_2, p_3, p_4, p_5], True, False) model.do() -model.checkBooleansResult(Interpolation_2, model, 1, [0], [0], [0], [1], [2]) +model.checkResult(Interpolation_2, model, 1, [0], [0], [0], [1], [2]) # # ============================================================================= # # Test 3. Create curve 1-2-3-4, closed off, reorder on, without tangents @@ -74,7 +74,7 @@ model.checkBooleansResult(Interpolation_2, model, 1, [0], [0], [0], [1], [2]) Interpolation_3 = model.addInterpolation(Part_1_doc, [p_1, p_2, p_3, p_4], False, True) model.do() -model.checkBooleansResult(Interpolation_3, model, 1, [0], [0], [0], [1], [2]) +model.checkResult(Interpolation_3, model, 1, [0], [0], [0], [1], [2]) # ============================================================================= # Test 4. Create curve 1-2-3-5, closed on, reorder on, without tangents @@ -82,7 +82,7 @@ model.checkBooleansResult(Interpolation_3, model, 1, [0], [0], [0], [1], [2]) Interpolation_4 = model.addInterpolation(Part_1_doc, [p_1, p_2, p_3, p_5], True, True) model.do() -model.checkBooleansResult(Interpolation_4, model, 1, [0], [0], [0], [1], [2]) +model.checkResult(Interpolation_4, model, 1, [0], [0], [0], [1], [2]) # ============================================================================= # Test 5. Create curve 1-2-3-4-5, closed off, reorder off, with tangents @@ -92,7 +92,7 @@ Interpolation_5 = model.addInterpolation(Part_1_doc, [p_1, p_2, p_3, p_4, p_5], Tangent_1, Tangent_2, False, False) model.do() -model.checkBooleansResult(Interpolation_5, model, 1, [0], [0], [0], [1], [2]) +model.checkResult(Interpolation_5, model, 1, [0], [0], [0], [1], [2]) # ============================================================================= # Test 6. Try to create closed curve 1-2-1, closed off, reorder off, without tangents @@ -130,7 +130,7 @@ points = [model.selection("VERTEX", name) for name in point_names] Interpolation_8 = model.addInterpolation(Part_2_doc, points, False, False) model.do() -model.checkBooleansResult(Interpolation_8, model, 1, [0], [0], [0], [1], [2]) +model.checkResult(Interpolation_8, model, 1, [0], [0], [0], [1], [2]) # ============================================================================= # Test 9. Create curve on box vertices, closed off, reorder off, with tangents @@ -147,7 +147,7 @@ Interpolation_9 = model.addInterpolation(Part_3_doc, points, Tangent_1, Tangent_2, False, False) model.do() -model.checkBooleansResult(Interpolation_9, model, 1, [0], [0], [0], [1], [2]) +model.checkResult(Interpolation_9, model, 1, [0], [0], [0], [1], [2]) # ============================================================================= # Test 10. Create curve using equal vertices diff --git a/src/BuildPlugin/Test/TestPolyline.py b/src/BuildPlugin/Test/TestPolyline.py index 578da8db7..ba399cc54 100644 --- a/src/BuildPlugin/Test/TestPolyline.py +++ b/src/BuildPlugin/Test/TestPolyline.py @@ -51,7 +51,7 @@ p_1, p_2, p_3, p_4, p_5 = [model.selection("VERTEX", base_name + str(i + 1)) for Polyline_1 = model.addPolyline3D(Part_1_doc, [p_1, p_2, p_3, p_4, p_5], False) model.do() -model.checkBooleansResult(Polyline_1, model, 1, [0], [0], [0], [4], [4*2]) +model.checkResult(Polyline_1, model, 1, [0], [0], [0], [4], [4*2]) # ============================================================================= # Test 2. Create closed polyline 1-2-3-4-5-1 @@ -59,7 +59,7 @@ model.checkBooleansResult(Polyline_1, model, 1, [0], [0], [0], [4], [4*2]) Polyline_2 = model.addPolyline3D(Part_1_doc, [p_1, p_2, p_3, p_4, p_5], True) model.do() -model.checkBooleansResult(Polyline_2, model, 1, [0], [0], [0], [5], [5*2]) +model.checkResult(Polyline_2, model, 1, [0], [0], [0], [5], [5*2]) # ============================================================================= # Test 3. Try to create self-intersected unclosed polyline 2-5-4-1 @@ -113,7 +113,7 @@ points = [model.selection("VERTEX", name) for name in point_names] Polyline_7 = model.addPolyline3D(Part_2_doc, points, False) model.do() -model.checkBooleansResult(Polyline_7, model, 1, [0], [0], [0], [7], [7*2]) +model.checkResult(Polyline_7, model, 1, [0], [0], [0], [7], [7*2]) # ============================================================================= # Test 8. Create closed polyline on box vertices @@ -127,7 +127,7 @@ points = [model.selection("VERTEX", name) for name in point_names] Polyline_8 = model.addPolyline3D(Part_3_doc, points, True) model.do() -model.checkBooleansResult(Polyline_8, model, 1, [0], [0], [0], [8], [8*2]) +model.checkResult(Polyline_8, model, 1, [0], [0], [0], [8], [8*2]) # ============================================================================= # Test 9. Create polyline using equal vertices diff --git a/src/BuildPlugin/Test/TestSolid.py b/src/BuildPlugin/Test/TestSolid.py index 2c9672d53..245ec16fc 100644 --- a/src/BuildPlugin/Test/TestSolid.py +++ b/src/BuildPlugin/Test/TestSolid.py @@ -154,7 +154,7 @@ boundaries2 = [model.selection("FACE", "Face_1_1"), expectSolid2 = [False, False, False, False, False, False, False, False, True] Solid_2 = createSolidStepByStep(boundaries2, expectSolid2) -model.checkBooleansResult(Solid_2, model, 1, [0], [1], [10], [44], [88]) +model.checkResult(Solid_2, model, 1, [0], [1], [10], [44], [88]) model.testHaveNamingSubshapes(Solid_2, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillCompFaceSolid.py b/src/FeaturesPlugin/Test/TestFillCompFaceSolid.py index 1f58f43bf..832475bb2 100644 --- a/src/FeaturesPlugin/Test/TestFillCompFaceSolid.py +++ b/src/FeaturesPlugin/Test/TestFillCompFaceSolid.py @@ -55,7 +55,7 @@ Boolean_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [mo Boolean_2 = model.addFill(Part_1_doc, [model.selection("COMPOUND", "Fill_1_1")], [model.selection("SOLID", "Box_1_1")]) model.do() -model.checkBooleansResult(Boolean_2, model, 1, [6], [0], [6], [22], [44]) +model.checkResult(Boolean_2, model, 1, [6], [0], [6], [22], [44]) model.testHaveNamingSubshapes(Boolean_2, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeEdge.py b/src/FeaturesPlugin/Test/TestFillEdgeEdge.py index 1ea55e450..0c92a1422 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeEdge.py +++ b/src/FeaturesPlugin/Test/TestFillEdgeEdge.py @@ -40,7 +40,7 @@ Edge_2 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("EDGE", "Edge_2_1")]) model.do() -model.checkBooleansResult(Boolean_1,model,1,[3],[0],[0],[3],[6]) +model.checkResult(Boolean_1,model,1,[3],[0],[0],[3],[6]) model.testHaveNamingSubshapes(Boolean_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeEdgeIntersected.py b/src/FeaturesPlugin/Test/TestFillEdgeEdgeIntersected.py index 4efa527bc..5b5ee1cc4 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeEdgeIntersected.py +++ b/src/FeaturesPlugin/Test/TestFillEdgeEdgeIntersected.py @@ -36,7 +36,7 @@ Edge_2 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("EDGE", "Edge_2_1")]) model.do() -model.checkBooleansResult(Boolean_1,model,1,[2],[0],[0],[2],[4]) +model.checkResult(Boolean_1,model,1,[2],[0],[0],[2],[4]) model.testHaveNamingSubshapes(Boolean_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeFace.py b/src/FeaturesPlugin/Test/TestFillEdgeFace.py index 2ed008268..49a082413 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeFace.py +++ b/src/FeaturesPlugin/Test/TestFillEdgeFace.py @@ -43,7 +43,7 @@ Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("FACE", "Face_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [3], [0], [0], [3], [6]) +model.checkResult(Boolean_1, model, 1, [3], [0], [0], [3], [6]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeShell.py b/src/FeaturesPlugin/Test/TestFillEdgeShell.py index 9b9b7ad57..cd7be482d 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeShell.py +++ b/src/FeaturesPlugin/Test/TestFillEdgeShell.py @@ -51,7 +51,7 @@ Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("SHELL", "Shell_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [3], [0], [0], [3], [6]) +model.checkResult(Boolean_1, model, 1, [3], [0], [0], [3], [6]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeSolid.py b/src/FeaturesPlugin/Test/TestFillEdgeSolid.py index 756de0ae9..943d4e5a7 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeSolid.py +++ b/src/FeaturesPlugin/Test/TestFillEdgeSolid.py @@ -39,7 +39,7 @@ Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("SOLID", "Box_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [0], [0], [0], [1], [2]) +model.checkResult(Boolean_1, model, 1, [0], [0], [0], [1], [2]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeSolidIntersected.py b/src/FeaturesPlugin/Test/TestFillEdgeSolidIntersected.py index 89c93d757..5756635e1 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeSolidIntersected.py +++ b/src/FeaturesPlugin/Test/TestFillEdgeSolidIntersected.py @@ -40,7 +40,7 @@ Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("SOLID", "Cone_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [3], [0], [0], [3], [6]) +model.checkResult(Boolean_1, model, 1, [3], [0], [0], [3], [6]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeVertex.py b/src/FeaturesPlugin/Test/TestFillEdgeVertex.py index f98ebaa3e..33ba672dc 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeVertex.py +++ b/src/FeaturesPlugin/Test/TestFillEdgeVertex.py @@ -39,7 +39,7 @@ Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("VERTEX", "Vertex_1_1")]) model.do() -model.checkBooleansResult(Boolean_1,model,1,[2],[0],[0],[2],[4]) +model.checkResult(Boolean_1,model,1,[2],[0],[0],[2],[4]) model.testHaveNamingSubshapes(Boolean_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillEdgeWire.py b/src/FeaturesPlugin/Test/TestFillEdgeWire.py index 150ddb94b..ead4aeb88 100644 --- a/src/FeaturesPlugin/Test/TestFillEdgeWire.py +++ b/src/FeaturesPlugin/Test/TestFillEdgeWire.py @@ -43,7 +43,7 @@ Wire_1 = model.addWire(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("EDGE", "Edge_1_1")], [model.selection("WIRE", "Wire_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [3], [0], [0], [3], [6]) +model.checkResult(Boolean_1, model, 1, [3], [0], [0], [3], [6]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceEdge.py b/src/FeaturesPlugin/Test/TestFillFaceEdge.py index 33a1d21bb..5bcc0602a 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceEdge.py +++ b/src/FeaturesPlugin/Test/TestFillFaceEdge.py @@ -43,7 +43,7 @@ Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("EDGE", "Edge_1_1")]) model.do() -model.checkBooleansResult(Boolean_1,model,1,[2],[0],[2],[8],[16]) +model.checkResult(Boolean_1,model,1,[2],[0],[2],[8],[16]) model.testHaveNamingSubshapes(Boolean_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceEdgeInside.py b/src/FeaturesPlugin/Test/TestFillFaceEdgeInside.py index 18a6866eb..44bd6384a 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceEdgeInside.py +++ b/src/FeaturesPlugin/Test/TestFillFaceEdgeInside.py @@ -46,7 +46,7 @@ Face_1 = model.addFace(Part_1_doc, [model.selection("EDGE", "Sketch_1/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("EDGE", "Edge_1_1")]) model.do() -model.checkBooleansResult(Boolean_1,model,1,[0],[0],[1],[5],[10]) +model.checkResult(Boolean_1,model,1,[0],[0],[1],[5],[10]) model.testHaveNamingSubshapes(Boolean_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceEdgePerpendicular.py b/src/FeaturesPlugin/Test/TestFillFaceEdgePerpendicular.py index f0a751b48..2d5182fd2 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceEdgePerpendicular.py +++ b/src/FeaturesPlugin/Test/TestFillFaceEdgePerpendicular.py @@ -47,7 +47,7 @@ Face_1 = model.addFace(Part_1_doc, [model.selection("EDGE", "Sketch_1/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("EDGE", "Edge_1_1")]) model.do() -model.checkBooleansResult(Boolean_1,model,1,[0],[0],[1],[6],[13]) +model.checkResult(Boolean_1,model,1,[0],[0],[1],[6],[13]) model.testHaveNamingSubshapes(Boolean_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceFace.py b/src/FeaturesPlugin/Test/TestFillFaceFace.py index 03cefe9e4..d7ce14972 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceFace.py +++ b/src/FeaturesPlugin/Test/TestFillFaceFace.py @@ -60,7 +60,7 @@ Face_2 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_2/Wire-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("FACE", "Face_2_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [2], [0], [2], [6], [12]) +model.checkResult(Boolean_1, model, 1, [2], [0], [2], [6], [12]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceShell.py b/src/FeaturesPlugin/Test/TestFillFaceShell.py index bd3779690..068e4aebe 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceShell.py +++ b/src/FeaturesPlugin/Test/TestFillFaceShell.py @@ -104,7 +104,7 @@ Face_3 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_2/Wire-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_3_1")], [model.selection("SHELL", "Shell_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [3], [0], [3], [14], [28]) +model.checkResult(Boolean_1, model, 1, [3], [0], [3], [14], [28]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceSolid.py b/src/FeaturesPlugin/Test/TestFillFaceSolid.py index d5cf7179f..a99fa556f 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceSolid.py +++ b/src/FeaturesPlugin/Test/TestFillFaceSolid.py @@ -53,7 +53,7 @@ Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Wire-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("SOLID", "Box_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [4], [0], [4], [15], [30]) +model.checkResult(Boolean_1, model, 1, [4], [0], [4], [15], [30]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceVertex.py b/src/FeaturesPlugin/Test/TestFillFaceVertex.py index 7229746d5..21b11a3d1 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceVertex.py +++ b/src/FeaturesPlugin/Test/TestFillFaceVertex.py @@ -45,7 +45,7 @@ Vertex_1 = model.addVertex(Part_1_doc, [model.selection("VERTEX", "Point_1")]) Boolean_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("VERTEX", "Vertex_1_1")]) model.do() -model.checkBooleansResult(Boolean_1,model,1,[0],[0],[1],[4],[9]) +model.checkResult(Boolean_1,model,1,[0],[0],[1],[4],[9]) model.testHaveNamingSubshapes(Boolean_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillFaceWire.py b/src/FeaturesPlugin/Test/TestFillFaceWire.py index a796ddacf..b38a7a3de 100644 --- a/src/FeaturesPlugin/Test/TestFillFaceWire.py +++ b/src/FeaturesPlugin/Test/TestFillFaceWire.py @@ -56,7 +56,7 @@ Wire_1 = model.addWire(Part_1_doc, [model.selection("WIRE", "Sketch_2/Wire-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [model.selection("WIRE", "Wire_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [5], [0], [5], [21], [42]) +model.checkResult(Boolean_1, model, 1, [5], [0], [5], [21], [42]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellConstrPlane.py b/src/FeaturesPlugin/Test/TestFillShellConstrPlane.py index 86c1da04f..a0bd627ba 100644 --- a/src/FeaturesPlugin/Test/TestFillShellConstrPlane.py +++ b/src/FeaturesPlugin/Test/TestFillShellConstrPlane.py @@ -46,7 +46,7 @@ Shell_1 = model.addShell(Part_1_doc, [model.selection("SHELL", "Extrusion_1_1")] Boolean_1 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("FACE", "PartSet/XOZ")]) model.do() -model.checkBooleansResult(Boolean_1,model,1,[0],[0],[3],[12],[24]) +model.checkResult(Boolean_1,model,1,[0],[0],[3],[12],[24]) model.testHaveNamingSubshapes(Boolean_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellEdge.py b/src/FeaturesPlugin/Test/TestFillShellEdge.py index 207cc210c..20f0ed60f 100644 --- a/src/FeaturesPlugin/Test/TestFillShellEdge.py +++ b/src/FeaturesPlugin/Test/TestFillShellEdge.py @@ -51,7 +51,7 @@ Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("EDGE", "Edge_1_1")]) model.do() -model.checkBooleansResult(Boolean_1,model,1,[0],[0],[2],[8],[18]) +model.checkResult(Boolean_1,model,1,[0],[0],[2],[8],[18]) model.testHaveNamingSubshapes(Boolean_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellFace.py b/src/FeaturesPlugin/Test/TestFillShellFace.py index 1ece54f1a..0a7242dfc 100644 --- a/src/FeaturesPlugin/Test/TestFillShellFace.py +++ b/src/FeaturesPlugin/Test/TestFillShellFace.py @@ -98,7 +98,7 @@ Face_3 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_2/Wire-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("FACE", "Face_3_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [0], [0], [4], [13], [26]) +model.checkResult(Boolean_1, model, 1, [0], [0], [4], [13], [26]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellShell.py b/src/FeaturesPlugin/Test/TestFillShellShell.py index f5cd97df7..1363f2e95 100644 --- a/src/FeaturesPlugin/Test/TestFillShellShell.py +++ b/src/FeaturesPlugin/Test/TestFillShellShell.py @@ -82,7 +82,7 @@ Shell_2 = model.addShell(Part_1_doc, [model.selection("FACE", "Face_3_1"), model Boolean_1 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("SHELL", "Shell_2_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [0], [0], [4], [15], [30]) +model.checkResult(Boolean_1, model, 1, [0], [0], [4], [15], [30]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellSolid.py b/src/FeaturesPlugin/Test/TestFillShellSolid.py index 07d7fcaa1..1b78fe4c1 100644 --- a/src/FeaturesPlugin/Test/TestFillShellSolid.py +++ b/src/FeaturesPlugin/Test/TestFillShellSolid.py @@ -56,7 +56,7 @@ Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Fill_1_1_2"), mod Boolean_2 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("SOLID", "Box_1_1")]) model.do() -model.checkBooleansResult(Boolean_2, model, 1, [0], [0], [6], [22], [44]) +model.checkResult(Boolean_2, model, 1, [0], [0], [6], [22], [44]) model.testHaveNamingSubshapes(Boolean_2, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellVertex.py b/src/FeaturesPlugin/Test/TestFillShellVertex.py index 389376a4a..2fb840f5c 100644 --- a/src/FeaturesPlugin/Test/TestFillShellVertex.py +++ b/src/FeaturesPlugin/Test/TestFillShellVertex.py @@ -44,7 +44,7 @@ Vertex_1 = model.addVertex(Part_1_doc, [model.selection("VERTEX", "Point_1")]) Boolean_1 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("VERTEX", "Vertex_1_1")]) model.do() -model.checkBooleansResult(Boolean_1,model,1,[0],[0],[2],[9],[18]) +model.checkResult(Boolean_1,model,1,[0],[0],[2],[9],[18]) model.testHaveNamingSubshapes(Boolean_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillShellWire.py b/src/FeaturesPlugin/Test/TestFillShellWire.py index 017eb7ee7..1dc51bd3d 100644 --- a/src/FeaturesPlugin/Test/TestFillShellWire.py +++ b/src/FeaturesPlugin/Test/TestFillShellWire.py @@ -78,7 +78,7 @@ Wire_1 = model.addWire(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("SHELL", "Shell_1_1")], [model.selection("WIRE", "Wire_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [0], [0], [8], [30], [60]) +model.checkResult(Boolean_1, model, 1, [0], [0], [8], [30], [60]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillSolid2ConstructionPlanes.py b/src/FeaturesPlugin/Test/TestFillSolid2ConstructionPlanes.py index ad6e9c965..981f18b9b 100644 --- a/src/FeaturesPlugin/Test/TestFillSolid2ConstructionPlanes.py +++ b/src/FeaturesPlugin/Test/TestFillSolid2ConstructionPlanes.py @@ -29,7 +29,7 @@ Cone_1 = model.addCone(Part_1_doc, model.selection("VERTEX", "PartSet/Origin"), Boolean_1 = model.addFill(Part_1_doc, [model.selection("SOLID", "Cone_1_1")], [model.selection("FACE", "PartSet/YOZ"), model.selection("FACE", "PartSet/XOZ")]) model.do() -model.checkBooleansResult(Boolean_1,model,1,[4],[4],[20],[72],[144]) +model.checkResult(Boolean_1,model,1,[4],[4],[20],[72],[144]) model.testHaveNamingSubshapes(Boolean_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillSolidCompFace.py b/src/FeaturesPlugin/Test/TestFillSolidCompFace.py index 370f919ad..d486e1856 100644 --- a/src/FeaturesPlugin/Test/TestFillSolidCompFace.py +++ b/src/FeaturesPlugin/Test/TestFillSolidCompFace.py @@ -55,7 +55,7 @@ Boolean_1 = model.addFill(Part_1_doc, [model.selection("FACE", "Face_1_1")], [mo Boolean_2 = model.addFill(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("COMPOUND", "Fill_1_1")]) model.do() -model.checkBooleansResult(Boolean_2, model, 1, [2], [2], [14], [60], [120]) +model.checkResult(Boolean_2, model, 1, [2], [2], [14], [60], [120]) model.testHaveNamingSubshapes(Boolean_2, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillSolidCompShell.py b/src/FeaturesPlugin/Test/TestFillSolidCompShell.py index ec7fe1163..d6de9e4cf 100644 --- a/src/FeaturesPlugin/Test/TestFillSolidCompShell.py +++ b/src/FeaturesPlugin/Test/TestFillSolidCompShell.py @@ -57,7 +57,7 @@ MultiTranslation_1 = model.addMultiTranslation(Part_1_doc, [model.selection("SHE Boolean_2 = model.addFill(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("COMPOUND", "LinearCopy_1_1")]) model.do() -model.checkBooleansResult(Boolean_2, model, 1, [4], [4], [30], [132], [264]) +model.checkResult(Boolean_2, model, 1, [4], [4], [30], [132], [264]) model.testHaveNamingSubshapes(Boolean_2, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillSolidEdge.py b/src/FeaturesPlugin/Test/TestFillSolidEdge.py index 79c4a11c9..25190b5fd 100644 --- a/src/FeaturesPlugin/Test/TestFillSolidEdge.py +++ b/src/FeaturesPlugin/Test/TestFillSolidEdge.py @@ -39,7 +39,7 @@ Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("EDGE", "Edge_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [0], [1], [7], [30], [60]) +model.checkResult(Boolean_1, model, 1, [0], [1], [7], [30], [60]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillSolidFace.py b/src/FeaturesPlugin/Test/TestFillSolidFace.py index f0fe20d89..54e07fa92 100644 --- a/src/FeaturesPlugin/Test/TestFillSolidFace.py +++ b/src/FeaturesPlugin/Test/TestFillSolidFace.py @@ -53,7 +53,7 @@ Face_1 = model.addFace(Part_1_doc, [model.selection("WIRE", "Sketch_1/Wire-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("FACE", "Face_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [2], [2], [12], [48], [96]) +model.checkResult(Boolean_1, model, 1, [2], [2], [12], [48], [96]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillSolidShell.py b/src/FeaturesPlugin/Test/TestFillSolidShell.py index beb13ea39..174e8db41 100644 --- a/src/FeaturesPlugin/Test/TestFillSolidShell.py +++ b/src/FeaturesPlugin/Test/TestFillSolidShell.py @@ -56,7 +56,7 @@ Shell_1 = model.addShell(Part_1_doc, [model.selection("FACE", "Fill_1_1_2"), mod Boolean_2 = model.addFill(Part_1_doc, [model.selection("SOLID", "Box_1_1")], [model.selection("SHELL", "Shell_1_1")]) model.do() -model.checkBooleansResult(Boolean_2, model, 1, [2], [2], [14], [60], [120]) +model.checkResult(Boolean_2, model, 1, [2], [2], [14], [60], [120]) model.testHaveNamingSubshapes(Boolean_2, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillWireEdge.py b/src/FeaturesPlugin/Test/TestFillWireEdge.py index c5b9824b6..eeda3945e 100644 --- a/src/FeaturesPlugin/Test/TestFillWireEdge.py +++ b/src/FeaturesPlugin/Test/TestFillWireEdge.py @@ -43,7 +43,7 @@ Wire_1 = model.addWire(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("EDGE", "Edge_1_1")]) model.do() -model.checkBooleansResult(Boolean_1,model,1,[0],[0],[0],[6],[12]) +model.checkResult(Boolean_1,model,1,[0],[0],[0],[6],[12]) model.testHaveNamingSubshapes(Boolean_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillWireFace.py b/src/FeaturesPlugin/Test/TestFillWireFace.py index 3800f0854..e63cac9f5 100644 --- a/src/FeaturesPlugin/Test/TestFillWireFace.py +++ b/src/FeaturesPlugin/Test/TestFillWireFace.py @@ -62,7 +62,7 @@ Wire_1 = model.addWire(Part_1_doc, [model.selection("WIRE", "Sketch_2/Wire-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("FACE", "Face_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [0], [0], [0], [6], [12]) +model.checkResult(Boolean_1, model, 1, [0], [0], [0], [6], [12]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillWireShell.py b/src/FeaturesPlugin/Test/TestFillWireShell.py index d83f0359c..d5b99ecdc 100644 --- a/src/FeaturesPlugin/Test/TestFillWireShell.py +++ b/src/FeaturesPlugin/Test/TestFillWireShell.py @@ -104,7 +104,7 @@ Wire_1 = model.addWire(Part_1_doc, [model.selection("WIRE", "Sketch_2/Wire-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("SHELL", "Shell_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [0], [0], [0], [10], [20]) +model.checkResult(Boolean_1, model, 1, [0], [0], [0], [10], [20]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillWireSolid.py b/src/FeaturesPlugin/Test/TestFillWireSolid.py index f2998dcee..d0fd12e4e 100644 --- a/src/FeaturesPlugin/Test/TestFillWireSolid.py +++ b/src/FeaturesPlugin/Test/TestFillWireSolid.py @@ -53,7 +53,7 @@ Wire_1 = model.addWire(Part_1_doc, [model.selection("WIRE", "Sketch_1/Wire-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("SOLID", "Box_1_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [0], [0], [0], [9], [18]) +model.checkResult(Boolean_1, model, 1, [0], [0], [0], [9], [18]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillWireVertex.py b/src/FeaturesPlugin/Test/TestFillWireVertex.py index 928dac140..01c3c349a 100644 --- a/src/FeaturesPlugin/Test/TestFillWireVertex.py +++ b/src/FeaturesPlugin/Test/TestFillWireVertex.py @@ -44,7 +44,7 @@ Wire_1 = model.addWire(Part_1_doc, [model.selection("EDGE", "Sketch_1/Edge-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("VERTEX", "Vertex_1_1")]) model.do() -model.checkBooleansResult(Boolean_1,model,1,[0],[0],[0],[4],[8]) +model.checkResult(Boolean_1,model,1,[0],[0],[0],[4],[8]) model.testHaveNamingSubshapes(Boolean_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestFillWireWire.py b/src/FeaturesPlugin/Test/TestFillWireWire.py index 7bf2f0a53..9540742cf 100644 --- a/src/FeaturesPlugin/Test/TestFillWireWire.py +++ b/src/FeaturesPlugin/Test/TestFillWireWire.py @@ -59,7 +59,7 @@ Wire_2 = model.addWire(Part_1_doc, [model.selection("WIRE", "Sketch_2/Wire-Sketc Boolean_1 = model.addFill(Part_1_doc, [model.selection("WIRE", "Wire_1_1")], [model.selection("WIRE", "Wire_2_1")]) model.do() -model.checkBooleansResult(Boolean_1, model, 1, [0], [0], [0], [4], [8]) +model.checkResult(Boolean_1, model, 1, [0], [0], [0], [4], [8]) model.testHaveNamingSubshapes(Boolean_1, model, Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestPartition2Faces.py b/src/FeaturesPlugin/Test/TestPartition2Faces.py index 2df969a48..dc64bef78 100644 --- a/src/FeaturesPlugin/Test/TestPartition2Faces.py +++ b/src/FeaturesPlugin/Test/TestPartition2Faces.py @@ -47,7 +47,7 @@ Face_2 = model.addFace(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Partition_1 = model.addPartition(Part_1_doc, [model.selection("FACE", "Face_1_1"), model.selection("FACE", "Face_2_1")]) model.do() -model.checkBooleansResult(Partition_1,model,1,[3],[0],[3],[12],[24]) +model.checkResult(Partition_1,model,1,[3],[0],[3],[12],[24]) model.testHaveNamingSubshapes(Partition_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestPartition2Solids.py b/src/FeaturesPlugin/Test/TestPartition2Solids.py index 6f24049e5..fac8630ee 100644 --- a/src/FeaturesPlugin/Test/TestPartition2Solids.py +++ b/src/FeaturesPlugin/Test/TestPartition2Solids.py @@ -61,7 +61,7 @@ Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_2/ Partition_1 = model.addPartition(Part_1_doc, [model.selection("SOLID", "Extrusion_1_1"), model.selection("SOLID", "Extrusion_2_1")]) model.do() -model.checkBooleansResult(Partition_1,model,1,[4],[4],[33],[150],[300]) +model.checkResult(Partition_1,model,1,[4],[4],[33],[150],[300]) model.testHaveNamingSubshapes(Partition_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestPartition2Wires.py b/src/FeaturesPlugin/Test/TestPartition2Wires.py index cf0552ae1..01eb2c1e5 100644 --- a/src/FeaturesPlugin/Test/TestPartition2Wires.py +++ b/src/FeaturesPlugin/Test/TestPartition2Wires.py @@ -54,7 +54,7 @@ Wire_2 = model.addWire(Part_1_doc, [model.selection("EDGE", "Sketch_1/Edge-Sketc Partition_1 = model.addPartition(Part_1_doc, [model.selection("WIRE", "Wire_2_1"), model.selection("WIRE", "Wire_1_1")]) model.do() -model.checkBooleansResult(Partition_1,model,1,[2],[0],[0],[22],[44]) +model.checkResult(Partition_1,model,1,[2],[0],[0],[22],[44]) model.testHaveNamingSubshapes(Partition_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestPartitionBox4Planes.py b/src/FeaturesPlugin/Test/TestPartitionBox4Planes.py index 1a7a0e805..7e2313a7f 100644 --- a/src/FeaturesPlugin/Test/TestPartitionBox4Planes.py +++ b/src/FeaturesPlugin/Test/TestPartitionBox4Planes.py @@ -33,7 +33,7 @@ Plane_7 = model.addPlane(Part_1_doc, model.selection("FACE", "PartSet/YOZ"), 50, Partition_1 = model.addPartition(Part_1_doc, [model.selection("FACE", "Plane_1"), model.selection("FACE", "Plane_2"), model.selection("FACE", "Plane_3"), model.selection("FACE", "Plane_4"), model.selection("SOLID", "Box_1_1")]) model.do() -model.checkBooleansResult(Partition_1,model,1,[8],[8],[48],[192],[384]) +model.checkResult(Partition_1,model,1,[8],[8],[48],[192],[384]) model.testHaveNamingSubshapes(Partition_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestPartitionEdgeSolid.py b/src/FeaturesPlugin/Test/TestPartitionEdgeSolid.py index 348266768..c12eec4b3 100644 --- a/src/FeaturesPlugin/Test/TestPartitionEdgeSolid.py +++ b/src/FeaturesPlugin/Test/TestPartitionEdgeSolid.py @@ -35,7 +35,7 @@ Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/Edge-Sketc Partition_1 = model.addPartition(Part_1_doc, [model.selection("SOLID", "Cone_1_1"), model.selection("EDGE", "Edge_1_1")]) model.do() -model.checkBooleansResult(Partition_1,model,1,[3],[1],[3],[9],[20]) +model.checkResult(Partition_1,model,1,[3],[1],[3],[9],[20]) model.testHaveNamingSubshapes(Partition_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestPartitionFace2Solid.py b/src/FeaturesPlugin/Test/TestPartitionFace2Solid.py index eec995bf7..7750c0148 100644 --- a/src/FeaturesPlugin/Test/TestPartitionFace2Solid.py +++ b/src/FeaturesPlugin/Test/TestPartitionFace2Solid.py @@ -81,7 +81,7 @@ Face_1 = model.addFace(Part_1_doc, [model.selection("EDGE", "Sketch_3/Edge-Sketc Partition_1 = model.addPartition(Part_1_doc, [model.selection("FACE", "Face_1_1"), model.selection("SOLID", "Extrusion_2_1"), model.selection("SOLID", "Extrusion_1_1")]) model.do() -model.checkBooleansResult(Partition_1,model,1,[2],[4],[42],[198],[396]) +model.checkResult(Partition_1,model,1,[2],[4],[42],[198],[396]) model.testHaveNamingSubshapes(Partition_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestPartitionFaceSolid.py b/src/FeaturesPlugin/Test/TestPartitionFaceSolid.py index 31359057f..22c616923 100644 --- a/src/FeaturesPlugin/Test/TestPartitionFaceSolid.py +++ b/src/FeaturesPlugin/Test/TestPartitionFaceSolid.py @@ -66,7 +66,7 @@ Face_1 = model.addFace(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Partition_1 = model.addPartition(Part_1_doc, [model.selection("SOLID", "Revolution_1_1"), model.selection("FACE", "Face_1_1")]) model.do() -model.checkBooleansResult(Partition_1,model,1,[4],[1],[16],[82],[164]) +model.checkResult(Partition_1,model,1,[4],[1],[16],[82],[164]) model.testHaveNamingSubshapes(Partition_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestPartitionFaceWire.py b/src/FeaturesPlugin/Test/TestPartitionFaceWire.py index 2245856c1..3a6a56b86 100644 --- a/src/FeaturesPlugin/Test/TestPartitionFaceWire.py +++ b/src/FeaturesPlugin/Test/TestPartitionFaceWire.py @@ -57,7 +57,7 @@ Face_1 = model.addFace(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Partition_1 = model.addPartition(Part_1_doc, [model.selection("FACE", "Face_1_1"), model.selection("WIRE", "Wire_1_1")]) model.do() -model.checkBooleansResult(Partition_1,model,1,[6],[0],[5],[39],[78]) +model.checkResult(Partition_1,model,1,[6],[0],[5],[39],[78]) model.testHaveNamingSubshapes(Partition_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestPartitionInclinedFaceSolid.py b/src/FeaturesPlugin/Test/TestPartitionInclinedFaceSolid.py index 4d9856a68..c7113bbc2 100644 --- a/src/FeaturesPlugin/Test/TestPartitionInclinedFaceSolid.py +++ b/src/FeaturesPlugin/Test/TestPartitionInclinedFaceSolid.py @@ -49,7 +49,7 @@ Face_1 = model.addFace(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Partition_1 = model.addPartition(Part_1_doc, [model.selection("SOLID", "Extrusion_1_1"), model.selection("FACE", "Face_1_1")]) model.do() -model.checkBooleansResult(Partition_1,model,1,[3],[2],[10],[30],[60]) +model.checkResult(Partition_1,model,1,[3],[2],[10],[30],[60]) model.testHaveNamingSubshapes(Partition_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestPartitionWireFaceSolid.py b/src/FeaturesPlugin/Test/TestPartitionWireFaceSolid.py index b45a24550..9573c9cc7 100644 --- a/src/FeaturesPlugin/Test/TestPartitionWireFaceSolid.py +++ b/src/FeaturesPlugin/Test/TestPartitionWireFaceSolid.py @@ -52,7 +52,7 @@ Wire_1 = model.addWire(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-Sketc Partition_1 = model.addPartition(Part_1_doc, [model.selection("FACE", "Face_1_1"), model.selection("SOLID", "Torus_1_1"), model.selection("WIRE", "Wire_1_1")]) model.do() -model.checkBooleansResult(Partition_1,model,1,[3],[1],[4],[22],[46]) +model.checkResult(Partition_1,model,1,[3],[1],[4],[22],[46]) model.testHaveNamingSubshapes(Partition_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestUnion4CurvedFaces.py b/src/FeaturesPlugin/Test/TestUnion4CurvedFaces.py index da123a80b..80665ef41 100644 --- a/src/FeaturesPlugin/Test/TestUnion4CurvedFaces.py +++ b/src/FeaturesPlugin/Test/TestUnion4CurvedFaces.py @@ -42,7 +42,7 @@ Partition_1 = model.addPartition(Part_1_doc, [model.selection("FACE", "PartSet/X Union_1 = model.addUnion(Part_1_doc, [model.selection("FACE", "Partition_1_1_1"), model.selection("FACE", "Partition_1_1_2")]) model.do() -model.checkBooleansResult(Union_1,model,1,[0],[0],[1],[4],[8]) +model.checkResult(Union_1,model,1,[0],[0],[1],[4],[8]) model.testHaveNamingSubshapes(Union_1,model,Part_1_doc) model.end() diff --git a/src/FeaturesPlugin/Test/TestUnion4Faces.py b/src/FeaturesPlugin/Test/TestUnion4Faces.py index 7557083df..f5adc70c8 100644 --- a/src/FeaturesPlugin/Test/TestUnion4Faces.py +++ b/src/FeaturesPlugin/Test/TestUnion4Faces.py @@ -58,7 +58,7 @@ Partition_1 = model.addPartition(Part_1_doc, [model.selection("FACE", "Face_2_1" Union_1 = model.addUnion(Part_1_doc, [model.selection("FACE", "Partition_1_1_1"), model.selection("FACE", "Partition_1_1_3"), model.selection("FACE", "Partition_1_1_4")]) model.do() -model.checkBooleansResult(Union_1,model,1,[2],[0],[2],[13],[26]) +model.checkResult(Union_1,model,1,[2],[0],[2],[13],[26]) #model.testHaveNamingSubshapes(Union_1,model,Part_1_doc) model.end() diff --git a/src/PythonAPI/model/tests/tests.py b/src/PythonAPI/model/tests/tests.py index 89a120d10..7cd30c2ca 100644 --- a/src/PythonAPI/model/tests/tests.py +++ b/src/PythonAPI/model/tests/tests.py @@ -287,8 +287,8 @@ def assertSketchArc(theArcFeature): assert math.fabs(aDistCS - aDistCE) < TOLERANCE, "Wrong arc: center-start distance {}, center-end distance {}".format(aDistCS, aDistCE) assert math.fabs(aRadius.value() -aDistCS) < TOLERANCE, "Wrong arc: radius is {0}, expected {1}".format(aRadius.value(), aDistCS) -def checkBooleansResult(theFeature,theModel,NbRes,NbSubRes,NbSolid,NbFace,NbEdge,NbVertex): - """ Tests numbers of sub-shapes in results (used in Boolean operations tests) +def checkResult(theFeature,theModel,NbRes,NbSubRes,NbSolid,NbFace,NbEdge,NbVertex): + """ Tests numbers of sub-shapes in results """ theModel.testNbResults(theFeature, NbRes) theModel.testNbSubResults(theFeature, NbSubRes)