Merge branch 'BR_PY3' of https://git.forge.pleiade.edf.fr/git/modules-salome.hydro...

[modules/hydro.git] / src / HYDRO_tests / test_HYDROData_DTM.cxx

diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx
index be6e80ef6e485ebf53c828d42e48f774eadff15e..9cc0ea758876f3975397cf6964ab1f61201ac986 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_DTM.cxx
+++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx
@@ -160,7 +160,7 @@ void test_HYDROData_DTM::setUp()
 
 void test_HYDROData_DTM::test_creation()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_DTM) DTM = 
     Handle(HYDROData_DTM)::DownCast( aDoc->CreateObject( KIND_DTM ) );
@@ -172,7 +172,7 @@ void test_HYDROData_DTM::test_creation()
 
 void test_HYDROData_DTM::test_hydraulic_axis()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_Profile) aProfile1 = 
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
@@ -225,7 +225,7 @@ void test_HYDROData_DTM::test_hydraulic_axis()
 
 void test_HYDROData_DTM::test_profile_conversion_to_2d()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_Profile) aProfile1 = 
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
@@ -296,7 +296,7 @@ void test_HYDROData_DTM::test_profile_conversion_to_2d()
 
 void test_HYDROData_DTM::test_profile_properties()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_Profile) aProfile = 
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
@@ -332,7 +332,7 @@ void test_HYDROData_DTM::test_profile_properties()
 
 void test_HYDROData_DTM::test_profile_discretization_polyline()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_Profile) aProfile = 
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
@@ -371,7 +371,7 @@ void test_HYDROData_DTM::test_profile_discretization_polyline()
 
 void test_HYDROData_DTM::test_profile_discretization_spline()
 {
-Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_Profile) aProfile = 
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
@@ -479,7 +479,7 @@ void test_HYDROData_DTM::test_curves_interpolation()
 
 void test_HYDROData_DTM::test_curve_to_3d()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_Profile) aProfile1 = 
     Handle(HYDROData_Profile)::DownCast( aDoc->CreateObject( KIND_PROFILE ) );
@@ -523,7 +523,7 @@ void test_HYDROData_DTM::test_curve_to_3d()
 
 void test_HYDROData_DTM::test_presentation()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_DTM) DTM = Handle(HYDROData_DTM)::DownCast( aDoc->CreateObject( KIND_DTM ) );
 
@@ -578,7 +578,7 @@ void test_HYDROData_DTM::test_presentation()
 
 void test_HYDROData_DTM::test_garonne()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   
   TCollection_AsciiString fname = REF_DATA_PATH.toLatin1().data();
   fname += "/Profiles.xyz";
@@ -634,9 +634,9 @@ void test_HYDROData_DTM::test_classifier_1()
 {
   TCollection_AsciiString fname = REF_DATA_PATH.toLatin1().data();
   fname += "/pb_1066.cbf";
-  CPPUNIT_ASSERT_EQUAL( (int)DocError_OK, (int)HYDROData_Document::Load( fname.ToCString(), 1 ) );
+  CPPUNIT_ASSERT_EQUAL( (int)DocError_OK, (int)HYDROData_Document::Load( fname.ToCString() ) );
 
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   
   Handle(HYDROData_CalculationCase) aCase = 
     Handle(HYDROData_CalculationCase)::DownCast( aDoc->FindObjectByName( "Case_1" ) );
@@ -672,7 +672,7 @@ void test_HYDROData_DTM::test_classifier_1()
 
 void test_HYDROData_DTM::test_profile_discretization_warnings()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   {
     Handle(HYDROData_Profile) aProfile =