X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPythonAPI%2FTest%2FTestSketcherAddArc.py;h=7ea8f262de9970a7c23c5818fb3fc7bdd6cc6366;hb=5a602b4b32487f2922fa28e60e40b14454a503a3;hp=9b433f0fde4f756bd9d4d03b3ed506b7c5d466af;hpb=07683d9c10e21258e1379f356ca7c40cbc56f404;p=modules%2Fshaper.git diff --git a/src/PythonAPI/Test/TestSketcherAddArc.py b/src/PythonAPI/Test/TestSketcherAddArc.py index 9b433f0fd..7ea8f262d 100644 --- a/src/PythonAPI/Test/TestSketcherAddArc.py +++ b/src/PythonAPI/Test/TestSketcherAddArc.py @@ -1,46 +1,59 @@ +## 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 +## + 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): +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.startPointData().x(), 0) - self.assertEqual(arc.startPointData().y(), 0) - + self.assertEqual(arc.startPoint().x(), 0) + self.assertEqual(arc.startPoint().y(), 0) + def test_arc_by_points(self): 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.startPointData().x(), 0) - self.assertEqual(arc.startPointData().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) - + self.assertEqual(arc.startPoint().x(), 0) + self.assertEqual(arc.startPoint().y(), 0) + def test_modify_arc(self): - arc = self.sketch.addArc(0, 1, 0, 0, 1, 1) - arc.setCenter(0, 0) - arc.setStartPoint(-1.0, 0) - arc.setEndPoint(0, 1.0) + # Note: arc will modify startPoint and endPoint to be in circle + 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.centerData().x(), 0) - self.assertEqual(arc.centerData().y(), 0) - self.assertEqual(arc.startPointData().x(), -1) - self.assertEqual(arc.startPointData().y(), 0) - self.assertEqual(arc.endPointData().x(), 0) - self.assertEqual(arc.endPointData().y(), 1) - - + self.assertEqual(arc.center().x(), 0) + self.assertEqual(arc.center().y(), 0) + self.assertEqual(arc.startPoint().x(), 1) + self.assertEqual(arc.startPoint().y(), 1) + self.assertEqual(arc.endPoint().x(), -1) + self.assertEqual(arc.endPoint().y(), -1) + + if __name__ == "__main__": - unittest.main(verbosity=2) \ No newline at end of file + test_program = unittest.main(verbosity=2, exit=False) + assert test_program.result.wasSuccessful(), "Test failed"