X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_Bathymetry.cxx;h=1c0fc6edaef330264ede9456b75f64278ca925f3;hb=15aed67b5f26dad1f17035be35bcd570e947158c;hp=54b6631f62d11878abe5722947d56cf59adb06f6;hpb=c305a67ff4752ad6025962f5ec87e8db650325e0;p=modules%2Fhydro.git diff --git a/src/HYDRO_tests/test_HYDROData_Bathymetry.cxx b/src/HYDRO_tests/test_HYDROData_Bathymetry.cxx index 54b6631f..1c0fc6ed 100644 --- a/src/HYDRO_tests/test_HYDROData_Bathymetry.cxx +++ b/src/HYDRO_tests/test_HYDROData_Bathymetry.cxx @@ -128,7 +128,7 @@ void test_HYDROData_Bathymetry::testFileImport() CPPUNIT_ASSERT( aBathymetry->ImportFromFiles( QStringList(aFileName)) ); HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry->GetAltitudePoints(); - CPPUNIT_ASSERT_EQUAL( 2300, anAltitudePoints.Length() ); + CPPUNIT_ASSERT_EQUAL( 2300, (int)anAltitudePoints.size() ); gp_XY aTestPoint( 1, 1 ); double anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint, 1 ); @@ -136,7 +136,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 +144,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(); } @@ -174,7 +174,7 @@ void test_HYDROData_Bathymetry::testCopy() CPPUNIT_ASSERT( aBathymetry1->ImportFromFiles( QStringList(aFileName ) ) ); HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry1->GetAltitudePoints(); - CPPUNIT_ASSERT_EQUAL( 2300, anAltitudePoints.Length() ); + CPPUNIT_ASSERT_EQUAL( 2300, (int)anAltitudePoints.size() ); } Handle(HYDROData_Bathymetry) aBathymetry2 = @@ -185,7 +185,7 @@ void test_HYDROData_Bathymetry::testCopy() if ( anIsFileCreated ) { HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry2->GetAltitudePoints(); - CPPUNIT_ASSERT_EQUAL( 2300, anAltitudePoints.Length() ); + CPPUNIT_ASSERT_EQUAL( 2300, (int)anAltitudePoints.size() ); } aDoc->Close();