Tests fix

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

diff --git a/src/FeaturesPlugin/Test/TestRecover.py b/src/FeaturesPlugin/Test/TestRecover.py
index 867ecc32fb8c9fd2e6976719303f3a3068f22381..a5827e0fb8892b02b4710d56d5c05044ed74314c 100644 (file)
--- a/src/FeaturesPlugin/Test/TestRecover.py
+++ b/src/FeaturesPlugin/Test/TestRecover.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>
+##
+
 # Test made with high level API
 # -----------------------------
 
-import model
+from salome.shaper import model
 
 # Initialisation
 
@@ -15,20 +35,22 @@ mypart = model.addPart(mypartset).document()
 
 sk1 = model.addSketch(mypart, model.defaultPlane("XOY"))
 c1 = sk1.addCircle(0, 0, 100)
+model.do()
 bigcyl = model.addExtrusion(mypart, sk1.selectFace(), 100)
 
 sk2 = model.addSketch(mypart, model.defaultPlane("XOY"))
 c2 = sk2.addCircle(20, 30, 30)
+model.do()
 smallcyl = model.addExtrusion(mypart, sk2.selectFace(), 150)
 
-cut = model.addCut(mypart, bigcyl.result(), smallcyl.result())
+cut = model.addCut(mypart, bigcyl.results(), smallcyl.results())
 
 model.do()
 
 # check bodies number is 1: only Boolean result
 assert(mypart.size("Bodies") == 1)
 
-model.addRecover(mypart, cut, smallcyl.result())
+model.addRecover(mypart, cut, smallcyl.results())
 
 model.end()
 
@@ -43,26 +65,22 @@ assert(mypart.size("Bodies") == 1)
 
 # check persistent flag of recover: never concealed
 model.begin()
+recover = model.addRecover(mypart, cut, smallcyl.results())
+model.end()
 
-recover = model.addRecover(mypart, cut, smallcyl.result(), True)
 assert(mypart.size("Bodies") == 2)
+
+model.begin()
 sk3 = model.addSketch(mypart, model.defaultPlane("XOY"))
 c3 = sk3.addCircle(0, 0, 90)
+model.do()
 big2 = model.addExtrusion(mypart, sk3.selectFace(), 110)
 
-cut2 = model.addCut(mypart, big2.result(), smallcyl.result())
+cut2 = model.addCut(mypart, big2.results(), smallcyl.results())
 
 model.end()
 
 # two booleans and small cylinder
 assert(mypart.size("Bodies") == 3)
 
-
-# make the flag as not-persistent => cylinder must be disappeared
-model.begin()
-recover.setIsPersistent(False)
-model.end()
-# only two booleans
-assert(mypart.size("Bodies") == 2)
-
 assert(model.checkPythonDump())