X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_Stream.cxx;h=86c3d676350d726c6a92a78809a782d6c3ada00c;hb=ba53436c18b7ed378d149952aff0b5ecafc3e902;hp=581f627af6171466a5bff20c64cffca68571eb00;hpb=110c68a935c71ebdb6f305fa992f1e6c989ab859;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_HYDROData_Stream.cxx b/src/HYDRO_tests/test_HYDROData_Stream.cxx
index 581f627a..86c3d676 100644
--- 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() );
 
@@ -89,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 = 
@@ -241,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>=25 && i<=26 )
+    if( i>=25 && i<=35 )
     {
       it.Current()->Update();
       profiles.Append( Handle(HYDROData_Profile)::DownCast( it.Current() ) );
@@ -253,18 +254,17 @@ void test_HYDROData_Stream::test_presentation()
 
   aStream->SetProfiles( profiles, false );
   aStream->SetDDZ( 0.2 );
-  aStream->SetSpatialStep( 1000 );
+  aStream->SetSpatialStep( 10 );
   aStream->Update();
 
   TopoDS_Shape aPrs3d = aStream->GetShape3D();
   TopoDS_Shape aPrs2d = aStream->GetTopShape();
 
-  //TestViewer::show( aPrs2d, 0, true, "stream_dtm_2d" );
-  //CPPUNIT_ASSERT_IMAGES;
+  TestViewer::show( aPrs2d, 0, true, "stream_dtm_2d", 1, 1 );
+  CPPUNIT_ASSERT_IMAGES;
 
   TestViewer::eraseAll( true );
   TestViewer::show( aPrs3d, 0, true, "stream_dtm_3d" );
-  QTest::qWait( 125000 );
   CPPUNIT_ASSERT_IMAGES
 
   aDoc->Close();