Merge branch 'BR_HYDRO_IMPS_2016' of ssh://gitolite3@git.salome-platform.org/modules...

[modules/hydro.git] / src / HYDRO_tests / test_HYDROData_Stream.cxx

diff --git a/src/HYDRO_tests/test_HYDROData_Stream.cxx b/src/HYDRO_tests/test_HYDROData_Stream.cxx
index 3fe4109af9ca251fb30823784b2213408973f8e8..86c3d676350d726c6a92a78809a782d6c3ada00c 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_Stream.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Stream.cxx
@@ -28,6 +28,7 @@
 #include <AIS_InteractiveContext.hxx>
 #include <TestViewer.h>
 #include <QApplication>
+#include <QTest>
 
 extern QString REF_DATA_PATH;
 NCollection_Sequence<HYDROData_IPolyline::Point> points2;
@@ -72,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() );
 
@@ -88,8 +91,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) aDTM = aStream->DTM();
   CPPUNIT_ASSERT_EQUAL( false, (bool)aDTM.IsNull() );
 
   Handle(HYDROData_Profile) aProfile1 = 
@@ -240,7 +242,7 @@ void test_HYDROData_Stream::test_presentation()
   HYDROData_Iterator it( aDoc, KIND_PROFILE );
   for( int i=0; it.More(); it.Next(), i++ )
   {
-    if( i>=31 && i<=32 )
+    if( i>=25 && i<=35 )
     {
       it.Current()->Update();
       profiles.Append( Handle(HYDROData_Profile)::DownCast( it.Current() ) );
@@ -258,7 +260,7 @@ void test_HYDROData_Stream::test_presentation()
   TopoDS_Shape aPrs3d = aStream->GetShape3D();
   TopoDS_Shape aPrs2d = aStream->GetTopShape();
 
-  TestViewer::show( aPrs2d, 0, true, "stream_dtm_2d" );
+  TestViewer::show( aPrs2d, 0, true, "stream_dtm_2d", 1, 1 );
   CPPUNIT_ASSERT_IMAGES;
 
   TestViewer::eraseAll( true );