X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_Main.cxx;h=b9fbf30583413fb818844aa52f5c082e2c1afb41;hb=ba53436c18b7ed378d149952aff0b5ecafc3e902;hp=5b1367cbd1f5020e586b10b1f8014ea601d5e5d6;hpb=158b3949f0d12e3a4b36c6f37b270e0f7f037262;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_HYDROData_Main.cxx b/src/HYDRO_tests/test_HYDROData_Main.cxx
index 5b1367cb..b9fbf305 100644
--- a/src/HYDRO_tests/test_HYDROData_Main.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Main.cxx
@@ -20,49 +20,68 @@
 #include <cppunit/CompilerOutputter.h>
 #include <cppunit/TestResult.h>
 #include <cppunit/TestResultCollector.h>
-#include <cppunit/TestRunner.h>
-#include <cppunit/TextTestProgressListener.h>
 #include <stdexcept>
 #include <TestViewer.h>
-#include <OCCViewer_ViewWindow.h>
+#include <TestLib_Listener.h>
+#include <TestLib_Runner.h>
+#include <OCCViewer_ViewFrame.h>
 #include <SUIT_Session.h>
 #include <QApplication>
 #include <QColor>
-#include <time.h>
+#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[] )
 {
-  srand( time( 0 ) );
-
   QApplication anApp( argc, argv );
   SUIT_Session aSession;
+  aSession.startApplication("std");
+
+  OCCViewer_ViewFrame* aWindow = TestViewer::viewWindow();
 
-  OCCViewer_ViewWindow* aWindow = TestViewer::viewWindow();
-  aWindow->setGeometry( 200, 200, 800, 600 );
+  int W = 800, H = 600;
+  aWindow->setGeometry( 200, 200, W, H );
   aWindow->show();
+  QTest::qWaitForWindowExposed( aWindow );
+
+  int dy = 34;
+  //std::cout << dx << "," << dy << std::endl;
+  aWindow->resize( W, H+dy );
+  anApp.processEvents();
 
   std::string testPath = (argc > 1) ? std::string(argv[1]) : "";
 
   // 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 );        
 
   // Add a listener that print dots as test run.
-  CppUnit::TextTestProgressListener progress;
+  TestLib_Listener progress;
   controller.addListener( &progress );      
 
   CppUnit::TestFactoryRegistry& registry = 
     CppUnit::TestFactoryRegistry::getRegistry();
   // Add the top suite to the test runner
-  CppUnit::TestRunner runner;
+  TestLib_Runner runner;
+  QString aPath = qgetenv( "HYDRO_SRC_DIR" ) + "/src/tests.cfg";
+  runner.Load( aPath.toStdString() );
   runner.addTest( registry.makeTest() );   
   try
   {
-    std::cout << "Running "  <<  testPath;
-    runner.run( controller, testPath );
+    std::cout << "Running tests "  << testPath << "..." << std::endl;
+    runner.Run( controller );
 
     std::cerr << std::endl;
 
@@ -77,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;
 }