Updated copyright comment

[modules/kernel.git] / src / SALOMEDSImpl / Test / SALOMEDSImplTest.cxx

diff --git a/src/SALOMEDSImpl/Test/SALOMEDSImplTest.cxx b/src/SALOMEDSImpl/Test/SALOMEDSImplTest.cxx
index 7ce2e5416bb8c0429eac61fbdcb049fc066a9a4f..e5c08ef116cec376e13708ff55cb8e3085bca4b8 100644 (file)
--- a/src/SALOMEDSImpl/Test/SALOMEDSImplTest.cxx
+++ b/src/SALOMEDSImpl/Test/SALOMEDSImplTest.cxx
@@ -1,21 +1,23 @@
-// Copyright (C) 2006  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2024  CEA, EDF, 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.
-// 
-// 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 
+// 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 
+// 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/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include "SALOMEDSImplTest.hxx"
@@ -28,14 +30,10 @@
 #include "utilities.h"
 
 #include "SALOMEDSImpl_AttributeParameter.hxx"
-#include "SALOMEDSImpl_StudyManager.hxx"
 #include "SALOMEDSImpl_Study.hxx"
 #include "SALOMEDSImpl_StudyBuilder.hxx"
 #include "SALOMEDSImpl_GenericAttribute.hxx"
 
-#include <TCollection_AsciiString.hxx>
-
-using namespace std;
 
 // ============================================================================
 /*!
@@ -45,11 +43,6 @@ using namespace std;
 
 void SALOMEDSImplTest::setUp()
 {
-  TCollection_AsciiString kernel(getenv("KERNEL_ROOT_DIR"));
-  TCollection_AsciiString subPath("/share/salome/resources");
-  TCollection_AsciiString csf_var = (kernel+subPath);
-  setenv("CSF_PluginDefaults", csf_var.ToCString(), 0);
-  setenv("CSF_SALOMEDS_ResourcesDefaults", csf_var.ToCString(), 0);
 }
 
 // ============================================================================
@@ -70,11 +63,10 @@ SALOMEDSImplTest::tearDown()
 // ============================================================================
 void SALOMEDSImplTest::testAttributeParameter()
 {
-  Handle(SALOMEDSImpl_StudyManager) sm = new SALOMEDSImpl_StudyManager();
-  Handle(SALOMEDSImpl_Study) study = sm->NewStudy("Test");
-  Handle(SALOMEDSImpl_AttributeParameter) _ap = study->GetCommonParameters("TestComp", 0);
+  SALOMEDSImpl_Study* study = new SALOMEDSImpl_Study();
+  SALOMEDSImpl_AttributeParameter* _ap = study->GetCommonParameters("TestComp", 0);
 
-  CPPUNIT_ASSERT(!_ap.IsNull());
+  CPPUNIT_ASSERT(_ap);
 
   _ap->SetInt("IntValue", 1);
   CPPUNIT_ASSERT(_ap->IsSet("IntValue", PT_INTEGER));
@@ -96,7 +88,7 @@ void SALOMEDSImplTest::testAttributeParameter()
   CPPUNIT_ASSERT(_ap->IsSet("BoolValue", PT_BOOLEAN));
   CPPUNIT_ASSERT(!_ap->GetBool("BoolValue"));
 
-  vector<int> intArray;
+  std::vector<int> intArray;
   intArray.push_back(0);
   intArray.push_back(1);
 
@@ -105,7 +97,7 @@ void SALOMEDSImplTest::testAttributeParameter()
   CPPUNIT_ASSERT(_ap->GetIntArray("IntArray")[0] == 0);
   CPPUNIT_ASSERT(_ap->GetIntArray("IntArray")[1] == 1); 
 
-  vector<double> realArray;
+  std::vector<double> realArray;
   realArray.push_back(0.0);
   realArray.push_back(1.1);
   
@@ -114,7 +106,7 @@ void SALOMEDSImplTest::testAttributeParameter()
   CPPUNIT_ASSERT(_ap->GetRealArray("RealArray")[0] == 0.0);
   CPPUNIT_ASSERT(_ap->GetRealArray("RealArray")[1] == 1.1); 
 
-  vector<string> strArray;
+  std::vector<std::string> strArray;
   strArray.push_back("hello");
   strArray.push_back("world");