X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParametersPlugin%2FTest%2FTestParameterChangeValue.py;h=f6816c87b5b637d7c65ad62fd887a63dadaae682;hb=09365c927ebe8d881de2eda7f96bc33a2d9511c8;hp=c78775aee17bbd28d8891e9e1cb051148c45f919;hpb=08772a0d243521482396981ddd3737067f30e349;p=modules%2Fshaper.git

diff --git a/src/ParametersPlugin/Test/TestParameterChangeValue.py b/src/ParametersPlugin/Test/TestParameterChangeValue.py
index c78775aee..f6816c87b 100644
--- a/src/ParametersPlugin/Test/TestParameterChangeValue.py
+++ b/src/ParametersPlugin/Test/TestParameterChangeValue.py
@@ -1,16 +1,35 @@
+# Copyright (C) 2014-2019  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
+#
+
 """
     TestParameterCreation.py
-    
+
     class ParametersPlugin_Parameter
     static const std::string MY_PARAMETER_ID("Parameter");
     static const std::string MY_VARIABLE_ID("variable");
     static const std::string MY_EXPRESSION_ID("expression");
-    
+
     data()->addAttribute(ParametersPlugin_Parameter::VARIABLE_ID(),
                          ModelAPI_AttributeString::typeId());
     data()->addAttribute(ParametersPlugin_Parameter::EXPRESSION_ID(),
                          ModelAPI_AttributeString::typeId());
-                         
+
     class ModelAPI_ResultParameter
     static const std::string MY_VALUE_ID("Value");
     static const std::string MY_VALUE_ID("State");
@@ -23,7 +42,7 @@ from GeomDataAPI import *
 from ModelAPI import *
 import math
 import unittest
-import model
+from salome.shaper import model
 
 __updated__ = "2015-04-27"
 
@@ -79,8 +98,8 @@ class TestParameterRename(unittest.TestCase):
         norm = geomDataAPI_Dir(aSketchFeature.attribute("Norm"))
         norm.setValue(0, 0, 1)
         aSketchCircle = aSketchFeature.addFeature("SketchCircle")
-        anCircleCentr = geomDataAPI_Point2D(aSketchCircle.attribute("CircleCenter"))
-        aRadiusAttr = aSketchCircle.real("CircleRadius")
+        anCircleCentr = geomDataAPI_Point2D(aSketchCircle.attribute("circle_center"))
+        aRadiusAttr = aSketchCircle.real("circle_radius")
         anCircleCentr.setValue(10., 20.)
         aRadiusAttr.setValue(10.)
         self.aSession.finishOperation()
@@ -99,8 +118,10 @@ class TestParameterRename(unittest.TestCase):
         aStartPoint = geomDataAPI_Point2D(anOY.attribute("StartPoint"))
         anEndPoint = geomDataAPI_Point2D(anOY.attribute("EndPoint"))
         aStartPoint.setValue(0., 0.)
-        anEndPoint.SetValue(0., 100.)
-        anOY.selection("External").selectSubShape("EDGE", "OY")
+        anEndPoint.setValue(0., 100.)
+        anOYRes = modelAPI_Result(self.aDocument.objectByName("Construction", "OY"))
+        anOY.selection("External").setValue(anOYRes, anOYRes.shape())
+        anOY.execute()
         refattrB.setObject(modelAPI_ResultConstruction(anOY.firstResult()))
         value = aDistanceConstraint1.real("ConstraintValue")
         value.setText("x1 + 10.0")
@@ -114,8 +135,10 @@ class TestParameterRename(unittest.TestCase):
         aStartPoint = geomDataAPI_Point2D(anOX.attribute("StartPoint"))
         anEndPoint = geomDataAPI_Point2D(anOX.attribute("EndPoint"))
         aStartPoint.setValue(0., 0.)
-        anEndPoint.SetValue(100., 0.)
-        anOX.selection("External").selectSubShape("EDGE", "OX")
+        anEndPoint.setValue(100., 0.)
+        anOXRes = modelAPI_Result(self.aDocument.objectByName("Construction", "OX"))
+        anOX.selection("External").setValue(anOXRes, anOXRes.shape())
+        anOX.execute()
         refattrB.setObject(modelAPI_ResultConstruction(anOX.firstResult()))
         value = aDistanceConstraint2.real("ConstraintValue")
         value.setText("x1 + 20.0")
@@ -140,7 +163,7 @@ class TestParameterRename(unittest.TestCase):
         aParam.string("expression").setValue("200.0")
         self.aSession.finishOperation()
 
-        # Check value of the parameter 
+        # Check value of the parameter
         self.assertEqual(aResultAttr.data().real("Value").value(), 200.)
         # Check value of references
         aParam = self.dtParams["x2"]
@@ -151,8 +174,9 @@ class TestParameterRename(unittest.TestCase):
         self.assertEqual(self.anCircleCentr.y(), 220.)
         self.assertEqual(self.aRadiusAttr.value(), 200.)
 
-if __name__ == '__main__':
-    unittest.main()
+if __name__ == "__main__":
+    test_program = unittest.main(exit=False)
+    assert test_program.result.wasSuccessful(), "Test failed"
 #=========================================================================
 # End of test
 #=========================================================================