X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=test.API%2FSHAPER%2FGDML%2FTestAPI_ConeSegment.py;h=9d7969226a358e4d588ad6c4ec0b4c59a1b6da2a;hb=06e7f5859095193fc7f498bd89a7d28009794f53;hp=59a58dde36c96890cf5edd6c5cd3fb7db50eb583;hpb=94ca85ef974b0954692ce0dedf578f7427e939ad;p=modules%2Fshaper.git

diff --git a/test.API/SHAPER/GDML/TestAPI_ConeSegment.py b/test.API/SHAPER/GDML/TestAPI_ConeSegment.py
index 59a58dde3..9d7969226 100644
--- a/test.API/SHAPER/GDML/TestAPI_ConeSegment.py
+++ b/test.API/SHAPER/GDML/TestAPI_ConeSegment.py
@@ -1,85 +1,70 @@
-# Copyright (C) 2014-2016 CEA/DEN, EDF R&D
-
-# File:        TestAPI_Box.py
-# Created:     29 Nov 2016
-# Author:      Clarisse Genrault (CEA)
+# Copyright (C) 2014-2023  CEA, EDF
+#
+# 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
+#
 
 from GeomAlgoAPI import GeomAlgoAPI_ShapeAPI as shaperpy
 from GeomAlgoAPI import GeomAlgoAPI_Exception as myExcept
 from GeomAPI import GeomAPI_Pnt as pnt
 
-# Create several "cone segment"
-try :    
-  CS1 = shaperpy.makeConeSegment(7.,11.,5.,8.,12.,0.,270.)
-except myExcept,ec:
-  print ec.what()
-  
-try :    
-  CS2 = shaperpy.makeConeSegment(5.,10.,7.,15.,15.,45.,180.)
-except myExcept,ec:
-  print ec.what()
-
-try :    
-  CS3 = shaperpy.makeConeSegment(5.,10.,7.,15.,15.,-45.,180.)
-except myExcept,ec:
-  print ec.what()
-  
-try :    
-  CS4 = shaperpy.makeConeSegment(0.,10.,2.,7.,3.,0.,270.)
-except myExcept,ec:
-  print ec.what()
-
-try :    
-  CS5 = shaperpy.makeConeSegment(5.,8.,0.,6.,10.,45.,270.)
-except myExcept,ec:
-  print ec.what()
-
-try :    
-  CS6 = shaperpy.makeConeSegment(0.,6.,0.,4.,17.,0.,270.)
-except myExcept,ec:
-  print ec.what()
-
-try :    
-  CS7 = shaperpy.makeConeSegment(7.,11.,5.,8.,12.,0.,360.)
-except myExcept,ec:
-  print ec.what()
+CS1 = shaperpy.makeConeSegment(7.,11.,5.,8.,12.,0.,270.)
+CS2 = shaperpy.makeConeSegment(5.,10.,7.,15.,15.,45.,180.)
+CS3 = shaperpy.makeConeSegment(5.,10.,7.,15.,15.,-45.,180.)
+CS4 = shaperpy.makeConeSegment(0.,10.,2.,7.,3.,0.,270.)
+CS5 = shaperpy.makeConeSegment(5.,8.,0.,6.,10.,45.,270.)
+CS6 = shaperpy.makeConeSegment(0.,6.,0.,4.,17.,0.,270.)
+CS7 = shaperpy.makeConeSegment(7.,11.,5.,8.,12.,0.,360.)
 
-try :    
-  CS8 = shaperpy.makeConeSegment(-5.,11.,5.,8.,12.,0.,270.)
-except myExcept,ec:
-  print ec.what()
+try :
+    CS8 = shaperpy.makeConeSegment(-5.,11.,5.,8.,12.,0.,270.)
+except myExcept as ec:
+    assert(ec.what() == "Cone Segment builder :: rmin1 is negative.")
 
-try :    
-  CS9 = shaperpy.makeConeSegment(11.,7.,5.,8.,12.,0.,270.)
-except myExcept,ec:
-  print ec.what()
+try :
+    CS9 = shaperpy.makeConeSegment(11.,7.,5.,8.,12.,0.,270.)
+except myExcept as ec:
+    assert(ec.what() == "Cone Segment builder :: rmin1 is larger than rmax1.")
 
-try :    
-  CS10 = shaperpy.makeConeSegment(7.,11.,8.,5.,12.,0.,270.)
-except myExcept,ec:
-  print ec.what()
+try :
+    CS10 = shaperpy.makeConeSegment(7.,11.,8.,5.,12.,0.,270.)
+except myExcept as ec:
+    assert(ec.what() == "Cone Segment builder :: rmin2 is larger than rmax2.")
 
-try :    
-  CS11 = shaperpy.makeConeSegment(7.,11.,-3.,5.,12.,0.,270.)
-except myExcept,ec:
-  print ec.what()
+try :
+    CS11 = shaperpy.makeConeSegment(7.,11.,-3.,5.,12.,0.,270.)
+except myExcept as ec:
+    assert(ec.what() == "Cone Segment builder :: rmin2 is negative.")
 
-try :    
-  CS12 = shaperpy.makeConeSegment(7.,11.,5.,8.,0.,0.,270.)
-except myExcept,ec:
-  print ec.what()
+try :
+    CS12 = shaperpy.makeConeSegment(7.,11.,5.,8.,0.,0.,270.)
+except myExcept as ec:
+    assert(ec.what() == "Cone Segment builder :: z is negative or null.")
 
-try :    
-  CS13 = shaperpy.makeConeSegment(7.,11.,5.,8.,-10.,0.,270.)
-except myExcept,ec:
-  print ec.what()
+try :
+    CS13 = shaperpy.makeConeSegment(7.,11.,5.,8.,-10.,0.,270.)
+except myExcept as ec:
+    assert(ec.what() == "Cone Segment builder :: z is negative or null.")
 
-try :    
-  CS14 = shaperpy.makeConeSegment(7.,11.,5.,8.,12.,-45.,-45.)
-except myExcept,ec:
-  print ec.what()
+try :
+    CS14 = shaperpy.makeConeSegment(7.,11.,5.,8.,12.,-45.,-45.)
+except myExcept as ec:
+    assert(ec.what() == "Cone Segment builder :: deltaphi is negative or null.")
 
-try :    
-  CS15 = shaperpy.makeConeSegment(7.,11.,5.,8.,12.,45.,450.)
-except myExcept,ec:
-  print ec.what()
\ No newline at end of file
+try :
+    CS15 = shaperpy.makeConeSegment(7.,11.,5.,8.,12.,45.,450.)
+except myExcept as ec:
+    assert(ec.what() == "Cone Segment builder :: deltaphi is larger than 360 degree.")
\ No newline at end of file