From: dbv Date: Wed, 26 Sep 2018 13:43:10 +0000 (+0300) Subject: Tests fix X-Git-Tag: CEA_2018-2~64^2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=30cec88cc54878274134111ff3c10f504a0350ed;p=modules%2Fshaper.git Tests fix --- diff --git a/src/FeaturesPlugin/Test/Test1379.py b/src/FeaturesPlugin/Test/Test1379.py index 43cdb6491..a9d0762a9 100644 --- a/src/FeaturesPlugin/Test/Test1379.py +++ b/src/FeaturesPlugin/Test/Test1379.py @@ -33,7 +33,6 @@ SketchLine_1.result().setName("SketchLine_5") SketchLine_2 = Sketch_1.addLine(0.008, 0.0005000000000000006, 0.0075, -1.258295422426014e-035) SketchLine_2.setName("SketchLine_9") SketchLine_2.result().setName("SketchLine_9") -SketchLine_2.result().setColor(0, 150, 0) SketchProjection_2 = Sketch_1.addProjection(model.selection("EDGE", "OX"), False) SketchLine_3 = SketchProjection_2.createdFeature() SketchLine_3.setName("SketchLine_10") @@ -43,7 +42,6 @@ SketchConstraintCoincidence_1.setName("SketchConstraintCoincidence_12") SketchLine_4 = Sketch_1.addLine(0.0075, -1.258295422426014e-035, 0.005, 0) SketchLine_4.setName("SketchLine_11") SketchLine_4.result().setName("SketchLine_11") -SketchLine_4.result().setColor(0, 150, 0) SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchLine_4.startPoint()) SketchConstraintCoincidence_2.setName("SketchConstraintCoincidence_13") SketchConstraintCoincidence_3 = Sketch_1.setCoincident(SketchLine_4.endPoint(), SketchLine_3.result()) @@ -51,13 +49,11 @@ SketchConstraintCoincidence_3.setName("SketchConstraintCoincidence_14") SketchLine_5 = Sketch_1.addLine(0.005, 0, 0.005, 0.02) SketchLine_5.setName("SketchLine_12") SketchLine_5.result().setName("SketchLine_12") -SketchLine_5.result().setColor(0, 150, 0) SketchConstraintCoincidence_4 = Sketch_1.setCoincident(SketchLine_4.endPoint(), SketchLine_5.startPoint()) SketchConstraintCoincidence_4.setName("SketchConstraintCoincidence_15") SketchLine_6 = Sketch_1.addLine(0.005, 0.02, 0, 0.02) SketchLine_6.setName("SketchLine_13") SketchLine_6.result().setName("SketchLine_13") -SketchLine_6.result().setColor(0, 150, 0) SketchConstraintCoincidence_5 = Sketch_1.setCoincident(SketchLine_5.endPoint(), SketchLine_6.startPoint()) SketchConstraintCoincidence_5.setName("SketchConstraintCoincidence_16") SketchConstraintVertical_1 = Sketch_1.setVertical(SketchLine_5.result()) @@ -71,47 +67,37 @@ SketchConstraintLength_2.setName("SketchConstraintLength_4") SketchLine_7 = Sketch_1.addLine(0.008, 0.0005000000000000006, 0.008, 0.03) SketchLine_7.setName("SketchLine_7") SketchLine_7.result().setName("SketchLine_7") -SketchLine_7.result().setColor(0, 150, 0) SketchConstraintCoincidence_6 = Sketch_1.setCoincident(SketchLine_2.startPoint(), SketchLine_7.startPoint()) SketchConstraintCoincidence_6.setName("SketchConstraintCoincidence_6") SketchLine_8 = Sketch_1.addLine(0.008, 0.03, 0.007500000000000001, 0.03) SketchLine_8.setName("SketchLine_8") SketchLine_8.result().setName("SketchLine_8") -SketchLine_8.result().setColor(0, 150, 0) SketchConstraintCoincidence_7 = Sketch_1.setCoincident(SketchLine_7.endPoint(), SketchLine_8.startPoint()) SketchConstraintCoincidence_7.setName("SketchConstraintCoincidence_7") SketchArc_1 = Sketch_1.addArc(0.007500000000000001, 0.031, 0.007500000000000001, 0.03, 0.006500000000000001, 0.031, True) -SketchArc_1.result().setColor(0, 150, 0) -SketchArc_1.results()[1].setColor(0, 150, 0) SketchConstraintCoincidence_8 = Sketch_1.setCoincident(SketchLine_8.endPoint(), SketchArc_1.startPoint()) SketchConstraintCoincidence_8.setName("SketchConstraintCoincidence_8") SketchLine_9 = Sketch_1.addLine(0.006500000000000001, 0.031, 0.006500000000000001, 0.032) SketchLine_9.setName("SketchLine_14") SketchLine_9.result().setName("SketchLine_14") -SketchLine_9.result().setColor(0, 150, 0) SketchConstraintCoincidence_9 = Sketch_1.setCoincident(SketchArc_1.endPoint(), SketchLine_9.startPoint()) SketchConstraintCoincidence_9.setName("SketchConstraintCoincidence_9") SketchArc_2 = Sketch_1.addArc(0.007500000000000001, 0.032, 0.006500000000000001, 0.032, 0.007500000000000001, 0.033, True) -SketchArc_2.result().setColor(0, 150, 0) -SketchArc_2.results()[1].setColor(0, 150, 0) SketchConstraintCoincidence_10 = Sketch_1.setCoincident(SketchLine_9.endPoint(), SketchArc_2.startPoint()) SketchConstraintCoincidence_10.setName("SketchConstraintCoincidence_10") SketchLine_10 = Sketch_1.addLine(0.007500000000000001, 0.033, 0.008999999999999999, 0.033) SketchLine_10.setName("SketchLine_15") SketchLine_10.result().setName("SketchLine_15") -SketchLine_10.result().setColor(0, 150, 0) SketchConstraintCoincidence_11 = Sketch_1.setCoincident(SketchArc_2.endPoint(), SketchLine_10.startPoint()) SketchConstraintCoincidence_11.setName("SketchConstraintCoincidence_11") SketchLine_11 = Sketch_1.addLine(0.008999999999999999, 0.033, 0.008999999999999999, 0.042) SketchLine_11.setName("SketchLine_16") SketchLine_11.result().setName("SketchLine_16") -SketchLine_11.result().setColor(0, 150, 0) SketchConstraintCoincidence_12 = Sketch_1.setCoincident(SketchLine_10.endPoint(), SketchLine_11.startPoint()) SketchConstraintCoincidence_12.setName("SketchConstraintCoincidence_17") SketchLine_12 = Sketch_1.addLine(0.008999999999999999, 0.042, -5.446629538236431e-036, 0.042) SketchLine_12.setName("SketchLine_17") SketchLine_12.result().setName("SketchLine_17") -SketchLine_12.result().setColor(0, 150, 0) SketchConstraintCoincidence_13 = Sketch_1.setCoincident(SketchLine_11.endPoint(), SketchLine_12.startPoint()) SketchConstraintCoincidence_13.setName("SketchConstraintCoincidence_18") SketchConstraintCoincidence_14 = Sketch_1.setCoincident(SketchLine_12.endPoint(), SketchLine_1.result()) @@ -119,7 +105,6 @@ SketchConstraintCoincidence_14.setName("SketchConstraintCoincidence_19") SketchLine_13 = Sketch_1.addLine(-5.446629538236431e-036, 0.042, 0, 0.02) SketchLine_13.setName("SketchLine_18") SketchLine_13.result().setName("SketchLine_18") -SketchLine_13.result().setColor(0, 150, 0) SketchConstraintCoincidence_15 = Sketch_1.setCoincident(SketchLine_12.endPoint(), SketchLine_13.startPoint()) SketchConstraintCoincidence_15.setName("SketchConstraintCoincidence_20") SketchConstraintCoincidence_16 = Sketch_1.setCoincident(SketchLine_6.endPoint(), SketchLine_13.endPoint()) @@ -159,7 +144,6 @@ Part_1_doc = Part_1.document() Revolution_1 = model.addRevolution(Part_1_doc, [model.selection("FACE", "PartSet/Sketch_1/Face-SketchLine_9r-SketchLine_11r-SketchLine_12r-SketchLine_13r-SketchLine_7f-SketchLine_8f-SketchArc_1_2r-SketchLine_14f-SketchArc_2_2r-SketchLine_15f-SketchLine_16f-SketchLine_17f-SketchLine_18f")], model.selection("EDGE", "PartSet/OZ"), 360, 0) Sketch_2 = model.addSketch(Part_1_doc, model.standardPlane("XOZ")) SketchLine_14 = Sketch_2.addLine(-5.446629538236431e-036, 0.042, 5.172728347136208e-022, 0.03963932022500211) -SketchLine_14.result().setColor(0, 150, 0) SketchProjection_3 = Sketch_2.addProjection(model.selection("VERTEX", "PartSet/Sketch_1/Vertex-SketchLine_18s-SketchLine_17e"), False) SketchPoint_1 = SketchProjection_3.createdFeature() SketchConstraintCoincidence_18 = Sketch_2.setCoincident(SketchLine_14.startPoint(), SketchPoint_1.result()) @@ -167,14 +151,10 @@ SketchProjection_4 = Sketch_2.addProjection(model.selection("EDGE", "PartSet/Ske SketchLine_15 = SketchProjection_4.createdFeature() SketchConstraintCoincidence_19 = Sketch_2.setCoincident(SketchLine_14.endPoint(), SketchLine_15.result()) SketchArc_3 = Sketch_2.addArc(0.02, 0.062, 5.172728347136208e-022, 0.03963932022500211, 0.02, 0.032, False) -SketchArc_3.result().setColor(0, 150, 0) -SketchArc_3.results()[1].setColor(0, 150, 0) SketchConstraintCoincidence_20 = Sketch_2.setCoincident(SketchLine_14.endPoint(), SketchArc_3.startPoint()) SketchLine_16 = Sketch_2.addLine(0.02, 0.032, 0.02, 0.042) -SketchLine_16.result().setColor(0, 150, 0) SketchConstraintCoincidence_21 = Sketch_2.setCoincident(SketchArc_3.endPoint(), SketchLine_16.startPoint()) SketchLine_17 = Sketch_2.addLine(0.02, 0.042, 0, 0.042) -SketchLine_17.result().setColor(0, 150, 0) SketchConstraintCoincidence_22 = Sketch_2.setCoincident(SketchLine_16.endPoint(), SketchLine_17.startPoint()) SketchConstraintCoincidence_23 = Sketch_2.setCoincident(SketchLine_14.startPoint(), SketchLine_17.endPoint()) SketchConstraintHorizontal_5 = Sketch_2.setHorizontal(SketchLine_17.result()) @@ -194,18 +174,15 @@ Sketch_3 = model.addSketch(Part_1_doc, model.standardPlane("XOZ")) SketchLine_19 = Sketch_3.addLine(0.029, 0.042, 0.029, 0.03267384683690003) SketchLine_19.setName("SketchLine_7") SketchLine_19.result().setName("SketchLine_7") -SketchLine_19.result().setColor(0, 150, 0) SketchLine_20 = Sketch_3.addLine(0.029, 0.03267384683690003, 0.008999999999999999, 0.042) SketchLine_20.setName("SketchLine_8") SketchLine_20.result().setName("SketchLine_8") -SketchLine_20.result().setColor(0, 150, 0) SketchConstraintCoincidence_24 = Sketch_3.setCoincident(SketchLine_19.endPoint(), SketchLine_20.startPoint()) SketchConstraintCoincidence_24.setName("SketchConstraintCoincidence_8") SketchConstraintVertical_6 = Sketch_3.setVertical(SketchLine_19.result()) SketchLine_21 = Sketch_3.addLine(0.008999999999999999, 0.042, 0.029, 0.042) SketchLine_21.setName("SketchLine_9") SketchLine_21.result().setName("SketchLine_9") -SketchLine_21.result().setColor(0, 150, 0) SketchProjection_6 = Sketch_3.addProjection(model.selection("EDGE", "Sketch_1/Edge-SketchLine_4"), False) SketchLine_22 = SketchProjection_6.createdFeature() SketchLine_22.setName("SketchLine_10") diff --git a/src/FeaturesPlugin/Test/TestBooleanFuse_ShellCompound_ShellCompound.py b/src/FeaturesPlugin/Test/TestBooleanFuse_ShellCompound_ShellCompound.py index f275588b9..df924e429 100644 --- a/src/FeaturesPlugin/Test/TestBooleanFuse_ShellCompound_ShellCompound.py +++ b/src/FeaturesPlugin/Test/TestBooleanFuse_ShellCompound_ShellCompound.py @@ -86,8 +86,8 @@ from GeomAPI import GeomAPI_Shape model.testNbResults(Fuse_1, 1) model.testNbSubResults(Fuse_1, [4]) model.testNbSubShapes(Fuse_1, GeomAPI_Shape.SOLID, [0]) -model.testNbSubShapes(Fuse_1, GeomAPI_Shape.FACE, [8]) -model.testNbSubShapes(Fuse_1, GeomAPI_Shape.EDGE, [5]) -model.testNbSubShapes(Fuse_1, GeomAPI_Shape.VERTEX, [2]) +model.testNbSubShapes(Fuse_1, GeomAPI_Shape.FACE, [12]) +model.testNbSubShapes(Fuse_1, GeomAPI_Shape.EDGE, [44]) +model.testNbSubShapes(Fuse_1, GeomAPI_Shape.VERTEX, [88]) assert(model.checkPythonDump())