Merge branch 'omu/launcher_evol'

[modules/kernel.git] / src / Utils / Test / UtilsTest.cxx

diff --git a/src/Utils/Test/UtilsTest.cxx b/src/Utils/Test/UtilsTest.cxx
index a82e9d55ec5d1a850c2fdcffa3ed74acf293d930..385b25c4903dc4a16bf49457c03be47a6f3918ec 100644 (file)
--- a/src/Utils/Test/UtilsTest.cxx
+++ b/src/Utils/Test/UtilsTest.cxx
@@ -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
+//
 
 #include "UtilsTest.hxx"
 
@@ -6,21 +27,30 @@
 #include <string>
 #include <cstdlib>
 #include "Utils_SALOME_Exception.hxx"
+#include "Basics_Utils.hxx"
+#include "Basics_DirUtils.hxx"
 #include "utilities.h"
 
-using namespace std;
-
-#define TRACEFILE "/tmp/traceUnitTest.log"
+#ifdef WIN32
+#define setenv Kernel_Utils::setenv
+#endif
 
 // ============================================================================
 /*!
- * Set Trace mecanism
+ * Set Trace mechanism
  * - delete preexisting trace classes if any
  * - set trace on file
  */
 // ============================================================================
 
-void 
+std::string
+UtilsTest::_getTraceFileName()
+{
+  std::string dir = Kernel_Utils::GetTmpDir();
+  return dir + "traceUnitTest-UtilsTest.log";
+}
+
+void
 UtilsTest::setUp()
 {
   LocalTraceBufferPool* bp1 = LocalTraceBufferPool::instance();
@@ -28,14 +58,14 @@ UtilsTest::setUp()
   bp1->deleteInstance(bp1);
 
   // --- trace on file
-  char *theFileName = TRACEFILE;
+  std::string theFileName = _getTraceFileName();
 
-  string s = "file:";
+  std::string s = "file:";
   s += theFileName;
   CPPUNIT_ASSERT(! setenv("SALOME_trace",s.c_str(),1)); // 1: overwrite
 
-  ofstream traceFile;
-  traceFile.open(theFileName, ios::out | ios::app);
+  std::ofstream traceFile;
+  traceFile.open(theFileName.c_str(), std::ios::out | std::ios::app);
   CPPUNIT_ASSERT(traceFile); // file created empty, then closed
   traceFile.close();
 
@@ -49,7 +79,7 @@ UtilsTest::setUp()
  */
 // ============================================================================
 
-void 
+void
 UtilsTest::tearDown()
 {
   LocalTraceBufferPool* bp1 = LocalTraceBufferPool::instance();
@@ -64,7 +94,7 @@ int genExcept()
 
 // ============================================================================
 /*!
- * Check basic SALOME_exception mecanism
+ * Check basic SALOME_exception mechanism
  */
 // ============================================================================
 
@@ -90,8 +120,8 @@ UtilsTest::testSALOME_ExceptionMessage()
     }
   catch (const SALOME_Exception &ex)
     {
-      string expectedMessage = EXAMPLE_EXCEPTION_MESSAGE;
-      string actualMessage = ex.what();
-      CPPUNIT_ASSERT(actualMessage.find(expectedMessage) != string::npos);
+      std::string expectedMessage = EXAMPLE_EXCEPTION_MESSAGE;
+      std::string actualMessage = ex.what();
+      CPPUNIT_ASSERT(actualMessage.find(expectedMessage) != std::string::npos);
     }
 }