X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fengine%2FTest%2FengineIntegrationTest.hxx;h=2a43b44e9dd1cdf0d74b38b88ce25ccc3991a2fc;hb=255150e4eec79294bbd06c7c464f309b4a264960;hp=edac72be8ef02e257e38a4ca494229e8edfbcb81;hpb=a84e60a749da66dffb73297fa5082b70b9d62f7d;p=modules%2Fyacs.git

diff --git a/src/engine/Test/engineIntegrationTest.hxx b/src/engine/Test/engineIntegrationTest.hxx
index edac72be8..2a43b44e9 100644
--- a/src/engine/Test/engineIntegrationTest.hxx
+++ b/src/engine/Test/engineIntegrationTest.hxx
@@ -1,7 +1,27 @@
+// 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, 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 __ENGINEINTEGRATIONTEST_HXX__
 #define __ENGINEINTEGRATIONTEST_HXX__
 
 #include <cppunit/extensions/HelperMacros.h>
+#include <list>
 
 namespace YACS
 {
@@ -15,6 +35,7 @@ namespace YACS
       CPPUNIT_TEST( testBloc1 );
       CPPUNIT_TEST( testBloc2 );
       CPPUNIT_TEST( testBloc3 );
+      CPPUNIT_TEST( testBloc4 );
       CPPUNIT_TEST( testForLoop1 );
       CPPUNIT_TEST( testForLoop2 );
       CPPUNIT_TEST( testForLoop3 );
@@ -30,6 +51,8 @@ namespace YACS
       CPPUNIT_TEST( testLinkUpdate1DS );
       CPPUNIT_TEST( testLinkUpdate2 );
       CPPUNIT_TEST( testLinkUpdate2DS );
+      CPPUNIT_TEST( testLinkUpdate3 );
+      CPPUNIT_TEST( testLinkUpdate4 );
       CPPUNIT_TEST( testInterLoopDFLink );
       CPPUNIT_TEST( deathTestForLinks );
       CPPUNIT_TEST( testForEachLoop1 );
@@ -39,10 +62,15 @@ namespace YACS
       CPPUNIT_TEST( testForEachLoop5 );
       CPPUNIT_TEST( testForOptimizerLoop1 );
       CPPUNIT_TEST( testForOptimizerLoop2 );
+      CPPUNIT_TEST( testForOptimizerLoop3 );
       CPPUNIT_TEST( testForDeployment1 );
       CPPUNIT_TEST( testForDeployment2 );
       CPPUNIT_TEST( testForCheckConsistency1 );
       CPPUNIT_TEST( testForCheckConsistency2 );
+      CPPUNIT_TEST( testForCheckConsistency3 );
+      CPPUNIT_TEST( testForCheckConsistency4 );
+      CPPUNIT_TEST( testRemoveRuntime );
+      CPPUNIT_TEST( testWrongNodeNameDetection );
       CPPUNIT_TEST_SUITE_END();
     public:
       void setUp();
@@ -50,6 +78,7 @@ namespace YACS
       void testBloc1();
       void testBloc2();
       void testBloc3();
+      void testBloc4();
       void testSwitch();
       void testSwitch2();
       void testSwitch3();
@@ -65,6 +94,8 @@ namespace YACS
       void testLinkUpdate1DS();
       void testLinkUpdate2();
       void testLinkUpdate2DS();
+      void testLinkUpdate3();
+      void testLinkUpdate4();
       void testInterLoopDFLink();
       void deathTestForLinks();
       void testForEachLoop1();
@@ -74,22 +105,39 @@ namespace YACS
       void testForEachLoop5();
       void testForOptimizerLoop1();
       void testForOptimizerLoop2();
+      void testForOptimizerLoop3();
       void testForDeployment1();
       void testForDeployment2();
       void testForCheckConsistency1();
       void testForCheckConsistency2();
+      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);
       template<class T>
       static void checkSetsEqual(const std::set<T>& setToTest1, const std::set<T>& setToTest2);
       template<class T>
       static void checkSetsNotEqual(const std::set<T *>& setToTest1, const std::set<T *>&setToTest2);
     };
 
+    template<class T>
+    void EngineIntegrationTest::checkListsEqual(const std::list<T>& setToTest1, const std::list<T>& setToTest2)
+    {
+      typename std::list<T>::iterator iter1=setToTest1.begin();
+      typename std::list<T>::iterator iter2=setToTest2.begin();
+      CPPUNIT_ASSERT_EQUAL_MESSAGE("Lists can't be equal : size different", (int)setToTest1.size(), (int)setToTest2.size());
+      for(;iter1!=setToTest1.end();iter1++,iter2++)
+        CPPUNIT_ASSERT_MESSAGE("Lists can't be equal : value different", *iter1==*iter2);
+    }
+
     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);
@@ -98,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());