Salome HOME
Correction for hydro_test
[modules/hydro.git] / src / HYDRO_tests / test_HYDROData_CalcCase.cxx
index 4fd6a8681ae9341b9a29373e3e56561201dbce63..e383b41d4ea82f68ec3720cc02c2ea639f603f73 100644 (file)
@@ -135,9 +135,9 @@ void test_HYDROData_CalcCase::test_complete_1()
 {  
   TCollection_AsciiString fname = REF_DATA_PATH.toLatin1().data();
   fname += "/study_cc_1.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" ) );
@@ -222,9 +222,9 @@ void test_HYDROData_CalcCase::test_complete_2()
 {  
   TCollection_AsciiString fname = REF_DATA_PATH.toLatin1().data();
   fname += "/study_cc_2.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" ) );
@@ -305,7 +305,7 @@ void test_HYDROData_CalcCase::test_complete_2()
     Handle(HYDROData_Object) aNewZone1c = Handle(HYDROData_Object)::DownCast( aNewZone1 );
     BRepGProp::SurfaceProperties(aNewZone1c->GetTopShape(), G1);
 
-    double diff = abs(G1.Mass()-m); //there is still a difference after calling of general fuse on complicated cases
+    double diff = fabs(G1.Mass()-m); //there is still a difference after calling of general fuse on complicated cases
     CPPUNIT_ASSERT(diff < 20.0);
     CPPUNIT_ASSERT_DOUBLES_EQUAL(23387.2, G1.Mass(), 0.1);
     CPPUNIT_ASSERT_DOUBLES_EQUAL(23370.1, m, 0.1);