Added support of environment variables and preprocessor definitions

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx b/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx
index 7f20ec7663cec5ce6c68c4248c279d9001345652..309035de79344f387ffd6bfa78d6cd40d648e869 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_AttributeTreeNode.cxx
@@ -72,10 +72,8 @@ void SALOMEDSTest::testAttributeTreeNode()
   //Check method HasFather
   CPPUNIT_ASSERT(_attr1->HasFather());
 
-  cout << endl << "THE TEST IS NOT COMPLETE !!!" << endl;
-
+#ifdef SALOMEDS_ALL_TESTS
   //Check method GetFather
-  /*
   CPPUNIT_ASSERT(_attr1->GetFather() == _attr);
 
   //Check method Append
@@ -136,7 +134,9 @@ void SALOMEDSTest::testAttributeTreeNode()
   _attr2->SetTreeID(TreeNodeID);
 
   CPPUNIT_ASSERT(_attr2->GetTreeID() == TreeNodeID); 
-  */
+#else 
+  cout << endl << "THE TEST IS NOT COMPLETE !!!" << endl;
+#endif  
 
   sm->Close(study);
 }

diff --git a/src/SALOMEDS/Test/SALOMEDSTest_UseCase.cxx b/src/SALOMEDS/Test/SALOMEDSTest_UseCase.cxx
index fad6fc7748eda1150b413d3f19e0b2fef5ce15e2..9ad472a06f603a0ac9418ef2195652db14e25838 100755 (executable)
--- a/src/SALOMEDS/Test/SALOMEDSTest_UseCase.cxx
+++ b/src/SALOMEDS/Test/SALOMEDSTest_UseCase.cxx
@@ -65,10 +65,8 @@ void SALOMEDSTest::testUseCase()
   //Check method GetName
   CPPUNIT_ASSERT(builder->GetName() == "A root use case");
 
-  cout << endl << "THE TEST IS NOT COMPLETE !!!" << endl;
-
+#ifdef SALOMEDS_ALL_TESTS
   //Check method GetUseCaseIterator
-  /*
   builder->SetRootCurrent();
   _PTR(SObject) nullObject;
   _PTR(UseCaseIterator) root_it = builder->GetUseCaseIterator(nullObject); //The iterator on all UseCases
@@ -80,7 +78,9 @@ void SALOMEDSTest::testUseCase()
   CPPUNIT_ASSERT(root_it->Value()->GetID() == root2->GetID());
   root_it->Next();
   CPPUNIT_ASSERT(!root_it->More());
-  */
+#else
+  cout << endl << "THE TEST IS NOT COMPLETE !!!" << endl;
+#endif
 
   builder->SetCurrentObject(root1);
   _PTR(UseCaseIterator) it = builder->GetUseCaseIterator(root1); //The iterator on the given UseCase

diff --git a/src/SALOMEDS/Test/TestSALOMEDS.cxx b/src/SALOMEDS/Test/TestSALOMEDS.cxx
index 53e633fbd4659b441f2f3b9a8a1721b54a44a78a..09a25a3ae1031139ea28877453e8f25192660b0a 100644 (file)
--- a/src/SALOMEDS/Test/TestSALOMEDS.cxx
+++ b/src/SALOMEDS/Test/TestSALOMEDS.cxx
@@ -72,7 +72,9 @@ int main(int argc, char* argv[])
   char hostname[511];
   int size;
   gethostname(hostname, size);
-  string cfg_file = string(getenv("HOME"))+"/.omniORB_"+string(hostname)+"_2810.cfg";
+  string port = getenv("SALOMEDS_UNITTESTS_PORT");
+  if(port.empty()) port = "2810";
+  string cfg_file = string(getenv("HOME"))+"/.omniORB_"+string(hostname)+"_"+port+".cfg";
   setenv("OMNIORB_CONFIG", cfg_file.c_str(), 1);
 
   ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;