updated copyright message

[modules/yacs.git] / src / engine / Test / engineIntegrationTest.hxx

diff --git a/src/engine/Test/engineIntegrationTest.hxx b/src/engine/Test/engineIntegrationTest.hxx
index 93cd7dcdf5ef7ae82a278364a771250cd3bdc765..2a43b44e9dd1cdf0d74b38b88ce25ccc3991a2fc 100644 (file)
--- a/src/engine/Test/engineIntegrationTest.hxx
+++ b/src/engine/Test/engineIntegrationTest.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2006-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2023  CEA, EDF
 //
 // 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
@@ -62,6 +62,7 @@ namespace YACS
       CPPUNIT_TEST( testForEachLoop5 );
       CPPUNIT_TEST( testForOptimizerLoop1 );
       CPPUNIT_TEST( testForOptimizerLoop2 );
+      CPPUNIT_TEST( testForOptimizerLoop3 );
       CPPUNIT_TEST( testForDeployment1 );
       CPPUNIT_TEST( testForDeployment2 );
       CPPUNIT_TEST( testForCheckConsistency1 );
@@ -69,6 +70,7 @@ namespace YACS
       CPPUNIT_TEST( testForCheckConsistency3 );
       CPPUNIT_TEST( testForCheckConsistency4 );
       CPPUNIT_TEST( testRemoveRuntime );
+      CPPUNIT_TEST( testWrongNodeNameDetection );
       CPPUNIT_TEST_SUITE_END();
     public:
       void setUp();
@@ -103,6 +105,7 @@ namespace YACS
       void testForEachLoop5();
       void testForOptimizerLoop1();
       void testForOptimizerLoop2();
+      void testForOptimizerLoop3();
       void testForDeployment1();
       void testForDeployment2();
       void testForCheckConsistency1();
@@ -110,6 +113,7 @@ namespace YACS
       void testForCheckConsistency3();
       void testForCheckConsistency4();
       void testRemoveRuntime();
+      void testWrongNodeNameDetection();
     protected:
       template<class T>
       static void checkListsEqual(const std::list<T>& setToTest1, const std::list<T>& setToTest2);
@@ -132,8 +136,8 @@ namespace YACS
     template<class T>
     void EngineIntegrationTest::checkSetsEqual(const std::set<T>& setToTest1, const std::set<T>& setToTest2)
     {
-      typename std::set<T>::iterator iter1=setToTest1.begin();
-      typename std::set<T>::iterator iter2=setToTest2.begin();
+      typename std::set<T>::const_iterator iter1=setToTest1.begin();
+      typename std::set<T>::const_iterator iter2=setToTest2.begin();
       CPPUNIT_ASSERT_EQUAL_MESSAGE("Sets can't be equal : size different", (int)setToTest1.size(), (int)setToTest2.size());
       for(;iter1!=setToTest1.end();iter1++,iter2++)
         CPPUNIT_ASSERT_MESSAGE("Sets can't be equal : value different", *iter1==*iter2);
@@ -142,7 +146,7 @@ namespace YACS
     template<class T>
     void EngineIntegrationTest::checkSetsNotEqual(const std::set<T *>& setToTest1, const std::set<T *>&setToTest2)
     {
-      typename std::set<T *>::iterator iter1=setToTest1.begin();
+      typename std::set<T *>::const_iterator iter1=setToTest1.begin();
       CPPUNIT_ASSERT_EQUAL_MESSAGE("Sets can't be equal : size different", (int)setToTest1.size(), (int)setToTest2.size());
       for(;iter1!=setToTest1.end();iter1++)
         CPPUNIT_ASSERT_MESSAGE("Elements is in set : not expected.",setToTest2.find(*iter1)==setToTest2.end());