Changeset 10765 for code/branches/cpp11_v2/test/core/object
- Timestamp:
- Nov 4, 2015, 10:25:42 PM (9 years ago)
- Location:
- code/branches/cpp11_v2/test/core/object
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/test/core/object/ClassFactoryTest.cc
r10624 r10765 18 18 new IdentifierManager(); 19 19 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 20 Context::setRootContext(new Context( NULL));20 Context::setRootContext(new Context(nullptr)); 21 21 } 22 22 … … 33 33 { 34 34 Factory* factory = new ClassFactoryWithContext<BaseObject>(); 35 Identifiable* object = factory->fabricate( NULL);36 ASSERT_TRUE(object != NULL);35 Identifiable* object = factory->fabricate(nullptr); 36 ASSERT_TRUE(object != nullptr); 37 37 BaseObject* baseObject = dynamic_cast<BaseObject*>(object); 38 EXPECT_TRUE(baseObject != NULL);38 EXPECT_TRUE(baseObject != nullptr); 39 39 delete object; 40 40 // don't delete factory - it remains in the identifier -
code/branches/cpp11_v2/test/core/object/ContextTest.cc
r10624 r10765 12 12 { 13 13 public: 14 SubclassContext() : Context( NULL) { RegisterObject(SubclassContext); }14 SubclassContext() : Context(nullptr) { RegisterObject(SubclassContext); } 15 15 }; 16 16 … … 25 25 new IdentifierManager(); 26 26 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 27 Context::setRootContext(new Context( NULL));27 Context::setRootContext(new Context(nullptr)); 28 28 } 29 29 … … 39 39 TEST_F(ContextTest, CanCreateContext) 40 40 { 41 Context context( NULL);41 Context context(nullptr); 42 42 } 43 43 … … 49 49 TEST_F(ContextTest, ContextIsItsOwnContext) 50 50 { 51 Context context( NULL);51 Context context(nullptr); 52 52 EXPECT_EQ(&context, context.getContext()); 53 53 } … … 68 68 TEST_F(ContextTest, ContextIsAddedToItsOwnObjectList) 69 69 { 70 Context context( NULL);70 Context context(nullptr); 71 71 ASSERT_EQ(1u, context.getObjectList<Context>()->size()); 72 72 EXPECT_TRUE(context.getObjectList<Context>()->begin()->objectBase_ == static_cast<Listable*>(&context)); … … 75 75 TEST_F(ContextTest, ContextIsAddedToObjectListOfBaseContext) 76 76 { 77 Context baseContext( NULL);77 Context baseContext(nullptr); 78 78 Context subContext(&baseContext); 79 79 -
code/branches/cpp11_v2/test/core/object/DestroyableTest.cc
r9603 r10765 32 32 DestroyableTest* test = new DestroyableTest(destroyed); 33 33 EXPECT_FALSE(destroyed); 34 EXPECT_TRUE(test != NULL);34 EXPECT_TRUE(test != nullptr); 35 35 test->destroy(); 36 36 EXPECT_TRUE(destroyed); -
code/branches/cpp11_v2/test/core/object/IteratorTest.cc
r10736 r10765 36 36 new IdentifierManager(); 37 37 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 38 Context::setRootContext(new Context( NULL));38 Context::setRootContext(new Context(nullptr)); 39 39 } 40 40 … … 120 120 ++i; 121 121 if (i == 1u) EXPECT_EQ(&testClass, *it); 122 if (i == 2u) EXPECT_EQ( NULL, *it);122 if (i == 2u) EXPECT_EQ(nullptr, *it); 123 123 } 124 124 EXPECT_EQ(2u, i); -
code/branches/cpp11_v2/test/core/object/ListableTest.cc
r10624 r10765 41 41 new IdentifierManager(); 42 42 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 43 Context::setRootContext(new Context( NULL));43 Context::setRootContext(new Context(nullptr)); 44 44 } 45 45 … … 56 56 { 57 57 ListableClassTest* test = new ListableClassTest(); 58 ASSERT_TRUE(test != NULL);58 ASSERT_TRUE(test != nullptr); 59 59 delete test; 60 60 } … … 104 104 TEST_F(ListableTest, CanAddObjectToContext) 105 105 { 106 Context context( NULL);106 Context context(nullptr); 107 107 ListableSubclassTest test; 108 108 … … 118 118 TEST_F(ListableTest, CanAddObjectToSubContext) 119 119 { 120 Context baseContext( NULL);120 Context baseContext(nullptr); 121 121 Context subContext(&baseContext); 122 122 ListableSubclassTest test; … … 139 139 { 140 140 Context* rootContext = Context::getRootContext(); 141 Context newContext( NULL);141 Context newContext(nullptr); 142 142 ListableSubclassTest test; 143 143 -
code/branches/cpp11_v2/test/core/object/ObjectListBaseTest.cc
r9661 r10765 24 24 { 25 25 ObjectListBase list; 26 ObjectListBaseElement* element = new ObjectListElement<Listable>( NULL);26 ObjectListBaseElement* element = new ObjectListElement<Listable>(nullptr); 27 27 list.addElement(element); 28 28 EXPECT_EQ(1u, list.size()); … … 32 32 { 33 33 ObjectListBase list; 34 ObjectListBaseElement* element = new ObjectListElement<Listable>( NULL);34 ObjectListBaseElement* element = new ObjectListElement<Listable>(nullptr); 35 35 list.addElement(element); 36 36 EXPECT_EQ(1u, list.size()); … … 43 43 { 44 44 ObjectListBase list; 45 list.addElement(new ObjectListElement<Listable>( NULL));45 list.addElement(new ObjectListElement<Listable>(nullptr)); 46 46 EXPECT_EQ(1u, list.size()); 47 47 } … … 52 52 EXPECT_EQ(0u, list.size()); 53 53 { 54 ObjectListElement<Listable> element1( NULL);54 ObjectListElement<Listable> element1(nullptr); 55 55 list.addElement(&element1); 56 56 EXPECT_EQ(1u, list.size()); 57 57 { 58 ObjectListElement<Listable> element1( NULL);58 ObjectListElement<Listable> element1(nullptr); 59 59 list.addElement(&element1); 60 60 EXPECT_EQ(2u, list.size()); 61 61 { 62 ObjectListElement<Listable> element1( NULL);62 ObjectListElement<Listable> element1(nullptr); 63 63 list.addElement(&element1); 64 64 EXPECT_EQ(3u, list.size()); … … 76 76 ObjectListElementRemovalListenerMock listener; 77 77 list.registerRemovalListener(&listener); 78 ObjectListBaseElement* element = new ObjectListElement<Listable>( NULL);78 ObjectListBaseElement* element = new ObjectListElement<Listable>(nullptr); 79 79 list.addElement(element); 80 80 EXPECT_CALL(listener, removedElement(element)); -
code/branches/cpp11_v2/test/core/object/ObjectListIteratorTest.cc
r10736 r10765 36 36 new IdentifierManager(); 37 37 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 38 Context::setRootContext(new Context( NULL));38 Context::setRootContext(new Context(nullptr)); 39 39 } 40 40 -
code/branches/cpp11_v2/test/core/object/ObjectListTest.cc
r10736 r10765 28 28 new IdentifierManager(); 29 29 ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER); 30 Context::setRootContext(new Context( NULL));30 Context::setRootContext(new Context(nullptr)); 31 31 } 32 32 -
code/branches/cpp11_v2/test/core/object/StrongPtrTest.cc
r10744 r10765 111 111 void isNull(const StrongPtr<DestroyableTest> strongPtr) 112 112 { 113 EXPECT_TRUE(strongPtr == NULL);113 EXPECT_TRUE(strongPtr == nullptr); 114 114 EXPECT_TRUE(strongPtr == 0); 115 115 EXPECT_TRUE(!strongPtr); 116 EXPECT_FALSE(strongPtr != NULL);116 EXPECT_FALSE(strongPtr != nullptr); 117 117 EXPECT_FALSE(strongPtr != 0); 118 118 EXPECT_FALSE(strongPtr); … … 126 126 } 127 127 { 128 StrongPtr<DestroyableTest> strongPtr = NULL;128 StrongPtr<DestroyableTest> strongPtr = nullptr; 129 129 isNull(strongPtr); 130 130 } 131 131 { 132 132 StrongPtr<DestroyableTest> strongPtr; 133 strongPtr = NULL;133 strongPtr = nullptr; 134 134 isNull(strongPtr); 135 135 } … … 150 150 DestroyableTest* test = new DestroyableTest(destroyed); 151 151 StrongPtr<DestroyableTest> strongPtr = test; 152 EXPECT_FALSE(strongPtr == NULL);152 EXPECT_FALSE(strongPtr == nullptr); 153 153 EXPECT_FALSE(strongPtr == 0); 154 154 EXPECT_FALSE(!strongPtr); 155 EXPECT_TRUE(strongPtr != NULL);155 EXPECT_TRUE(strongPtr != nullptr); 156 156 EXPECT_TRUE(strongPtr != 0); 157 157 EXPECT_TRUE(strongPtr); … … 166 166 // default 167 167 StrongPtr<DestroyableTest> strongPtr1; 168 EXPECT_EQ( NULL, strongPtr1.get());168 EXPECT_EQ(nullptr, strongPtr1.get()); 169 169 170 170 // pointer … … 277 277 EXPECT_EQ(1u, test->getReferenceCount()); 278 278 strongPtr.reset(); 279 EXPECT_EQ( NULL, strongPtr.get());279 EXPECT_EQ(nullptr, strongPtr.get()); 280 280 EXPECT_EQ(0u, test->getReferenceCount()); 281 281 -
code/branches/cpp11_v2/test/core/object/WeakPtrTest.cc
r10744 r10765 36 36 EXPECT_EQ(test, weakPtr.get()); 37 37 test->destroy(); 38 EXPECT_EQ( NULL, weakPtr.get());38 EXPECT_EQ(nullptr, weakPtr.get()); 39 39 } 40 40 … … 49 49 EXPECT_EQ(test, weakPtr3.get()); 50 50 test->destroy(); 51 EXPECT_EQ( NULL, weakPtr1.get());52 EXPECT_EQ( NULL, weakPtr2.get());53 EXPECT_EQ( NULL, weakPtr3.get());51 EXPECT_EQ(nullptr, weakPtr1.get()); 52 EXPECT_EQ(nullptr, weakPtr2.get()); 53 EXPECT_EQ(nullptr, weakPtr3.get()); 54 54 } 55 55 … … 66 66 void isNull(const WeakPtr<DestroyableTest> weakPtr) 67 67 { 68 EXPECT_TRUE(weakPtr == NULL);68 EXPECT_TRUE(weakPtr == nullptr); 69 69 EXPECT_TRUE(weakPtr == 0); 70 70 EXPECT_TRUE(!weakPtr); 71 EXPECT_FALSE(weakPtr != NULL);71 EXPECT_FALSE(weakPtr != nullptr); 72 72 EXPECT_FALSE(weakPtr != 0); 73 73 EXPECT_FALSE(weakPtr); … … 81 81 } 82 82 { 83 WeakPtr<DestroyableTest> weakPtr = NULL;83 WeakPtr<DestroyableTest> weakPtr = nullptr; 84 84 isNull(weakPtr); 85 85 } 86 86 { 87 87 WeakPtr<DestroyableTest> weakPtr; 88 weakPtr = NULL;88 weakPtr = nullptr; 89 89 isNull(weakPtr); 90 90 } … … 104 104 DestroyableTest* test = new DestroyableTest(); 105 105 WeakPtr<DestroyableTest> weakPtr = test; 106 EXPECT_FALSE(weakPtr == NULL);106 EXPECT_FALSE(weakPtr == nullptr); 107 107 EXPECT_FALSE(weakPtr == 0); 108 108 EXPECT_FALSE(!weakPtr); 109 EXPECT_TRUE(weakPtr != NULL);109 EXPECT_TRUE(weakPtr != nullptr); 110 110 EXPECT_TRUE(weakPtr != 0); 111 111 EXPECT_TRUE(weakPtr); … … 119 119 // default 120 120 WeakPtr<DestroyableTest> weakPtr1; 121 EXPECT_EQ( NULL, weakPtr1.get());121 EXPECT_EQ(nullptr, weakPtr1.get()); 122 122 123 123 // pointer … … 191 191 test->destroy(); 192 192 193 EXPECT_EQ( NULL, vector[0].get());194 EXPECT_EQ( NULL, vector[1].get());195 EXPECT_EQ( NULL, vector[2].get());193 EXPECT_EQ(nullptr, vector[0].get()); 194 EXPECT_EQ(nullptr, vector[1].get()); 195 EXPECT_EQ(nullptr, vector[2].get()); 196 196 } 197 197 … … 202 202 EXPECT_EQ(test, weakPtr.get()); 203 203 weakPtr.reset(); 204 EXPECT_EQ( NULL, weakPtr.get());204 EXPECT_EQ(nullptr, weakPtr.get()); 205 205 206 206 test->destroy();
Note: See TracChangeset
for help on using the changeset viewer.