X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_Main.cxx;h=9e5bab52f4b4d5f6c09f136f5f3a381b700f29f3;hb=0a268634f84d202af2ab8e8ee88a1e014e1f9d0e;hp=05f6b9b8f8cb7140b5c208f3b962cdb14bc07f0b;hpb=ad4482443835973ac9ee0ce2024f60f91adff716;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_HYDROData_Main.cxx b/src/HYDRO_tests/test_HYDROData_Main.cxx
index 05f6b9b8..9e5bab52 100644
--- 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,22 +33,34 @@
 #define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
+#ifdef WIN32
+QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
+QString TMP_DIR = QDir::tempPath();
+#else
+QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO/HYDRO";
+QString TMP_DIR = QDir::tempPath() + "/hydro";
+#endif
+
+
+int MAIN_W = 800, MAIN_H = 600;
+
 int main( int argc, char* argv[] )
 {
   QApplication anApp( argc, argv );
   SUIT_Session aSession;
   aSession.startApplication("std");
 
-  OCCViewer_ViewWindow* aWindow = TestViewer::viewWindow();
+  QDir().mkdir( TMP_DIR );
 
-  int W = 800, H = 600;
-  aWindow->setGeometry( 200, 200, W, H );
+  OCCViewer_ViewFrame* aWindow = TestViewer::viewWindow();
+
+  aWindow->setGeometry( 400, 100, MAIN_W, MAIN_H );
   aWindow->show();
   QTest::qWaitForWindowExposed( aWindow );
 
   int dy = 34;
   //std::cout << dx << "," << dy << std::endl;
-  aWindow->resize( W, H+dy );
+  aWindow->resize( MAIN_W, MAIN_H+dy );
   anApp.processEvents();
 
   std::string testPath = (argc > 1) ? std::string(argv[1]) : "";
@@ -68,7 +80,11 @@ int main( int argc, char* argv[] )
     CppUnit::TestFactoryRegistry::getRegistry();
   // Add the top suite to the test runner
   TestLib_Runner runner;
+#ifdef WIN32
   QString aPath = qgetenv( "HYDRO_SRC_DIR" ) + "/src/tests.cfg";
+#else
+  QString aPath = "/tmp/hydro/tests.cfg";
+#endif
   runner.Load( aPath.toStdString() );
   runner.addTest( registry.makeTest() );   
   try
@@ -90,10 +106,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;
 }