correct selection mode activation

[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 b9590889429c7191810386ceceb066718a128617..74bb9315a863e903d4f1108102d06f6913aa95a9 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_Main.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Main.cxx
@@ -20,27 +20,32 @@
 #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>
-
-std::ostream& operator<<( std::ostream& theStream, const QString& theText )
-{
-  theStream << theText.toStdString();
-  return theStream;
-}
-
-std::ostream& operator<<( std::ostream& theStream, const QColor& theColor )
-{
-  theStream << "[" << theColor.red() << ", " << theColor.green() << ", " << theColor.blue() << "]";
-  return theStream;
-}
+#include <QTest>
 
 int main( int argc, char* argv[] )
 {
   QApplication anApp( argc, argv );
+  SUIT_Session aSession;
+
+  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]) : "";
 
@@ -52,18 +57,20 @@ int main( int argc, char* argv[] )
   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;
 
@@ -79,5 +86,6 @@ int main( int argc, char* argv[] )
     return 0;
   }
 
+  //anApp.exec();
   return result.wasSuccessful() ? 0 : 1;
 }