-// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
#include "SALOMEDS_StudyManager_i.hxx"
#ifdef WIN32
+#include <winsock2.h>
#define setenv Kernel_Utils::setenv
-#endif
+#endif
// ============================================================================
/*!
int main(int argc, char* argv[])
{
- // --- Run Salome without GUI
-
- setenv("SALOME_trace", "file:./traceUnitTest.log", 1); // 1: overwrite
-
- system("runSalome -t &");
-
- // --- Wait till SALOMEDS server is launched
-
- char hostname[511];
- int size;
- gethostname(hostname, size);
- char* chr_port = getenv("SALOMEDS_UNITTESTS_PORT");
- std::string port;
- if(chr_port) port = chr_port;
- if(port.empty()) port = "2810";
- std::string cfg_file = std::string(getenv("HOME"))+"/.omniORB_"+std::string(hostname)+"_"+port+".cfg";
- setenv("OMNIORB_CONFIG", cfg_file.c_str(), 1);
-
ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
- ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
CORBA::ORB_var orb = init(argc , argv ) ;
-
- #ifndef WIN32
- sleep(15);
- #else
- Sleep(15000);
- #endif
-
-
std::string host; // = Kernel_Utils::GetHostname();
char* wait_Superv = getenv("SALOMEDS_UNITTESTS_WAIT_SUPERVISOR");
- if(wait_Superv) host = Kernel_Utils::GetHostname();
+ if(wait_Superv) host = Kernel_Utils::GetHostname();
SALOME_NamingService NS(orb);
if(host.empty())
return 1;
}
- //Set up the environement for Embedded case
+ //Set up the environment for Embedded case
std::string kernel_root = getenv("KERNEL_ROOT_DIR");
CPPUNIT_ASSERT(!kernel_root.empty());
kernel_root+="/share/salome/resources/kernel";
// Activate the objects. This tells the POA that the objects are ready to accept requests.
PortableServer::ObjectId_var aStudyManager_iid = poa->activate_object(aStudyManager_i);
aStudyManager_i->register_name("/myStudyManager_embedded");
-
+
// Obtain a POAManager, and tell the POA to start accepting
// requests on its objects.
PortableServer::POAManager_var pman = poa->the_POAManager();
pman->activate();
}
-
+
// --- Create the event manager and test controller
CPPUNIT_NS::TestResult controller;
// --- Add a listener that colllects test result
CPPUNIT_NS::TestResultCollector result;
- controller.addListener( &result );
+ controller.addListener( &result );
// --- Add a listener that print dots as test run.
#ifdef WIN32
#else
CPPUNIT_NS::BriefTestProgressListener progress;
#endif
- controller.addListener( &progress );
+ controller.addListener( &progress );
// --- Get the top level suite from the registry
testFile.open("UnitTestsResult", std::ios::out | std::ios::trunc);
//CPPUNIT_NS::CompilerOutputter outputter( &result, std::cerr );
CPPUNIT_NS::CompilerOutputter outputter( &result, testFile );
- outputter.write();
+ outputter.write();
// --- Run the tests.
bool wasSucessful = result.wasSuccessful();
testFile.close();
- // --- Kill all created Salome process
-
- system("killSalome.py");
-
// --- Return error code 1 if the one of test failed.
return wasSucessful ? 0 : 1;