Cosmetics. Move XML files to the separate folder inside a corresponding project in VS.

[modules/shaper.git] / src / SketchPlugin / Test / TestMoveEllipse.py

diff --git a/src/SketchPlugin/Test/TestMoveEllipse.py b/src/SketchPlugin/Test/TestMoveEllipse.py
index 3795ee82aca4e9b202f26516a21dde19e249f351..7e93da02d6c5c888974c83b5b527602fd2ca10e8 100644 (file)
--- a/src/SketchPlugin/Test/TestMoveEllipse.py
+++ b/src/SketchPlugin/Test/TestMoveEllipse.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019  CEA/DEN, EDF R&D
+# Copyright (C) 2017-2020  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
@@ -42,6 +42,7 @@ class TestMoveEllipse(unittest.TestCase):
     model.do()
     self.checkDOF()
     self.myMajorRadius = self.myEllipse.majorRadius().value()
+    self.NB_DIGITS_RADIUS = 7 - math.floor(math.log10(self.myMinorRadius))
 
   def tearDown(self):
     self.checkDOF()
@@ -66,7 +67,7 @@ class TestMoveEllipse(unittest.TestCase):
     distPF1 = model.distancePointPoint(firstFocus2d,  point)
     secondFocus2d = GeomAPI_Pnt2d(theEllipse.secondFocus().x(), theEllipse.secondFocus().y())
     distPF2 = model.distancePointPoint(secondFocus2d,  point)
-    self.assertAlmostEqual(distPF1 + distPF2, 2.0 * theEllipse.majorRadius().value(), 7 - math.floor(math.log10(theEllipse.majorRadius().value())))
+    self.assertAlmostEqual(distPF1 + distPF2, 2.0 * theEllipse.majorRadius().value(), 7 - math.floor(math.log10(2.0 * theEllipse.majorRadius().value())))
 
   def fixMajorRadius(self):
     self.mySketch.setDistance(self.myEllipse.center(), self.myEllipse.majorAxisPositive(), self.myMajorRadius)
@@ -94,8 +95,8 @@ class TestMoveEllipse(unittest.TestCase):
     self.mySketch.move(self.myEllipse.center(), newPosition[0], newPosition[1])
     model.do()
     self.checkPointCoordinates(self.myEllipse.center(), newPosition)
-    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius)
-    self.assertAlmostEqual(self.myEllipse.majorRadius().value(), self.myMajorRadius)
+    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius, self.NB_DIGITS_RADIUS)
+    self.assertAlmostEqual(self.myEllipse.majorRadius().value(), self.myMajorRadius, self.NB_DIGITS_RADIUS)
 
   def test_move_free_ellipse(self):
     """ Test 2. Movement of a free ellipse dragging the edge
@@ -117,8 +118,8 @@ class TestMoveEllipse(unittest.TestCase):
     self.mySketch.move(self.myEllipse.center(), newPosition[0], newPosition[1])
     model.do()
     self.checkPointCoordinates(self.myEllipse.center(), newPosition)
-    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius)
-    self.assertAlmostEqual(self.myEllipse.majorRadius().value(), self.myMajorRadius)
+    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius, self.NB_DIGITS_RADIUS)
+    self.assertAlmostEqual(self.myEllipse.majorRadius().value(), self.myMajorRadius, self.NB_DIGITS_RADIUS)
 
   def test_move_ellipse_fixed_major_radius(self):
     """ Test 4. Movement of ellipse with fixed major radius
@@ -130,7 +131,7 @@ class TestMoveEllipse(unittest.TestCase):
     model.do()
     self.checkPointOnEllipse(newPosition, self.myEllipse)
     self.assertNotEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius)
-    self.assertAlmostEqual(self.myEllipse.majorRadius().value(), self.myMajorRadius)
+    self.assertAlmostEqual(self.myEllipse.majorRadius().value(), self.myMajorRadius, self.NB_DIGITS_RADIUS)
 
   def test_move_center_ellipse_fixed_minor_radius(self):
     """ Test 5. Movement of central point of ellipse with fixed minor radius
@@ -141,8 +142,8 @@ class TestMoveEllipse(unittest.TestCase):
     self.mySketch.move(self.myEllipse.center(), newPosition[0], newPosition[1])
     model.do()
     self.checkPointCoordinates(self.myEllipse.center(), newPosition)
-    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius)
-    self.assertAlmostEqual(self.myEllipse.majorRadius().value(), self.myMajorRadius)
+    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius, self.NB_DIGITS_RADIUS)
+    self.assertAlmostEqual(self.myEllipse.majorRadius().value(), self.myMajorRadius, self.NB_DIGITS_RADIUS)
 
   def test_move_ellipse_fixed_minor_radius(self):
     """ Test 6. Movement of ellipse with fixed minor radius
@@ -153,7 +154,7 @@ class TestMoveEllipse(unittest.TestCase):
     self.mySketch.move(self.myEllipse.defaultResult(), newPosition.x(), newPosition.y())
     model.do()
     self.checkPointOnEllipse(newPosition, self.myEllipse)
-    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius)
+    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius, self.NB_DIGITS_RADIUS)
     self.assertNotEqual(self.myEllipse.majorRadius().value(), self.myMajorRadius)
 
   def test_move_center_ellipse_fixed_center(self):
@@ -165,8 +166,8 @@ class TestMoveEllipse(unittest.TestCase):
     self.mySketch.move(self.myEllipse.center(), newPosition[0], newPosition[1])
     model.do()
     self.checkPointCoordinates(self.myEllipse.center(), self.myCenter)
-    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius)
-    self.assertAlmostEqual(self.myEllipse.majorRadius().value(), self.myMajorRadius)
+    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius, self.NB_DIGITS_RADIUS)
+    self.assertAlmostEqual(self.myEllipse.majorRadius().value(), self.myMajorRadius, self.NB_DIGITS_RADIUS)
 
   def test_move_ellipse_fixed_center(self):
     """ Test 8. Movement of ellipse with fixed center
@@ -202,8 +203,8 @@ class TestMoveEllipse(unittest.TestCase):
     self.mySketch.move(self.myEllipse.firstFocus(), newPosition.x(), newPosition.y())
     model.do()
     self.checkPointCoordinates(self.myEllipse.firstFocus(), self.myFocus)
-    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius)
-    self.assertAlmostEqual(self.myEllipse.majorRadius().value(), self.myMajorRadius)
+    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius, self.NB_DIGITS_RADIUS)
+    self.assertAlmostEqual(self.myEllipse.majorRadius().value(), self.myMajorRadius, self.NB_DIGITS_RADIUS)
 
   def test_move_ellipse_fixed_focus(self):
     """ Test 11. Movement of ellipse with fixed focus
@@ -231,10 +232,9 @@ class TestMoveEllipse(unittest.TestCase):
     model.do()
     self.checkPointCoordinates(self.myEllipse.center(), self.myCenter)
     self.checkPointCoordinates(self.myEllipse.firstFocus(), self.myFocus)
-    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius)
+    self.assertAlmostEqual(self.myEllipse.minorRadius().value(), self.myMinorRadius, self.NB_DIGITS_RADIUS)
 
 
 if __name__ == "__main__":
     test_program = unittest.main(exit=False)
     assert test_program.result.wasSuccessful(), "Test failed"
-    assert(model.checkPythonDump())