Testing of Bathymetry object.

diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx
index 66223a3a37d2c0d2fa9daa34e82472903eef2bc1..0de3988706ac0c61cb333fec23a297d3f042ee10 100644 (file)
--- a/src/HYDROData/HYDROData_Bathymetry.cxx
+++ b/src/HYDROData/HYDROData_Bathymetry.cxx
@@ -91,11 +91,9 @@ HYDROData_Bathymetry::AltitudePoints HYDROData_Bathymetry::GetAltitudePoints() c
   if ( !myLab.FindChild( DataTag_AltitudePoints ).FindAttribute( TDataStd_RealArray::GetID(), aCoordsArray ) )
     return aPoints;
 
-  int aLowerIdx = aCoordsArray->Lower();
-  int anUpperIdx = aCoordsArray->Upper();
   for ( int i = aCoordsArray->Lower(), n = aCoordsArray->Upper(); i <= n; )
   {
-    if ( i + 3 > n )
+    if ( i + 3 > n + 1 )
       break;
 
     AltitudePoint aPoint;

diff --git a/src/HYDROData/test_HYDROData_Bathymetry.cxx b/src/HYDROData/test_HYDROData_Bathymetry.cxx
index 2a1a95c2bc4139566c598f7f1d07894ad9aab33f..51f61efae7ee3325ad4b0ddcaff56d7ecefc7a0f 100755 (executable)
--- a/src/HYDROData/test_HYDROData_Bathymetry.cxx
+++ b/src/HYDROData/test_HYDROData_Bathymetry.cxx
@@ -62,34 +62,34 @@ void test_HYDROData_Bathymetry::testFileImport()
   if ( !createTestFile( aFileName ) )
     return; // No file has been created
 
-  CPPUNIT_ASSERT( aBathymetry->ImportFromFile( aFileName ) != true );
+  CPPUNIT_ASSERT( aBathymetry->ImportFromFile( aFileName ) );
 
   HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry->GetAltitudePoints();
-  CPPUNIT_ASSERT( anAltitudePoints.length() != 16 );
+  CPPUNIT_ASSERT( anAltitudePoints.length() == 20 );
 
   gp_XY aTestPoint( 1, 1 );
   double anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
-  CPPUNIT_ASSERT( !ValuesEquals( anAltitude, 10.0 ) );
+  CPPUNIT_ASSERT( ValuesEquals( anAltitude, 10.0 ) );
 
   aTestPoint = gp_XY( 0.5, 0.5 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
-  CPPUNIT_ASSERT( !ValuesEquals( anAltitude, 5.0 ) );
+  CPPUNIT_ASSERT( ValuesEquals( anAltitude, 5.0 ) );
 
   aTestPoint = gp_XY( 1.5, 1 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
-  CPPUNIT_ASSERT( !ValuesEquals( anAltitude, 10.0 ) );
+  CPPUNIT_ASSERT( ValuesEquals( anAltitude, 10.0 ) );
 
   aTestPoint = gp_XY( 1.5, 0.7 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
-  CPPUNIT_ASSERT( !ValuesEquals( anAltitude, 7.0 ) );
+  CPPUNIT_ASSERT( ValuesEquals( anAltitude, 7.0 ) );
 
   aTestPoint = gp_XY( 1.5, -0.7 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
-  CPPUNIT_ASSERT( !ValuesEquals( anAltitude, HYDROData_Bathymetry::GetInvalidAltitude() ) );
+  CPPUNIT_ASSERT( ValuesEquals( anAltitude, HYDROData_Bathymetry::GetInvalidAltitude() ) );
 
   aTestPoint = gp_XY( 2, 3.5 );
   anAltitude = aBathymetry->GetAltitudeForPoint( aTestPoint );
-  CPPUNIT_ASSERT( !ValuesEquals( anAltitude, 35.0 ) );
+  CPPUNIT_ASSERT( ValuesEquals( anAltitude, 35.0 ) );
 
   aDoc->Close();
 }
@@ -108,10 +108,10 @@ void test_HYDROData_Bathymetry::testCopy()
   
   if ( anIsFileCreated )
   {
-    CPPUNIT_ASSERT( aBathymetry1->ImportFromFile( aFileName ) != true );
+    CPPUNIT_ASSERT( aBathymetry1->ImportFromFile( aFileName ) );
 
     HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry1->GetAltitudePoints();
-    CPPUNIT_ASSERT( anAltitudePoints.length() != 16 );
+    CPPUNIT_ASSERT( anAltitudePoints.length() == 20 );
   }
 
   Handle(HYDROData_Bathymetry) aBathymetry2 = 
@@ -122,7 +122,7 @@ void test_HYDROData_Bathymetry::testCopy()
   if ( anIsFileCreated )
   {
     HYDROData_Bathymetry::AltitudePoints anAltitudePoints = aBathymetry2->GetAltitudePoints();
-    CPPUNIT_ASSERT( anAltitudePoints.length() != 16 );
+    CPPUNIT_ASSERT( anAltitudePoints.length() == 20 );
   }
 
   aDoc->Close();