Adjust unit tests for Boolean Fill

[modules/shaper.git] / src / FeaturesPlugin / Test / TestRevolutionFuse.py

diff --git a/src/FeaturesPlugin/Test/TestRevolutionFuse.py b/src/FeaturesPlugin/Test/TestRevolutionFuse.py
index 9ece5c99db841b493987bb875358ebb01eb86317..659cde9b85c87ece2acb93bbbee586e4c734c230 100644 (file)
--- a/src/FeaturesPlugin/Test/TestRevolutionFuse.py
+++ b/src/FeaturesPlugin/Test/TestRevolutionFuse.py
@@ -1,7 +1,27 @@
+## Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+##
+
 """
       TestRevolutionFuse.py
       Unit test of FeaturesPlugin_RevolutionFuse class
-      
+
       class FeaturesPlugin_RevolutionFuse : public FeaturesPlugin_RevolutionBoolean
                static const std::string MY_REVOLUTION_ID("RevolutionFuse");
         static const std::string MY_SKETCH_OBJECT_ID("sketch");
@@ -61,8 +81,8 @@ norm = geomDataAPI_Dir(aCircleSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
 # Create circle
 aSketchCircle = aCircleSketchFeature.addFeature("SketchCircle")
-anCircleCentr = geomDataAPI_Point2D(aSketchCircle.attribute("CircleCenter"))
-aCircleRadius = aSketchCircle.real("CircleRadius")
+anCircleCentr = geomDataAPI_Point2D(aSketchCircle.attribute("circle_center"))
+aCircleRadius = aSketchCircle.real("circle_radius")
 anCircleCentr.setValue(0, 0)
 aCircleRadius.setValue(20)
 aSession.finishOperation()
@@ -142,21 +162,26 @@ dirx = geomDataAPI_Dir(aCircleSketchFeature.attribute("DirX"))
 dirx.setValue(1, 0, 0)
 norm = geomDataAPI_Dir(aCircleSketchFeature.attribute("Norm"))
 norm.setValue(0, 0, 1)
-aCircleSketchFeature.selection("External").selectSubShape("face", "Extrusion_1/TopFace_1")
+aCircleSketchFeature.selection("External").selectSubShape("face", "Extrusion_1/To_Face_1")
+aSession.startOperation()
 aSketchCircle = aCircleSketchFeature.addFeature("SketchCircle")
-anCircleCentr = geomDataAPI_Point2D(aSketchCircle.attribute("CircleCenter"))
-aCircleRadius = aSketchCircle.real("CircleRadius")
+anCircleCentr = geomDataAPI_Point2D(aSketchCircle.attribute("circle_center"))
+aCircleRadius = aSketchCircle.real("circle_radius")
 anCircleCentr.setValue(0, 0)
 aCircleRadius.setValue(10)
 aSession.finishOperation()
+aSession.finishOperation()
+aSession.startOperation()
+aCircleSketchFeature.execute() # execute for sketch should be called here, because it is not set as current feature, so it is disabled.
+anRevolutionFuseFt.selectionList("base").append(aCircleSketchFeature.firstResult(), None)
 anRevolutionFuseFt.selection("axis_object").setValue(aLineSketchResult, aLineEdge)
 anRevolutionFuseFt.string("CreationMethod").setValue("ByAngles")
 anRevolutionFuseFt.real("to_angle").setValue(50)
 anRevolutionFuseFt.real("from_angle").setValue(50)
 anRevolutionFuseFt.real("to_offset").setValue(0) #TODO: remove
 anRevolutionFuseFt.real("from_offset").setValue(0) #TODO: remove
-anRevolutionFuseFt.selectionList("boolean_objects").append(anExtrusionResult, anExtrusionResult.shape())
-anRevolutionFuseFt.execute()
+anRevolutionFuseFt.selectionList("main_objects").append(anExtrusionResult, anExtrusionResult.shape())
+aSession.finishOperation()
 aSession.finishOperation()
 
 #=========================================================================
@@ -167,4 +192,6 @@ assert (aFactory.validate(anRevolutionFuseFt))
 assert (len(anRevolutionFuseFt.results()) > 0)
 aCurrentResult = modelAPI_ResultBody(anRevolutionFuseFt.firstResult())
 assert (aCurrentResult is not None)
-aSession.finishOperation()
\ No newline at end of file
+
+from salome.shaper import model
+assert(model.checkPythonDump())