Changeset 10372 for code/branches/core7/test

Timestamp:

Apr 18, 2015, 1:07:08 PM (9 years ago)

Author:

landauf

Message:

use lists instead of sets to store parent identifiers. this allows to store the exact order of initialization of parent classes.

Location:

code/branches/core7/test/core/class

Files:

• IdentifierClassHierarchyTest.cc (modified) (3 diffs)
• IdentifierExternalClassHierarchyTest.cc (modified) (1 diff)
• IdentifierNestedClassHierarchyTest.cc (modified) (1 diff)
• IdentifierSimpleClassHierarchyTest.cc (modified) (1 diff)
• SuperTest.cc (modified) (2 diffs)

code/branches/core7/test/core/class/IdentifierClassHierarchyTest.cc

@@ -19 +19 @@
     namespace
     {
-        class BaseInterface1 : public OrxonoxInterface
+        class BaseInterface1 : virtual public OrxonoxInterface
         {
             public:
@@ -30 +30 @@
         };
 
-        class BaseInterface2 : public OrxonoxInterface
+        class BaseInterface2 : virtual public OrxonoxInterface
         {
             public:
@@ -155 +155 @@
         };
 
+        bool contains(const std::list<const Identifier*> identifiers, Identifier* identifier)
+        {
+            return std::find(identifiers.begin(), identifiers.end(), identifier) != identifiers.end();
+        }
+
         bool contains(const std::set<const Identifier*> identifiers, Identifier* identifier)
         {

code/branches/core7/test/core/class/IdentifierExternalClassHierarchyTest.cc

@@ -58 +58 @@
                 }
         };
+
+        bool contains(const std::list<const Identifier*> identifiers, Identifier* identifier)
+        {
+            return std::find(identifiers.begin(), identifiers.end(), identifier) != identifiers.end();
+        }
 
         bool contains(const std::set<const Identifier*> identifiers, Identifier* identifier)

code/branches/core7/test/core/class/IdentifierNestedClassHierarchyTest.cc

@@ -121 +121 @@
         };
 
+        bool contains(const std::list<const Identifier*> identifiers, Identifier* identifier)
+        {
+            return std::find(identifiers.begin(), identifiers.end(), identifier) != identifiers.end();
+        }
+
         bool contains(const std::set<const Identifier*> identifiers, Identifier* identifier)
         {

code/branches/core7/test/core/class/IdentifierSimpleClassHierarchyTest.cc

@@ -63 +63 @@
                 }
         };
+
+        bool contains(const std::list<const Identifier*> identifiers, Identifier* identifier)
+        {
+            return std::find(identifiers.begin(), identifiers.end(), identifier) != identifiers.end();
+        }
 
         bool contains(const std::set<const Identifier*> identifiers, Identifier* identifier)

code/branches/core7/test/core/class/SuperTest.cc

@@ -97 +97 @@
 
             EXPECT_EQ(1u, identifier->getDirectParents().size());
-            EXPECT_TRUE(identifier->getDirectParents().find(Class(TestClass)) != identifier->getDirectParents().end());
+            EXPECT_TRUE(std::find(identifier->getDirectParents().begin(), identifier->getDirectParents().end(), Class(TestClass)) != identifier->getDirectParents().end());
         }
         {
@@ -106 +106 @@
 
             EXPECT_EQ(1u, identifier->getDirectParents().size());
-            EXPECT_TRUE(identifier->getDirectParents().find(Class(BaseObject)) != identifier->getDirectParents().end());
+            EXPECT_TRUE(std::find(identifier->getDirectParents().begin(), identifier->getDirectParents().end(), Class(BaseObject)) != identifier->getDirectParents().end());
         }
     }