Merge remote branch 'origin/V7_dev'

[modules/kernel.git] / src / NamingService / Test / NamingServiceTest.hxx

diff --git a/src/NamingService/Test/NamingServiceTest.hxx b/src/NamingService/Test/NamingServiceTest.hxx
index 3630c104327ccd5d63fc00ffbc29f66513bc42ea..775dd4c92f3eda4464619cb9e9474edcb8a3b431 100644 (file)
--- a/src/NamingService/Test/NamingServiceTest.hxx
+++ b/src/NamingService/Test/NamingServiceTest.hxx
@@ -1,3 +1,24 @@
+// 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, 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef _NAMINGSERVICETEST_HXX_
 #define _NAMINGSERVICETEST_HXX_
@@ -8,8 +29,18 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(nstest)
 
-class NSTEST_echo_i : public virtual POA_NSTEST::echo,
-                     public virtual PortableServer::RefCountServantBase
+#ifdef WIN32
+# if defined NAMINGSERVICETEST_EXPORTS || defined NamingServiceTest_EXPORTS
+#  define NAMINGSERVICETEST_EXPORT __declspec( dllexport )
+# else
+#  define NAMINGSERVICETEST_EXPORT __declspec( dllimport )
+# endif
+#else
+# define NAMINGSERVICETEST_EXPORT
+#endif
+
+class NAMINGSERVICETEST_EXPORT NSTEST_echo_i : public virtual POA_NSTEST::echo,
+                      public virtual PortableServer::ServantBase
 {
 public:
   NSTEST_echo_i();
@@ -21,7 +52,7 @@ private:
 };
 
 class NSTEST_aFactory_i : public virtual POA_NSTEST::aFactory,
-                         public virtual PortableServer::RefCountServantBase
+                          public virtual PortableServer::ServantBase
 {
 public:
   NSTEST_aFactory_i();
@@ -31,7 +62,7 @@ private:
   int _num;
 };
 
-class NamingServiceTest : public CppUnit::TestFixture
+class NAMINGSERVICETEST_EXPORT NamingServiceTest : public CppUnit::TestFixture
 {
   CPPUNIT_TEST_SUITE( NamingServiceTest );
   CPPUNIT_TEST( testConstructorDefault );
@@ -119,6 +150,8 @@ public:
   void testGetIorAddr();
 
 protected:
+  void _destroyDirectoryRecurs(std::string path);
+
   CORBA::ORB_var _orb;
   SALOME_NamingService _NS;