Merge branch 'BR_PY3' of https://git.forge.pleiade.edf.fr/git/modules-salome.hydro...

[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 ac9ded2336357681bdc69eac3d344bba2323f6b7..15ea61a6bbbd1cb3b5d4a388a2045ec8110eb468 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,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";
+QString TMP_DIR = qgetenv( "HYDRO_ROOT_DIR" ) + "/test_ref";
+#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 );
+
+  OCCViewer_ViewFrame* aWindow = TestViewer::viewWindow();
 
-  int W = 800, H = 600;
-  aWindow->setGeometry( 200, 200, W, H );
+  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 = qgetenv( "HYDRO_ROOT_DIR" ) + "/tests.cfg";
+#endif
   runner.Load( aPath.toStdString() );
   runner.addTest( registry.makeTest() );   
   try