update for automatic tests

diff --git a/src/HYDRO_tests/reference_data/Channel.png b/src/HYDRO_tests/reference_data/Channel.png
index de597b4034db3a4cce239a9eac55dfaace89f6f4..028435ec70e4db8ebc7a7eb1ee14a9745b54b327 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/Channel.png and b/src/HYDRO_tests/reference_data/Channel.png differ

diff --git a/src/HYDRO_tests/reference_data/DTM_2.png b/src/HYDRO_tests/reference_data/DTM_2.png
index 02660014bc1017564255e50c4e9c69912d78713c..612a4be5cad90e51fe53a5b6e01c1f11ed12f0f7 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/DTM_2.png and b/src/HYDRO_tests/reference_data/DTM_2.png differ

diff --git a/src/HYDRO_tests/reference_data/stream_dtm_2d.png b/src/HYDRO_tests/reference_data/stream_dtm_2d.png
index 2da077fde7de1f4bf8a56b4e80af70f8c89bc31f..83044a05066838511c5d82ad996e7eb8fb51b2c7 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/stream_dtm_2d.png and b/src/HYDRO_tests/reference_data/stream_dtm_2d.png differ

diff --git a/src/HYDRO_tests/reference_data/stream_dtm_3d.png b/src/HYDRO_tests/reference_data/stream_dtm_3d.png
index b4aafc80c097fcb11e8274494b5973c6a67edd10..caa7ef13f8b81c4e25624160ea84ba077cf72402 100644 (file)
Binary files a/src/HYDRO_tests/reference_data/stream_dtm_3d.png and b/src/HYDRO_tests/reference_data/stream_dtm_3d.png differ

diff --git a/src/HYDRO_tests/test_HYDROData_DTM.cxx b/src/HYDRO_tests/test_HYDROData_DTM.cxx
index 2050a73bc93a2a5e4e0a1f20b3e09825fd450c17..3a84e0bc8f86ad9f8e83cc288ad24c15f38dcea1 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_DTM.cxx
+++ b/src/HYDRO_tests/test_HYDROData_DTM.cxx
@@ -600,7 +600,7 @@ void test_HYDROData_DTM::test_garonne()
   CPPUNIT_ASSERT_DOUBLES_EQUAL( 1.0, DTM->GetSpatialStep(), EPS );
   DTM->Update();
   
-  CPPUNIT_ASSERT_EQUAL( 275690, (int)DTM->GetAltitudePoints().size() ); 
+  CPPUNIT_ASSERT_EQUAL( 282338, (int)DTM->GetAltitudePoints().size() ); 
 
   Handle_AIS_InteractiveContext aContext = TestViewer::context();
   HYDROGUI_ShapeBathymetry* aBathPrs = new HYDROGUI_ShapeBathymetry( 0, aContext, DTM );

diff --git a/src/HYDRO_tests/test_HYDROData_Stream.cxx b/src/HYDRO_tests/test_HYDROData_Stream.cxx
index 3341e77ac61923f81be4bec325cf3419e7261a80..6bf3c37d404a47aacebfbaeec1f83b7f3322a604 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_Stream.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Stream.cxx
@@ -73,6 +73,8 @@ void test_HYDROData_Stream::test_alt_object()
     Handle(HYDROData_Stream)::DownCast( aDoc->CreateObject( KIND_STREAM ) );
 
   CPPUNIT_ASSERT_EQUAL( false, (bool)aStream.IsNull() );
+  CPPUNIT_ASSERT_EQUAL( true, (bool)aStream->GetAltitudeObject().IsNull() );
+  CPPUNIT_ASSERT_EQUAL( false, (bool)aStream->DTM().IsNull() );
   CPPUNIT_ASSERT_EQUAL( false, (bool)aStream->GetAltitudeObject().IsNull() );
   CPPUNIT_ASSERT_EQUAL( KIND_DTM, aStream->getAltitudeObjectType() );
 
@@ -90,7 +92,7 @@ void test_HYDROData_Stream::test_params_sync()
   Handle(HYDROData_Stream) aStream = 
     Handle(HYDROData_Stream)::DownCast( aDoc->CreateObject( KIND_STREAM ) );
   Handle(HYDROData_DTM) aDTM = 
-    Handle(HYDROData_DTM)::DownCast( aStream->GetAltitudeObject() );
+    Handle(HYDROData_DTM)::DownCast( aStream->DTM() );
   CPPUNIT_ASSERT_EQUAL( false, (bool)aDTM.IsNull() );
 
   Handle(HYDROData_Profile) aProfile1 =