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 d9867b7217fb926a4998486c619f57edc4b58b1c..bd65356510d66ce6fe3d6c9120962afb9e29ab72 100644 (file)
--- a/src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx
+++ b/src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx
@@ -1,4 +1,4 @@
-// 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
@@ -24,6 +24,7 @@
 #define _LIFECYCLECORBATEST_HXX_
 
 #include <cppunit/extensions/HelperMacros.h>
+#include <string>
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOME_Component)
@@ -54,11 +55,15 @@ class LIFECYCLECORBATEST_EXPORT 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(  );
@@ -88,6 +93,9 @@ public:
 //   void testFindOrLoad_Component_();
 //   void testFindOrLoad_Component_();
 
+ private:
+  std::string _getTraceFileName();
+
 protected:
   std::string GetRemoteHost();
   CORBA::ORB_var _orb;