From bf64fde54cf2376df9ed1747b03fbbd462a325c9 Mon Sep 17 00:00:00 2001 From: azv Date: Mon, 10 Dec 2018 14:11:34 +0300 Subject: [PATCH] [Code coverage BuildPlugin]: Unit tests to check error messages in Face and Solid features --- src/BuildPlugin/BuildPlugin_Validators.cpp | 17 +++----- src/BuildPlugin/CMakeLists.txt | 2 + src/BuildPlugin/Test/TestFace_ErrorMsg.py | 50 ++++++++++++++++++++++ src/BuildPlugin/Test/TestSolid_ErrorMsg.py | 35 +++++++++++++++ 4 files changed, 92 insertions(+), 12 deletions(-) create mode 100644 src/BuildPlugin/Test/TestFace_ErrorMsg.py create mode 100644 src/BuildPlugin/Test/TestSolid_ErrorMsg.py diff --git a/src/BuildPlugin/BuildPlugin_Validators.cpp b/src/BuildPlugin/BuildPlugin_Validators.cpp index 1dc69c0a3..3b4c4b950 100644 --- a/src/BuildPlugin/BuildPlugin_Validators.cpp +++ b/src/BuildPlugin/BuildPlugin_Validators.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -34,8 +35,7 @@ #include #include #include -#include -#include +#include #include #include @@ -292,16 +292,9 @@ bool BuildPlugin_ValidatorBaseForSolids::isValid( std::shared_ptr anAlgorithm( new GeomAlgoAPI_MakeVolume(anOriginalShapes, false)); - if (!anAlgorithm->isDone()) { - theError = "MakeVolume algorithm failed."; - return false; - } - if (anAlgorithm->shape()->isNull()) { - theError = "Resulting shape of MakeVolume is Null."; - return false; - } - if (!anAlgorithm->isValid()) { - theError = "Resulting shape of MakeVolume is not valid."; + std::string anErr; + if (GeomAlgoAPI_Tools::AlgoError::isAlgorithmFailed(anAlgorithm, "MakeVolume", anErr)) { + theError = anErr; return false; } diff --git a/src/BuildPlugin/CMakeLists.txt b/src/BuildPlugin/CMakeLists.txt index e8201b95e..ac7d138a2 100644 --- a/src/BuildPlugin/CMakeLists.txt +++ b/src/BuildPlugin/CMakeLists.txt @@ -113,8 +113,10 @@ ADD_UNIT_TESTS(TestVertex.py TestPolyline.py TestInterpolation.py TestFace.py + TestFace_ErrorMsg.py TestShell.py TestSolid.py + TestSolid_ErrorMsg.py TestCompSolid.py TestCompound.py TestCompound_ErrorMsg.py diff --git a/src/BuildPlugin/Test/TestFace_ErrorMsg.py b/src/BuildPlugin/Test/TestFace_ErrorMsg.py new file mode 100644 index 000000000..4c3a5b9e9 --- /dev/null +++ b/src/BuildPlugin/Test/TestFace_ErrorMsg.py @@ -0,0 +1,50 @@ +## 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 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(30, -30, -30, -30) +SketchLine_2 = Sketch_1.addLine(-30, -30, -30, 30) +SketchLine_3 = Sketch_1.addLine(-30, 30, 30, 30) +SketchLine_4 = Sketch_1.addLine(30, 30, 30, -30) +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() + +Face_1 = model.addFace(Part_1_doc, [model.selection("EDGE", "Sketch_1/SketchLine_1"), model.selection("EDGE", "Sketch_1/SketchLine_2")]) +assert(Face_1.feature().error() != "") +Part_1_doc.removeFeature(Face_1.feature()) + +Face_1 = model.addFace(Part_1_doc, [model.selection("FACE", "PartSet/XOY")]) +assert(Face_1.feature().error() != "") +Part_1_doc.removeFeature(Face_1.feature()) + +model.end() diff --git a/src/BuildPlugin/Test/TestSolid_ErrorMsg.py b/src/BuildPlugin/Test/TestSolid_ErrorMsg.py new file mode 100644 index 000000000..be0205543 --- /dev/null +++ b/src/BuildPlugin/Test/TestSolid_ErrorMsg.py @@ -0,0 +1,35 @@ +## 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 ModelAPI import * +aSession = ModelAPI_Session.get() +aDocument = aSession.moduleDocument() + +# Create a part +aSession.startOperation() +aPartFeature = aDocument.addFeature("Part") +aSession.finishOperation() +aPartResult = modelAPI_ResultPart(aPartFeature.firstResult()) +aPart = aPartResult.partDoc() + +aSession.startOperation() +Solid_1 = aPart.addFeature("Solid") +aSession.finishOperation() +assert(Solid_1.error() != "") -- 2.39.2