Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 ce9edb29d08bab3fe350278112f000321f3244ff..bd65356510d66ce6fe3d6c9120962afb9e29ab72 100644
(file)
--- a/
src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx
+++ b/
src/LifeCycleCORBA/Test/LifeCycleCORBATest.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-24,6
+24,7
@@
#define _LIFECYCLECORBATEST_HXX_
#include <cppunit/extensions/HelperMacros.h>
#define _LIFECYCLECORBATEST_HXX_
#include <cppunit/extensions/HelperMacros.h>
+#include <string>
#include <SALOMEconfig.h>
#include CORBA_CLIENT_HEADER(SALOME_Component)
#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 );
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 );
CPPUNIT_TEST( testFindOrLoad_Component_RemoteComputer );
CPPUNIT_TEST( testFindOrLoad_Component_ParamsRemoteComputer );
CPPUNIT_TEST( testFindOrLoad_Component_ParamsRemoteComputer2 );
+#endif
CPPUNIT_TEST( testgetLocalFile_localComputer );
CPPUNIT_TEST( testgetLocalFile_localComputer );
+#ifdef SALOME_TEST_REMOTE
CPPUNIT_TEST( testgetLocalFile_remoteComputer );
CPPUNIT_TEST( testgetLocalFile_remoteComputer );
+#endif
// CPPUNIT_TEST( testFindOrLoad_Component_ );
// CPPUNIT_TEST( );
// CPPUNIT_TEST( );
// CPPUNIT_TEST( testFindOrLoad_Component_ );
// CPPUNIT_TEST( );
// CPPUNIT_TEST( );
@@
-88,6
+93,9
@@
public:
// void testFindOrLoad_Component_();
// void testFindOrLoad_Component_();
// void testFindOrLoad_Component_();
// void testFindOrLoad_Component_();
+ private:
+ std::string _getTraceFileName();
+
protected:
std::string GetRemoteHost();
CORBA::ORB_var _orb;
protected:
std::string GetRemoteHost();
CORBA::ORB_var _orb;