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
Correction for hydro_test
[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 3c41a03228bfcfb5d1bd4ce3cb36f86e562df924..6d6840931a0fb1fb2aa97ff79ce0b21f6227f172 100644
(file)
--- a/
src/HYDRO_tests/test_HYDROData_Main.cxx
+++ b/
src/HYDRO_tests/test_HYDROData_Main.cxx
@@
-30,15
+30,18
@@
#include <QColor>
#include <QTest>
#include <QColor>
#include <QTest>
-#define _DEVDEBUG_
+
//
#define _DEVDEBUG_
#include "HYDRO_trace.hxx"
#ifdef WIN32
#include "HYDRO_trace.hxx"
#ifdef WIN32
-QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
+QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO/HYDRO";
+QString TMP_DIR = QDir::tempPath();
#else
QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO/HYDRO";
#else
QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO/HYDRO";
+QString TMP_DIR = qgetenv( "HYDRO_ROOT_DIR" ) + "/test_ref";
#endif
#endif
+
int MAIN_W = 800, MAIN_H = 600;
int main( int argc, char* argv[] )
int MAIN_W = 800, MAIN_H = 600;
int main( int argc, char* argv[] )
@@
-47,6
+50,8
@@
int main( int argc, char* argv[] )
SUIT_Session aSession;
aSession.startApplication("std");
SUIT_Session aSession;
aSession.startApplication("std");
+ QDir().mkdir( TMP_DIR );
+
OCCViewer_ViewFrame* aWindow = TestViewer::viewWindow();
aWindow->setGeometry( 400, 100, MAIN_W, MAIN_H );
OCCViewer_ViewFrame* aWindow = TestViewer::viewWindow();
aWindow->setGeometry( 400, 100, MAIN_W, MAIN_H );
@@
-65,23
+70,23
@@
int main( int argc, char* argv[] )
// Add a listener that collects test result
CppUnit::TestResultCollector result;
// Add a listener that collects test result
CppUnit::TestResultCollector result;
- controller.addListener( &result );
+ controller.addListener( &result );
// Add a listener that print dots as test run.
TestLib_Listener progress;
// Add a listener that print dots as test run.
TestLib_Listener progress;
- controller.addListener( &progress );
+ controller.addListener( &progress );
- CppUnit::TestFactoryRegistry& registry =
+ CppUnit::TestFactoryRegistry& registry =
CppUnit::TestFactoryRegistry::getRegistry();
// Add the top suite to the test runner
TestLib_Runner runner;
#ifdef WIN32
QString aPath = qgetenv( "HYDRO_SRC_DIR" ) + "/src/tests.cfg";
#else
CppUnit::TestFactoryRegistry::getRegistry();
// Add the top suite to the test runner
TestLib_Runner runner;
#ifdef WIN32
QString aPath = qgetenv( "HYDRO_SRC_DIR" ) + "/src/tests.cfg";
#else
- QString aPath =
"/tmp/hydro
/tests.cfg";
+ QString aPath =
qgetenv( "HYDRO_ROOT_DIR" ) + "
/tests.cfg";
#endif
runner.Load( aPath.toStdString() );
#endif
runner.Load( aPath.toStdString() );
- runner.addTest( registry.makeTest() );
+ runner.addTest( registry.makeTest() );
try
{
std::cout << "Running tests " << testPath << "..." << std::endl;
try
{
std::cout << "Running tests " << testPath << "..." << std::endl;
@@
-95,7
+100,7
@@
int main( int argc, char* argv[] )
}
catch ( std::invalid_argument &e ) // Test path not resolved
{
}
catch ( std::invalid_argument &e ) // Test path not resolved
{
- std::cerr << std::endl
+ std::cerr << std::endl
<< "ERROR: " << e.what()
<< std::endl;
return 0;
<< "ERROR: " << e.what()
<< std::endl;
return 0;