Fix merge errors.

[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 7382740c31ce9975aa9747a43fe9c7ca1349dc0c..05f6b9b8f8cb7140b5c208f3b962cdb14bc07f0b 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_Main.cxx
+++ b/src/HYDRO_tests/test_HYDROData_Main.cxx
@@ -30,6 +30,9 @@
 #include <QColor>
 #include <QTest>
 
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 int main( int argc, char* argv[] )
 {
   QApplication anApp( argc, argv );
@@ -41,7 +44,7 @@ int main( int argc, char* argv[] )
   int W = 800, H = 600;
   aWindow->setGeometry( 200, 200, W, H );
   aWindow->show();
-  QTest::qWaitForWindowShown( aWindow );
+  QTest::qWaitForWindowExposed( aWindow );
 
   int dy = 34;
   //std::cout << dx << "," << dy << std::endl;
@@ -86,7 +89,11 @@ int main( int argc, char* argv[] )
       << std::endl;
     return 0;
   }
-
-  //anApp.exec();
+  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;
 }