Copyrights update 2015.

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

diff --git a/src/NamingService/Test/NamingServiceTest.cxx b/src/NamingService/Test/NamingServiceTest.cxx
index 033f8f87e64727db7795ea969db0679cf99b73b1..310b0dd6a725684699b07dc07ac4508b15c7faa3 100644 (file)
--- a/src/NamingService/Test/NamingServiceTest.cxx
+++ b/src/NamingService/Test/NamingServiceTest.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -23,6 +23,9 @@
 #include "NamingServiceTest.hxx"
 #include "Utils_ORB_INIT.hxx"
 #include "Utils_SINGLETON.hxx"
+#include "Basics_Utils.hxx"
+#include "SALOME_LifeCycleCORBA.hxx"
+#include "utilities.h"
 
 #include <iostream>
 #include <fstream>
@@ -43,6 +46,10 @@
 #define DEVTRACE(msg)
 #endif
 
+#ifdef WIN32
+#define setenv Kernel_Utils::setenv
+#endif 
+
 #define TRACEFILE "/tmp/traceUnitTest.log"
 
 // ============================================================================
@@ -819,15 +826,8 @@ NamingServiceTest::testContainerName()
 void
 NamingServiceTest::testContainerNameParams()
 {
-  Engines::MachineParameters params;
-  params.container_name = "";
-  params.hostname = "";
-  params.OS = "";
-  params.mem_mb = 0;
-  params.cpu_clock = 0;
-  params.nb_proc_per_node = 0;
-  params.nb_node = 0;
-  params.isMPI = false;
+  Engines::ContainerParameters params;
+  SALOME_LifeCycleCORBA::preSet(params);
 
   std::string ref0 = "FactoryServer";
   std::string ret = _NS.ContainerName(params);
@@ -866,15 +866,8 @@ NamingServiceTest::testBuildContainerNameForNS()
 void
 NamingServiceTest::testBuildContainerNameForNSParams()
 {
-  Engines::MachineParameters params;
-  params.container_name = "";
-  params.hostname = "";
-  params.OS = "";
-  params.mem_mb = 0;
-  params.cpu_clock = 0;
-  params.nb_proc_per_node = 0;
-  params.nb_node = 0;
-  params.isMPI = false;
+  Engines::ContainerParameters params;
+  SALOME_LifeCycleCORBA::preSet(params);
 
   params.container_name = "theContainerName";
   std::string ref0 = "/Containers/theHostName/theContainerName";