[Orxonox-commit 5699] r10359 - code/branches/core7/test/core/object
landauf at orxonox.net
landauf at orxonox.net
Sun Apr 12 15:28:16 CEST 2015
Author: landauf
Date: 2015-04-12 15:28:15 +0200 (Sun, 12 Apr 2015)
New Revision: 10359
Modified:
code/branches/core7/test/core/object/SmartPtrTest.cc
code/branches/core7/test/core/object/WeakPtrTest.cc
Log:
added tests
Modified: code/branches/core7/test/core/object/SmartPtrTest.cc
===================================================================
--- code/branches/core7/test/core/object/SmartPtrTest.cc 2015-04-12 13:27:09 UTC (rev 10358)
+++ code/branches/core7/test/core/object/SmartPtrTest.cc 2015-04-12 13:28:15 UTC (rev 10359)
@@ -90,4 +90,54 @@
}
EXPECT_TRUE(destroyed);
}
+
+ void isNull(const SmartPtr<DestroyableTest> smartPtr)
+ {
+ EXPECT_TRUE(smartPtr == NULL);
+ EXPECT_TRUE(smartPtr == 0);
+ EXPECT_TRUE(!smartPtr);
+ EXPECT_FALSE(smartPtr != NULL);
+ EXPECT_FALSE(smartPtr != 0);
+ EXPECT_FALSE(smartPtr);
+ }
+
+ TEST(SmartPtrTest, IsNull)
+ {
+ {
+ SmartPtr<DestroyableTest> smartPtr;
+ isNull(smartPtr);
+ }
+ {
+ SmartPtr<DestroyableTest> smartPtr = NULL;
+ isNull(smartPtr);
+ }
+ {
+ SmartPtr<DestroyableTest> smartPtr;
+ smartPtr = NULL;
+ isNull(smartPtr);
+ }
+ {
+ SmartPtr<DestroyableTest> smartPtr = 0;
+ isNull(smartPtr);
+ }
+ {
+ SmartPtr<DestroyableTest> smartPtr;
+ smartPtr = 0;
+ isNull(smartPtr);
+ }
+ }
+
+ TEST(SmartPtrTest, 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);
+ test->destroy();
+ }
}
Modified: code/branches/core7/test/core/object/WeakPtrTest.cc
===================================================================
--- code/branches/core7/test/core/object/WeakPtrTest.cc 2015-04-12 13:27:09 UTC (rev 10358)
+++ code/branches/core7/test/core/object/WeakPtrTest.cc 2015-04-12 13:28:15 UTC (rev 10359)
@@ -44,4 +44,53 @@
EXPECT_CALL(callback, callback());
test->destroy();
}
+
+ void isNull(const WeakPtr<DestroyableTest> weakPtr)
+ {
+ EXPECT_TRUE(weakPtr == NULL);
+ EXPECT_TRUE(weakPtr == 0);
+ EXPECT_TRUE(!weakPtr);
+ EXPECT_FALSE(weakPtr != NULL);
+ EXPECT_FALSE(weakPtr != 0);
+ EXPECT_FALSE(weakPtr);
+ }
+
+ TEST(WeakPtrTest, IsNull)
+ {
+ {
+ WeakPtr<DestroyableTest> weakPtr;
+ isNull(weakPtr);
+ }
+ {
+ WeakPtr<DestroyableTest> weakPtr = NULL;
+ isNull(weakPtr);
+ }
+ {
+ WeakPtr<DestroyableTest> weakPtr;
+ weakPtr = NULL;
+ isNull(weakPtr);
+ }
+ {
+ WeakPtr<DestroyableTest> weakPtr = 0;
+ isNull(weakPtr);
+ }
+ {
+ WeakPtr<DestroyableTest> weakPtr;
+ weakPtr = 0;
+ isNull(weakPtr);
+ }
+ }
+
+ TEST(WeakPtrTest, IsNotNull)
+ {
+ DestroyableTest* test = new DestroyableTest();
+ WeakPtr<DestroyableTest> weakPtr = test;
+ EXPECT_FALSE(weakPtr == NULL);
+ EXPECT_FALSE(weakPtr == 0);
+ EXPECT_FALSE(!weakPtr);
+ EXPECT_TRUE(weakPtr != NULL);
+ EXPECT_TRUE(weakPtr != 0);
+ EXPECT_TRUE(weakPtr);
+ test->destroy();
+ }
}
More information about the Orxonox-commit
mailing list