Merge changes from 'master' branch.

[modules/kernel.git] / src / LifeCycleCORBA / Test / LifeCycleCORBATest.hxx

diff --git a/src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx b/src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx
index 3be0ebab6f8c49e1bba6d4a983a6d1877d961f1f..bd65356510d66ce6fe3d6c9120962afb9e29ab72 100644 (file)
--- a/src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx
+++ b/src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  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
@@ -6,7 +6,7 @@
 // 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.
+// 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
@@ -24,13 +24,24 @@
 #define _LIFECYCLECORBATEST_HXX_
 
 #include <cppunit/extensions/HelperMacros.h>
+#include <string>
 
 #include <SALOMEconfig.h>
 #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 );
@@ -44,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(  );
@@ -78,6 +93,9 @@ public:
 //   void testFindOrLoad_Component_();
 //   void testFindOrLoad_Component_();
 
+ private:
+  std::string _getTraceFileName();
+
 protected:
   std::string GetRemoteHost();
   CORBA::ORB_var _orb;