X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_Main.cxx;h=d50bdcf7831fcec5954238c6a03c7a52385c759b;hb=15aed67b5f26dad1f17035be35bcd570e947158c;hp=507c6b55fb852d2b429bbedeb86db24e8ccbf6f8;hpb=7fec4faf11fc04017566a0419ee824839ed71fd4;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_HYDROData_Main.cxx b/src/HYDRO_tests/test_HYDROData_Main.cxx
index 507c6b55..d50bdcf7 100644
--- a/src/HYDRO_tests/test_HYDROData_Main.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Main.cxx
@@ -29,14 +29,15 @@
 #include <QApplication>
 #include <QColor>
 #include <QTest>
-#include <random.h>
+
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
 
 int main( int argc, char* argv[] )
 {
-  test_srand( 0 );
-
   QApplication anApp( argc, argv );
   SUIT_Session aSession;
+  aSession.startApplication("std");
 
   OCCViewer_ViewWindow* aWindow = TestViewer::viewWindow();
 
@@ -45,11 +46,7 @@ int main( int argc, char* argv[] )
   aWindow->show();
   QTest::qWaitForWindowShown( aWindow );
 
-#ifdef WIN32
-  int dy = 0;
-#else
   int dy = 34;
-#endif
   //std::cout << dx << "," << dy << std::endl;
   aWindow->resize( W, H+dy );
   anApp.processEvents();
@@ -59,7 +56,7 @@ int main( int argc, char* argv[] )
   // Create the event manager and test controller
   CppUnit::TestResult controller;
 
-  // Add a listener that colllects test result
+  // Add a listener that collects test result
   CppUnit::TestResultCollector result;
   controller.addListener( &result );        
 
@@ -92,7 +89,11 @@ int main( int argc, char* argv[] )
       << std::endl;
     return 0;
   }
-
-  //anApp.exec();
+  bool isOK = result.wasSuccessful();
+  DEBTRACE("End of tests");
+  aWindow->close();
+  aSession.closeSession();
+  anApp.exit(!isOK);
+  DEBTRACE("--- TODO: exception on exit..."); // TODO: exception on exit...
   return result.wasSuccessful() ? 0 : 1;
 }