Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implementation of the strickler types (integer codes) for points
[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 157fee69a0e2cf241ddc35421b9a77624b0ee465..d50bdcf7831fcec5954238c6a03c7a52385c759b 100644
(file)
--- a/
src/HYDRO_tests/test_HYDROData_Main.cxx
+++ b/
src/HYDRO_tests/test_HYDROData_Main.cxx
@@
-20,49
+20,61
@@
#include <cppunit/CompilerOutputter.h>
#include <cppunit/TestResult.h>
#include <cppunit/TestResultCollector.h>
#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 <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 <OCCViewer_ViewWindow.h>
#include <SUIT_Session.h>
#include <QApplication>
#include <QColor>
-#include <time.h>
+#include <QTest>
+
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
int main( int argc, char* argv[] )
{
int main( int argc, char* argv[] )
{
- srand( time( 0 ) );
-
QApplication anApp( argc, argv );
SUIT_Session aSession;
QApplication anApp( argc, argv );
SUIT_Session aSession;
+ aSession.startApplication("std");
OCCViewer_ViewWindow* 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();
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;
std::string testPath = (argc > 1) ? std::string(argv[1]) : "";
// Create the event manager and test controller
CppUnit::TestResult controller;
- // Add a listener that coll
l
ects 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::TestResultCollector result;
controller.addListener( &result );
// Add a listener that print dots as test run.
-
CppUnit::TextTestProgress
Listener progress;
+
TestLib_
Listener progress;
controller.addListener( &progress );
CppUnit::TestFactoryRegistry& registry =
CppUnit::TestFactoryRegistry::getRegistry();
// Add the top suite to the test runner
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
{
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;
std::cerr << std::endl;
@@
-77,7
+89,11
@@
int main( int argc, char* argv[] )
<< std::endl;
return 0;
}
<< 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;
}
return result.wasSuccessful() ? 0 : 1;
}