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
Merge remote-tracking branch 'remotes/origin/BR_2017' into BR_1427
[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 3b4d053f4ddf0198a7a3a0b269d81f71323b73b9..9e5bab52f4b4d5f6c09f136f5f3a381b700f29f3 100644
(file)
--- a/
src/HYDRO_tests/test_HYDROData_Main.cxx
+++ b/
src/HYDRO_tests/test_HYDROData_Main.cxx
@@
-33,7
+33,16
@@
#define _DEVDEBUG_
#include "HYDRO_trace.hxx"
#define _DEVDEBUG_
#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";
+QString TMP_DIR = QDir::tempPath();
+#else
+QString REF_DATA_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO/HYDRO";
+QString TMP_DIR = QDir::tempPath() + "/hydro";
+#endif
+
+
+int MAIN_W = 800, MAIN_H = 600;
int main( int argc, char* argv[] )
{
int main( int argc, char* argv[] )
{
@@
-41,16
+50,17
@@
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();
OCCViewer_ViewFrame* aWindow = TestViewer::viewWindow();
- int W = 800, H = 600;
- aWindow->setGeometry( 200, 200, W, H );
+ aWindow->setGeometry( 400, 100, MAIN_W, MAIN_H );
aWindow->show();
QTest::qWaitForWindowExposed( aWindow );
int dy = 34;
//std::cout << dx << "," << dy << std::endl;
aWindow->show();
QTest::qWaitForWindowExposed( aWindow );
int dy = 34;
//std::cout << dx << "," << dy << std::endl;
- aWindow->resize(
W,
H+dy );
+ aWindow->resize(
MAIN_W, MAIN_
H+dy );
anApp.processEvents();
std::string testPath = (argc > 1) ? std::string(argv[1]) : "";
anApp.processEvents();
std::string testPath = (argc > 1) ? std::string(argv[1]) : "";
@@
-70,7
+80,11
@@
int main( int argc, char* argv[] )
CppUnit::TestFactoryRegistry::getRegistry();
// Add the top suite to the test runner
TestLib_Runner runner;
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";
QString aPath = qgetenv( "HYDRO_SRC_DIR" ) + "/src/tests.cfg";
+#else
+ QString aPath = "/tmp/hydro/tests.cfg";
+#endif
runner.Load( aPath.toStdString() );
runner.addTest( registry.makeTest() );
try
runner.Load( aPath.toStdString() );
runner.addTest( registry.makeTest() );
try