From: azv Date: Thu, 11 Jan 2018 08:09:08 +0000 (+0300) Subject: Rename wrongly named test case (issue #2396) X-Git-Tag: V_3.0.0RC1~47 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=13cef8c1104eb18b14eed4c5a08746b5bffbda94;p=modules%2Fshaper.git Rename wrongly named test case (issue #2396) --- diff --git a/src/ModelAPI/Test/Test2396.py b/src/ModelAPI/Test/Test2396.py new file mode 100644 index 000000000..a3ef0be37 --- /dev/null +++ b/src/ModelAPI/Test/Test2396.py @@ -0,0 +1,86 @@ +## Copyright (C) 2018-20xx CEA/DEN, EDF R&D +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library; if not, write to the Free Software +## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +## +## See http:##www.salome-platform.org/ or +## email : webmaster.salome@opencascade.com +## + +from GeomAPI import * + +from salome.shaper import model + +model.begin() +partSet = model.moduleDocument() +Part_1 = model.addPart(partSet) +Part_1_doc = Part_1.document() +Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) +SketchLine_1 = Sketch_1.addLine(50, -50, -50, -50) +SketchLine_2 = Sketch_1.addLine(-50, -50, -50, 50) +SketchLine_3 = Sketch_1.addLine(-50, 50, 50, 50) +SketchLine_4 = Sketch_1.addLine(50, 50, 50, -50) +SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchLine_4.endPoint(), SketchLine_1.startPoint()) +SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_2.startPoint()) +SketchConstraintCoincidence_3 = Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchLine_3.startPoint()) +SketchConstraintCoincidence_4 = Sketch_1.setCoincident(SketchLine_3.endPoint(), SketchLine_4.startPoint()) +SketchConstraintHorizontal_1 = Sketch_1.setHorizontal(SketchLine_1.result()) +SketchConstraintVertical_1 = Sketch_1.setVertical(SketchLine_2.result()) +SketchConstraintHorizontal_2 = Sketch_1.setHorizontal(SketchLine_3.result()) +SketchConstraintVertical_2 = Sketch_1.setVertical(SketchLine_4.result()) +model.do() + +Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchLine_1r-SketchLine_2r-SketchLine_3r-SketchLine_4r")], model.selection(), 100, 0) +Extrusion_1.result().setName("Cube") + +Edge_1_objects = [model.selection("EDGE", "Sketch_1/Edge-SketchLine_2"), + model.selection("EDGE", "Sketch_1/Edge-SketchLine_3"), + model.selection("EDGE", "Sketch_1/Edge-SketchLine_1"), + model.selection("EDGE", "Sketch_1/Edge-SketchLine_4"), + model.selection("EDGE", "Cube/Generated_Face_2&Cube/Generated_Face_1"), + model.selection("EDGE", "Cube/Generated_Face_2&Cube/From_Face_1"), + model.selection("EDGE", "Cube/Generated_Face_2&Cube/To_Face_1"), + model.selection("EDGE", "Cube/Generated_Face_3&Cube/Generated_Face_2"), + model.selection("EDGE", "Cube/Generated_Face_1&Cube/From_Face_1"), + model.selection("EDGE", "Cube/Generated_Face_3&Cube/To_Face_1"), + model.selection("EDGE", "Cube/Generated_Face_3&Cube/From_Face_1"), + model.selection("EDGE", "Cube/Generated_Face_1&Cube/To_Face_1"), + model.selection("EDGE", "Cube/Generated_Face_4&Cube/Generated_Face_1"), + model.selection("EDGE", "Cube/Generated_Face_4&Cube/From_Face_1"), + model.selection("EDGE", "Cube/Generated_Face_4&Cube/To_Face_1"), + model.selection("EDGE", "Cube/Generated_Face_4&Cube/Generated_Face_3")] +Edge_1 = model.addEdge(Part_1_doc, Edge_1_objects) +# check all the names of Edge_1 results are different +names = set() +for res in Edge_1.results(): + names.add(res.name()) +assert(len(names) == len(Edge_1.results())), "Some edges have equal name" + +Sketch_2 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) +SketchCircle_1 = Sketch_2.addCircle(200, 0, 50) +model.do() +Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_2/Face-SketchCircle_1_2f")], model.selection("EDGE", "Cube"), 10, 0) +model.do() +# check Extrusion_2 +model.testNbResults(Extrusion_2, 1) +model.testNbSubResults(Extrusion_2, [0]) +model.testNbSubShapes(Extrusion_2, GeomAPI_Shape.SOLID, [1]) +model.testNbSubShapes(Extrusion_2, GeomAPI_Shape.FACE, [3]) +model.testNbSubShapes(Extrusion_2, GeomAPI_Shape.EDGE, [6]) +model.testNbSubShapes(Extrusion_2, GeomAPI_Shape.VERTEX, [12]) +model.testResultsVolumes(Extrusion_2, [78539.81633974483]) + +model.end() + +assert(model.checkPythonDump()) diff --git a/src/ModelAPI/Test/Test2398.py b/src/ModelAPI/Test/Test2398.py deleted file mode 100644 index a3ef0be37..000000000 --- a/src/ModelAPI/Test/Test2398.py +++ /dev/null @@ -1,86 +0,0 @@ -## Copyright (C) 2018-20xx CEA/DEN, EDF R&D -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -## -## See http:##www.salome-platform.org/ or -## email : webmaster.salome@opencascade.com -## - -from GeomAPI import * - -from salome.shaper import model - -model.begin() -partSet = model.moduleDocument() -Part_1 = model.addPart(partSet) -Part_1_doc = Part_1.document() -Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) -SketchLine_1 = Sketch_1.addLine(50, -50, -50, -50) -SketchLine_2 = Sketch_1.addLine(-50, -50, -50, 50) -SketchLine_3 = Sketch_1.addLine(-50, 50, 50, 50) -SketchLine_4 = Sketch_1.addLine(50, 50, 50, -50) -SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchLine_4.endPoint(), SketchLine_1.startPoint()) -SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_2.startPoint()) -SketchConstraintCoincidence_3 = Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchLine_3.startPoint()) -SketchConstraintCoincidence_4 = Sketch_1.setCoincident(SketchLine_3.endPoint(), SketchLine_4.startPoint()) -SketchConstraintHorizontal_1 = Sketch_1.setHorizontal(SketchLine_1.result()) -SketchConstraintVertical_1 = Sketch_1.setVertical(SketchLine_2.result()) -SketchConstraintHorizontal_2 = Sketch_1.setHorizontal(SketchLine_3.result()) -SketchConstraintVertical_2 = Sketch_1.setVertical(SketchLine_4.result()) -model.do() - -Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchLine_1r-SketchLine_2r-SketchLine_3r-SketchLine_4r")], model.selection(), 100, 0) -Extrusion_1.result().setName("Cube") - -Edge_1_objects = [model.selection("EDGE", "Sketch_1/Edge-SketchLine_2"), - model.selection("EDGE", "Sketch_1/Edge-SketchLine_3"), - model.selection("EDGE", "Sketch_1/Edge-SketchLine_1"), - model.selection("EDGE", "Sketch_1/Edge-SketchLine_4"), - model.selection("EDGE", "Cube/Generated_Face_2&Cube/Generated_Face_1"), - model.selection("EDGE", "Cube/Generated_Face_2&Cube/From_Face_1"), - model.selection("EDGE", "Cube/Generated_Face_2&Cube/To_Face_1"), - model.selection("EDGE", "Cube/Generated_Face_3&Cube/Generated_Face_2"), - model.selection("EDGE", "Cube/Generated_Face_1&Cube/From_Face_1"), - model.selection("EDGE", "Cube/Generated_Face_3&Cube/To_Face_1"), - model.selection("EDGE", "Cube/Generated_Face_3&Cube/From_Face_1"), - model.selection("EDGE", "Cube/Generated_Face_1&Cube/To_Face_1"), - model.selection("EDGE", "Cube/Generated_Face_4&Cube/Generated_Face_1"), - model.selection("EDGE", "Cube/Generated_Face_4&Cube/From_Face_1"), - model.selection("EDGE", "Cube/Generated_Face_4&Cube/To_Face_1"), - model.selection("EDGE", "Cube/Generated_Face_4&Cube/Generated_Face_3")] -Edge_1 = model.addEdge(Part_1_doc, Edge_1_objects) -# check all the names of Edge_1 results are different -names = set() -for res in Edge_1.results(): - names.add(res.name()) -assert(len(names) == len(Edge_1.results())), "Some edges have equal name" - -Sketch_2 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) -SketchCircle_1 = Sketch_2.addCircle(200, 0, 50) -model.do() -Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("FACE", "Sketch_2/Face-SketchCircle_1_2f")], model.selection("EDGE", "Cube"), 10, 0) -model.do() -# check Extrusion_2 -model.testNbResults(Extrusion_2, 1) -model.testNbSubResults(Extrusion_2, [0]) -model.testNbSubShapes(Extrusion_2, GeomAPI_Shape.SOLID, [1]) -model.testNbSubShapes(Extrusion_2, GeomAPI_Shape.FACE, [3]) -model.testNbSubShapes(Extrusion_2, GeomAPI_Shape.EDGE, [6]) -model.testNbSubShapes(Extrusion_2, GeomAPI_Shape.VERTEX, [12]) -model.testResultsVolumes(Extrusion_2, [78539.81633974483]) - -model.end() - -assert(model.checkPythonDump())