Index: code/branches/core7/test/core/object/StrongPtrTest.cc
===================================================================
--- code/branches/core7/test/core/object/SmartPtrTest.cc	(revision 10359)
+++ code/branches/core7/test/core/object/StrongPtrTest.cc	(revision 10555)
@@ -1,4 +1,4 @@
 #include <gtest/gtest.h>
-#include "core/object/SmartPtr.h"
+#include "core/object/StrongPtr.h"
 
 namespace orxonox
@@ -17,14 +17,14 @@
     }
 
-    TEST(SmartPtrTest, CanReferenceObject)
+    TEST(StrongPtrTest, CanReferenceObject)
     {
         bool bla;
         DestroyableTest* test = new DestroyableTest(bla);
-        SmartPtr<DestroyableTest> smartPtr = test;
-        EXPECT_EQ(test, smartPtr.get());
+        StrongPtr<DestroyableTest> strongPtr = test;
+        EXPECT_EQ(test, strongPtr.get());
         test->destroy();
     }
 
-    TEST(SmartPtrTest, IncreasesReferenceCount)
+    TEST(StrongPtrTest, IncreasesReferenceCount)
     {
         bool bla;
@@ -32,5 +32,5 @@
         EXPECT_EQ(0u, test->getReferenceCount());
         {
-            SmartPtr<DestroyableTest> smartPtr = test;
+            StrongPtr<DestroyableTest> strongPtr = test;
             EXPECT_EQ(1u, test->getReferenceCount());
         }
@@ -39,5 +39,5 @@
     }
 
-    TEST(SmartPtrTest, DestroyDeletesInstance)
+    TEST(StrongPtrTest, DestroyDeletesInstance)
     {
         bool destroyed = false;
@@ -48,15 +48,15 @@
     }
 
-    TEST(SmartPtrTest, PreventsDestruction)
+    TEST(StrongPtrTest, PreventsDestruction)
     {
         bool destroyed = false;
         DestroyableTest* test = new DestroyableTest(destroyed);
         EXPECT_FALSE(destroyed);
-        SmartPtr<DestroyableTest> smartPtr = test;
+        StrongPtr<DestroyableTest> strongPtr = test;
         test->destroy();
         EXPECT_FALSE(destroyed);
     }
 
-    TEST(SmartPtrTest, DestroysIfSmartPtrRemoved)
+    TEST(StrongPtrTest, DestroysIfStrongPtrRemoved)
     {
         bool destroyed = false;
@@ -64,5 +64,5 @@
         EXPECT_FALSE(destroyed);
         {
-            SmartPtr<DestroyableTest> smartPtr = test;
+            StrongPtr<DestroyableTest> strongPtr = test;
             test->destroy();
             EXPECT_FALSE(destroyed);
@@ -71,5 +71,5 @@
     }
 
-    TEST(SmartPtrTest, DestroysIfAllSmartPtrsRemoved)
+    TEST(StrongPtrTest, DestroysIfAllStrongPtrsRemoved)
     {
         bool destroyed = false;
@@ -77,9 +77,9 @@
         EXPECT_FALSE(destroyed);
         {
-            SmartPtr<DestroyableTest> smartPtr1 = test;
+            StrongPtr<DestroyableTest> strongPtr1 = test;
             {
-                SmartPtr<DestroyableTest> smartPtr2 = test;
+                StrongPtr<DestroyableTest> strongPtr2 = test;
                 {
-                    SmartPtr<DestroyableTest> smartPtr3 = test;
+                    StrongPtr<DestroyableTest> strongPtr3 = test;
                     test->destroy();
                     EXPECT_FALSE(destroyed);
@@ -92,51 +92,51 @@
     }
 
-    void isNull(const SmartPtr<DestroyableTest> smartPtr)
+    void isNull(const StrongPtr<DestroyableTest> strongPtr)
     {
-        EXPECT_TRUE(smartPtr == NULL);
-        EXPECT_TRUE(smartPtr == 0);
-        EXPECT_TRUE(!smartPtr);
-        EXPECT_FALSE(smartPtr != NULL);
-        EXPECT_FALSE(smartPtr != 0);
-        EXPECT_FALSE(smartPtr);
+        EXPECT_TRUE(strongPtr == NULL);
+        EXPECT_TRUE(strongPtr == 0);
+        EXPECT_TRUE(!strongPtr);
+        EXPECT_FALSE(strongPtr != NULL);
+        EXPECT_FALSE(strongPtr != 0);
+        EXPECT_FALSE(strongPtr);
     }
 
-    TEST(SmartPtrTest, IsNull)
+    TEST(StrongPtrTest, IsNull)
     {
         {
-            SmartPtr<DestroyableTest> smartPtr;
-            isNull(smartPtr);
+            StrongPtr<DestroyableTest> strongPtr;
+            isNull(strongPtr);
         }
         {
-            SmartPtr<DestroyableTest> smartPtr = NULL;
-            isNull(smartPtr);
+            StrongPtr<DestroyableTest> strongPtr = NULL;
+            isNull(strongPtr);
         }
         {
-            SmartPtr<DestroyableTest> smartPtr;
-            smartPtr = NULL;
-            isNull(smartPtr);
+            StrongPtr<DestroyableTest> strongPtr;
+            strongPtr = NULL;
+            isNull(strongPtr);
         }
         {
-            SmartPtr<DestroyableTest> smartPtr = 0;
-            isNull(smartPtr);
+            StrongPtr<DestroyableTest> strongPtr = 0;
+            isNull(strongPtr);
         }
         {
-            SmartPtr<DestroyableTest> smartPtr;
-            smartPtr = 0;
-            isNull(smartPtr);
+            StrongPtr<DestroyableTest> strongPtr;
+            strongPtr = 0;
+            isNull(strongPtr);
         }
     }
 
-    TEST(SmartPtrTest, IsNotNull)
+    TEST(StrongPtrTest, IsNotNull)
     {
         bool destroyed = false;
         DestroyableTest* test = new DestroyableTest(destroyed);
-        SmartPtr<DestroyableTest> smartPtr = test;
-        EXPECT_FALSE(smartPtr == NULL);
-        EXPECT_FALSE(smartPtr == 0);
-        EXPECT_FALSE(!smartPtr);
-        EXPECT_TRUE(smartPtr != NULL);
-        EXPECT_TRUE(smartPtr != 0);
-        EXPECT_TRUE(smartPtr);
+        StrongPtr<DestroyableTest> strongPtr = test;
+        EXPECT_FALSE(strongPtr == NULL);
+        EXPECT_FALSE(strongPtr == 0);
+        EXPECT_FALSE(!strongPtr);
+        EXPECT_TRUE(strongPtr != NULL);
+        EXPECT_TRUE(strongPtr != 0);
+        EXPECT_TRUE(strongPtr);
         test->destroy();
     }
