X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPythonAPI%2FTest%2FTestSketcherAddArc.py;h=7ea8f262de9970a7c23c5818fb3fc7bdd6cc6366;hb=5a602b4b32487f2922fa28e60e40b14454a503a3;hp=5899815e8da4585cbe8642955dab3901551d7f80;hpb=bac8b4bee4bcf56b74b968f769913fb752453ef3;p=modules%2Fshaper.git

diff --git a/src/PythonAPI/Test/TestSketcherAddArc.py b/src/PythonAPI/Test/TestSketcherAddArc.py
index 5899815e8..7ea8f262d 100644
--- a/src/PythonAPI/Test/TestSketcherAddArc.py
+++ b/src/PythonAPI/Test/TestSketcherAddArc.py
@@ -1,14 +1,33 @@
+## 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>
+##
+
 import unittest
 
-import model
-import geom
-from model import WrongNumberOfArguments
+from salome.shaper import model
+from salome.shaper import geom
 
 from TestSketcher import SketcherTestCase
 
 class SketcherAddArc(SketcherTestCase):
     def test_arc_by_coords(self):
-        arc = self.sketch.addArc(0, 1, 0, 0, 1, 1)
+        arc = self.sketch.addArc(0, 1, 0, 0, 1, 1, False)
         model.do()
         self.assertEqual(arc.startPoint().x(), 0)
         self.assertEqual(arc.startPoint().y(), 0)
@@ -17,23 +36,15 @@ class SketcherAddArc(SketcherTestCase):
         center = geom.Pnt2d(0, 1)
         start = geom.Pnt2d(0, 0)
         end = geom.Pnt2d(1, 1)
-        arc = self.sketch.addArc(center, start, end)
+        arc = self.sketch.addArc(center, start, end, False)
         model.do()
         self.assertEqual(arc.startPoint().x(), 0)
         self.assertEqual(arc.startPoint().y(), 0)
 
-    def test_number_of_args(self):
-        with self.assertRaises(WrongNumberOfArguments):
-            self.sketch.addArc(0, 1, 1, 1)
-        with self.assertRaises(WrongNumberOfArguments):
-            self.sketch.addArc(0, 1)
-
     def test_modify_arc(self):
         # Note: arc will modify startPoint and endPoint to be in circle
-        arc = self.sketch.addArc(0, 1, 0, 0, 1, 1)
-        arc.setCenter(0, 0)
-        arc.setStartPoint(1, 1)
-        arc.setEndPoint(-1, -1)
+        arc = self.sketch.addArc(0, 1, 0, 0, 1, 1, False)
+        arc.setByCenterStartEnd(0, 0, 1, 1, -1, -1, False)
         model.do()
         self.assertEqual(arc.center().x(), 0)
         self.assertEqual(arc.center().y(), 0)
@@ -44,4 +55,5 @@ class SketcherAddArc(SketcherTestCase):
 
 
 if __name__ == "__main__":
-    unittest.main(verbosity=2)
+    test_program = unittest.main(verbosity=2, exit=False)
+    assert test_program.result.wasSuccessful(), "Test failed"