X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2Ftest_HYDROData_Main.cxx;h=d50bdcf7831fcec5954238c6a03c7a52385c759b;hb=15aed67b5f26dad1f17035be35bcd570e947158c;hp=e3796b370a7ffdbeaed00e5449ed66abb1d4f225;hpb=557f5f91d30a5fae83a018a79eeb445c8c51ec3d;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/test_HYDROData_Main.cxx b/src/HYDRO_tests/test_HYDROData_Main.cxx
index e3796b37..d50bdcf7 100644
--- a/src/HYDRO_tests/test_HYDROData_Main.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Main.cxx
@@ -20,41 +20,67 @@
 #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 <TestLib_Listener.h>
+#include <TestLib_Runner.h>
+#include <OCCViewer_ViewWindow.h>
+#include <SUIT_Session.h>
+#include <QApplication>
+#include <QColor>
+#include <QTest>
 
-int 
-  main( int argc, char* argv[] )
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
+int main( int argc, char* argv[] )
 {
+  QApplication anApp( argc, argv );
+  SUIT_Session aSession;
+  aSession.startApplication("std");
+
+  OCCViewer_ViewWindow* aWindow = TestViewer::viewWindow();
+
+  int W = 800, H = 600;
+  aWindow->setGeometry( 200, 200, W, H );
+  aWindow->show();
+  QTest::qWaitForWindowShown( 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;
 
     // Print test in a compiler compatible format.
-    CppUnit::CompilerOutputter outputter( &result, std::cerr );
-    outputter.write();                      
+    CPPUNIT_NS::CompilerOutputter outputter( &result, CPPUNIT_NS::stdCOut() );
+    outputter.write();
   }
   catch ( std::invalid_argument &e )  // Test path not resolved
   {
@@ -63,6 +89,11 @@ int
       << std::endl;
     return 0;
   }
-
+  bool isOK = result.wasSuccessful();
+  DEBTRACE("End of tests");
+  aWindow->close();
+  aSession.closeSession();
+  anApp.exit(!isOK);
+  DEBTRACE("--- TODO: exception on exit..."); // TODO: exception on exit...
   return result.wasSuccessful() ? 0 : 1;
 }