X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_Main.cxx;h=b9fbf30583413fb818844aa52f5c082e2c1afb41;hb=1ad3406d04aa81800693d6811c7c36e87e0c95c1;hp=74bb9315a863e903d4f1108102d06f6913aa95a9;hpb=a72bc1fe339d74df864cfcbc765e2b62c2543d25;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_HYDROData_Main.cxx b/src/HYDRO_tests/test_HYDROData_Main.cxx
index 74bb9315..b9fbf305 100644
--- a/src/HYDRO_tests/test_HYDROData_Main.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Main.cxx
@@ -24,23 +24,34 @@
 #include <TestViewer.h>
 #include <TestLib_Listener.h>
 #include <TestLib_Runner.h>
-#include <OCCViewer_ViewWindow.h>
+#include <OCCViewer_ViewFrame.h>
 #include <SUIT_Session.h>
 #include <QApplication>
 #include <QColor>
 #include <QTest>
 
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
+#ifdef WIN32
+QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
+#else
+QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO/HYDRO";
+#endif
+
+
 int main( int argc, char* argv[] )
 {
   QApplication anApp( argc, argv );
   SUIT_Session aSession;
+  aSession.startApplication("std");
 
-  OCCViewer_ViewWindow* aWindow = TestViewer::viewWindow();
+  OCCViewer_ViewFrame* aWindow = TestViewer::viewWindow();
 
   int W = 800, H = 600;
   aWindow->setGeometry( 200, 200, W, H );
   aWindow->show();
-  QTest::qWaitForWindowShown( aWindow );
+  QTest::qWaitForWindowExposed( aWindow );
 
   int dy = 34;
   //std::cout << dx << "," << dy << std::endl;
@@ -52,7 +63,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 );        
 
@@ -85,7 +96,25 @@ int main( int argc, char* argv[] )
       << std::endl;
     return 0;
   }
+  bool isOK = result.wasSuccessful();
+
+#ifndef WIN32
+  DEBTRACE("End of tests");
+#endif
+
+  aWindow->close();
+  aSession.closeSession();
+  anApp.exit(!isOK);
+
+#ifndef WIN32
+  DEBTRACE("--- TODO: exception on exit..."); // TODO: exception on exit...
+#endif
+
+  int ms = progress.GetCompleteTimeInMS();
+  printf( "\n\n" );
+  printf( "%i TESTS in %i SUITES\n", progress.GetNbTests(), progress.GetNbSuites() );
+  printf( "COMPLETE TESTS TIME: %i ms\n", ms );
+  progress.DumpFailures();
 
-  //anApp.exec();
   return result.wasSuccessful() ? 0 : 1;
 }