Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'BR_2017' of ssh://git.salome-platform.org/modules/hydro into BR_2017
[modules/hydro.git]
/
src
/
HYDRO_tests
/
test_HYDROData_Bathymetry.cxx
diff --git
a/src/HYDRO_tests/test_HYDROData_Bathymetry.cxx
b/src/HYDRO_tests/test_HYDROData_Bathymetry.cxx
index 4a25258fde76f1a87e9b76a2141ff9fade3a9af5..1c0fc6edaef330264ede9456b75f64278ca925f3 100644
(file)
--- a/
src/HYDRO_tests/test_HYDROData_Bathymetry.cxx
+++ b/
src/HYDRO_tests/test_HYDROData_Bathymetry.cxx
@@
-125,10
+125,10
@@
void test_HYDROData_Bathymetry::testFileImport()
if ( !createTestFile( aFileName ) )
return; // No file has been created
if ( !createTestFile( aFileName ) )
return; // No file has been created
- CPPUNIT_ASSERT( aBathymetry->ImportFromFile
( aFileName.toStdString().c_str()
) );
+ CPPUNIT_ASSERT( aBathymetry->ImportFromFile
s( QStringList(aFileName)
) );
HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry->GetAltitudePoints();
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 );
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 );
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 );
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 );
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 );
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 );
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();
}
aDoc->Close();
}
@@
-171,10
+171,10
@@
void test_HYDROData_Bathymetry::testCopy()
if ( anIsFileCreated )
{
if ( anIsFileCreated )
{
- CPPUNIT_ASSERT( aBathymetry1->ImportFromFile
( aFileName.toStdString().c_str(
) ) );
+ CPPUNIT_ASSERT( aBathymetry1->ImportFromFile
s( QStringList(aFileName
) ) );
HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry1->GetAltitudePoints();
HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry1->GetAltitudePoints();
- CPPUNIT_ASSERT_EQUAL( 2300,
anAltitudePoints.Length
() );
+ CPPUNIT_ASSERT_EQUAL( 2300,
(int)anAltitudePoints.size
() );
}
Handle(HYDROData_Bathymetry) aBathymetry2 =
}
Handle(HYDROData_Bathymetry) aBathymetry2 =
@@
-185,7
+185,7
@@
void test_HYDROData_Bathymetry::testCopy()
if ( anIsFileCreated )
{
HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry2->GetAltitudePoints();
if ( anIsFileCreated )
{
HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry2->GetAltitudePoints();
- CPPUNIT_ASSERT_EQUAL( 2300,
anAltitudePoints.Length
() );
+ CPPUNIT_ASSERT_EQUAL( 2300,
(int)anAltitudePoints.size
() );
}
aDoc->Close();
}
aDoc->Close();