Merge branch 'BR_2017' of ssh://git.salome-platform.org/modules/hydro into BR_2017

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

diff --git a/src/HYDRO_tests/test_HYDROData_Main.cxx b/src/HYDRO_tests/test_HYDROData_Main.cxx
index d50bdcf7831fcec5954238c6a03c7a52385c759b..b9fbf30583413fb818844aa52f5c082e2c1afb41 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_Main.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Main.cxx
@@ -24,7 +24,7 @@
 #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>
@@ -33,18 +33,25 @@
 #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;
@@ -90,10 +97,24 @@ int main( int argc, char* argv[] )
     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();
+
   return result.wasSuccessful() ? 0 : 1;
 }