X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_Bathymetry.cxx;h=a243d1aef5e46137bc2367792ea9532e0491815f;hb=3bece499e83cc9ca95536228c7f6740030e9d5d8;hp=202d1a7137356ca2a1f9ea1b270b70121d6837a6;hpb=ccf0c94c7ad984eddae21372ca02edbaf1d6bb1e;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_HYDROData_Bathymetry.cxx b/src/HYDRO_tests/test_HYDROData_Bathymetry.cxx
index 202d1a71..a243d1ae 100644
--- a/src/HYDRO_tests/test_HYDROData_Bathymetry.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Bathymetry.cxx
@@ -32,6 +32,7 @@
 #include <gp_Pnt2d.hxx>
 
 const double EPS = 1E-4;
+extern QString TMP_DIR;
 
 void generateOne( QTextStream& theStream,
                   double theFirstX, double theFirstY,
@@ -116,12 +117,12 @@ bool test_HYDROData_Bathymetry::createTestFile( const QString& theFileName )
 
 void test_HYDROData_Bathymetry::testFileImport()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( 1 );
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
 
   Handle(HYDROData_Bathymetry) aBathymetry = 
     Handle(HYDROData_Bathymetry)::DownCast( aDoc->CreateObject( KIND_BATHYMETRY ) );
 
-  QString aFileName = QDir::tempPath() + QDir::separator() + "test.xyz";
+  QString aFileName = TMP_DIR + QDir::separator() + "test.xyz";
   if ( !createTestFile( aFileName ) )
     return; // No file has been created
 
@@ -136,7 +137,7 @@ void test_HYDROData_Bathymetry::testFileImport()
 
   aTestPoint = gp_XY( 0.5, 0.5 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint, 1 );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( -0.7127, anAltitude, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( -0.591602, anAltitude, EPS );
 
   aTestPoint = gp_XY( 1.5, 1 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint, 1 );
@@ -144,15 +145,15 @@ void test_HYDROData_Bathymetry::testFileImport()
 
   aTestPoint = gp_XY( 1.5, 0.7 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint, 1 );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL(  -0.4116, anAltitude, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( -0.591602, anAltitude, EPS );
 
   aTestPoint = gp_XY( 1.5, -0.7 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint, 1 );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( -0.0479, anAltitude, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( -0.271267, anAltitude, EPS );
 
   aTestPoint = gp_XY( 2, 3.5 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint, 1 );
-  CPPUNIT_ASSERT_DOUBLES_EQUAL( 13.2525, anAltitude, EPS );
+  CPPUNIT_ASSERT_DOUBLES_EQUAL( 13.9454, anAltitude, EPS );
 
   aDoc->Close();
 }
@@ -160,12 +161,12 @@ void test_HYDROData_Bathymetry::testFileImport()
 
 void test_HYDROData_Bathymetry::testCopy()
 {
-  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document(1);
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
   
   Handle(HYDROData_Bathymetry) aBathymetry1 = 
     Handle(HYDROData_Bathymetry)::DownCast( aDoc->CreateObject( KIND_BATHYMETRY ) );
 
-  QString aFileName = QDir::tempPath() + QDir::separator() + "test.xyz";
+  QString aFileName = TMP_DIR + QDir::separator() + "test.xyz";
 
   bool anIsFileCreated = createTestFile( aFileName );