Merge branch 'master' into cgt/devCEA

[modules/shaper.git] / src / PythonAPI / Test / TestSketcherSetEqual.py

diff --git a/src/PythonAPI/Test/TestSketcherSetEqual.py b/src/PythonAPI/Test/TestSketcherSetEqual.py
index 49656292709c5e2bdb975ae7d76986d4b0c7f5e6..2e6b986953efd89a7c97bfe7fc42e10e056163b0 100644 (file)
--- a/src/PythonAPI/Test/TestSketcherSetEqual.py
+++ b/src/PythonAPI/Test/TestSketcherSetEqual.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from salome.shaper import model
 import math
 import TestSketcher
 from TestSketcher import SketcherTestCase
@@ -14,12 +14,12 @@ class SketcherSetEqual(SketcherTestCase):
         model.do()
         # Check the result
         length_1 = math.sqrt(
-            math.pow((l1.endPointData().x() - l1.startPointData().x()), 2) +
-            math.pow((l1.endPointData().y() - l1.startPointData().y()), 2)
+            math.pow((l1.endPoint().x() - l1.startPoint().x()), 2) +
+            math.pow((l1.endPoint().y() - l1.startPoint().y()), 2)
             )
         length_2 = math.sqrt(
-            math.pow((l2.endPointData().x() - l2.startPointData().x()), 2) +
-            math.pow((l2.endPointData().y() - l2.startPointData().y()), 2)
+            math.pow((l2.endPoint().x() - l2.startPoint().x()), 2) +
+            math.pow((l2.endPoint().y() - l2.startPoint().y()), 2)
             )
         self.assertAlmostEqual(length_1, length_2, delta=TestSketcher.DELTA)
 
@@ -27,13 +27,13 @@ class SketcherSetEqual(SketcherTestCase):
         # Set the constraint
         circle_1 = self.sketch.addCircle(0, 0, 10.0)
         circle_2 = self.sketch.addCircle(1, 2, 25.0)
-        self.sketch.setEqual(circle_1.result(), circle_2.result())
+        self.sketch.setEqual(circle_1.defaultResult(), circle_2.defaultResult())
         # Commit the transaction
         model.do()
         # Check the result
         self.assertAlmostEqual(
-            circle_1.radiusData().value(),
-            circle_2.radiusData().value(),
+            circle_1.radius().value(),
+            circle_2.radius().value(),
             delta=TestSketcher.DELTA
             )