X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FLifeCycleCORBA%2FTest%2FLifeCycleCORBATest.hxx;h=bd65356510d66ce6fe3d6c9120962afb9e29ab72;hb=4b14a3f48efda72f90b88c78c6ae02153631dfd6;hp=6dbaed47d26b9e2b735fd25ac79195cab37f15c6;hpb=e6bfea36374791cd31c274a2f97df90dc60ddaf3;p=modules%2Fkernel.git diff --git a/src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx b/src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx index 6dbaed47d..bd6535651 100644 --- a/src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx +++ b/src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx @@ -1,18 +1,20 @@ -// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// 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 -// +// // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com @@ -22,13 +24,24 @@ #define _LIFECYCLECORBATEST_HXX_ #include +#include #include #include CORBA_CLIENT_HEADER(SALOME_Component) #include CORBA_CLIENT_HEADER(SALOME_TestComponent) #include "SALOME_NamingService.hxx" -class LifeCycleCORBATest : public CppUnit::TestFixture +#ifdef WIN32 +# if defined LIFECYCLECORBATEST_EXPORTS || defined LifeCycleCORBATest_EXPORTS +# define LIFECYCLECORBATEST_EXPORT __declspec( dllexport ) +# else +# define LIFECYCLECORBATEST_EXPORT __declspec( dllimport ) +# endif +#else +# define LIFECYCLECORBATEST_EXPORT +#endif + +class LIFECYCLECORBATEST_EXPORT LifeCycleCORBATest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE( LifeCycleCORBATest ); CPPUNIT_TEST( testFindOrLoad_Component_LaunchContainer ); @@ -42,11 +55,15 @@ class LifeCycleCORBATest : public CppUnit::TestFixture CPPUNIT_TEST( testFindOrLoad_Component_ParamsEmpty ); CPPUNIT_TEST( testFindOrLoad_Component_ParamsLocalContainer ); CPPUNIT_TEST( testFindOrLoad_Component_ParamsContainerName ); +#ifdef SALOME_TEST_REMOTE CPPUNIT_TEST( testFindOrLoad_Component_RemoteComputer ); CPPUNIT_TEST( testFindOrLoad_Component_ParamsRemoteComputer ); CPPUNIT_TEST( testFindOrLoad_Component_ParamsRemoteComputer2 ); +#endif CPPUNIT_TEST( testgetLocalFile_localComputer ); +#ifdef SALOME_TEST_REMOTE CPPUNIT_TEST( testgetLocalFile_remoteComputer ); +#endif // CPPUNIT_TEST( testFindOrLoad_Component_ ); // CPPUNIT_TEST( ); // CPPUNIT_TEST( ); @@ -76,6 +93,9 @@ public: // void testFindOrLoad_Component_(); // void testFindOrLoad_Component_(); + private: + std::string _getTraceFileName(); + protected: std::string GetRemoteHost(); CORBA::ORB_var _orb;