Changeset 9647

Timestamp:

Aug 14, 2013, 10:39:32 AM (11 years ago)

Author:

landauf

Message:

fixed tests (caused problem with MSVC because they were executed in a different order)

Location:

code/branches/core6/test/core/class

Files:

• SubclassIdentifierTest.cc (modified) (4 diffs)
• SuperTest.cc (modified) (2 diffs)

code/branches/core6/test/core/class/SubclassIdentifierTest.cc

@@ -21 +21 @@
         };
 
-        RegisterClass(TestClass);
-        RegisterClass(TestSubclass);
+        // Fixture
+        class SubclassIdentifierTest : public ::testing::Test
+        {
+            public:
+                virtual void SetUp()
+                {
+                    registerClass("OrxonoxClass", new ClassFactoryNoArgs<OrxonoxClass>());
+                    registerClass("TestClass", new ClassFactoryWithContext<TestClass>());
+                    registerClass("TestSubclass", new ClassFactoryWithContext<TestSubclass>());
+
+                    IdentifierManager::getInstance().createClassHierarchy();
+                }
+
+                virtual void TearDown()
+                {
+                    IdentifierManager::getInstance().destroyAllIdentifiers();
+                }
+        };
     }
 
-    TEST(SubclassIdentifierTest, CanCreateIdentifier)
+    TEST_F(SubclassIdentifierTest, CanCreateIdentifier)
     {
         TestSubclass test;
@@ -32 +48 @@
     }
 
-    TEST(SubclassIdentifierTest, DefaultsToNormalIdentifier)
+    TEST_F(SubclassIdentifierTest, DefaultsToNormalIdentifier)
     {
         TestSubclass test;
@@ -40 +56 @@
     }
 
-    TEST(SubclassIdentifierTest, CanAssignIdentifierOfSubclass)
+    TEST_F(SubclassIdentifierTest, CanAssignIdentifierOfSubclass)
     {
         TestSubclass test;
-        IdentifierManager::getInstance().createClassHierarchy();
-
         SubclassIdentifier<TestClass> subclassIdentifier;
         subclassIdentifier = Class(TestSubclass);
@@ -50 +64 @@
     }
 
-    TEST(SubclassIdentifierTest, CanCreateSubclass)
+    TEST_F(SubclassIdentifierTest, CanCreateSubclass)
     {
         TestSubclass test;
-        IdentifierManager::getInstance().createClassHierarchy();
-
         SubclassIdentifier<TestClass> subclassIdentifier;
         subclassIdentifier = Class(TestSubclass);

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

@@ -62 +62 @@
         };
 
-        RegisterClass(TestClass);
-        RegisterClass(TestSubclass);
+        // Fixture
+        class SuperTest : public ::testing::Test
+        {
+            public:
+                virtual void SetUp()
+                {
+                    registerClass("OrxonoxClass", new ClassFactoryNoArgs<OrxonoxClass>());
+                    registerClass("BaseObject", new ClassFactoryWithContext<BaseObject>());
+                    registerClass("TestClass", new ClassFactoryWithContext<TestClass>());
+                    registerClass("TestSubclass", new ClassFactoryWithContext<TestSubclass>());
+
+                    IdentifierManager::getInstance().createClassHierarchy();
+                }
+
+                virtual void TearDown()
+                {
+                    IdentifierManager::getInstance().destroyAllIdentifiers();
+                }
+        };
     }
 
-    TEST(SuberTest, SuperCallWithoutArguments)
+    TEST_F(SuperTest, SuperCallWithoutArguments)
     {
         TestSubclass test;
-        IdentifierManager::getInstance().createClassHierarchy();
 
         EXPECT_FALSE(test.changedNameBase_);
@@ -80 +96 @@
     }
 
-    TEST(SuberTest, SuperCallWithArguments)
+    TEST_F(SuperTest, SuperCallWithArguments)
     {
         TestSubclass test;
-        IdentifierManager::getInstance().createClassHierarchy();
 
         EXPECT_FALSE(test.xmlPortBase_);