Changeset 11054 for code/branches/cpp11_v3/test/core/object/ListableTest.cc
- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/test/core/object/ListableTest.cc
r10624 r11054 37 37 { 38 38 public: 39 virtual void SetUp() 39 virtual void SetUp() override 40 40 { 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 46 virtual void TearDown() 46 virtual void TearDown() override 47 47 { 48 48 Context::destroyRootContext(); … … 56 56 { 57 57 ListableClassTest* test = new ListableClassTest(); 58 ASSERT_TRUE(test != NULL);58 ASSERT_TRUE(test != nullptr); 59 59 delete test; 60 60 } … … 63 63 { 64 64 ListableClassTest test; 65 EXPECT_EQ(1u, ObjectList<ListableClassTest> ::size());65 EXPECT_EQ(1u, ObjectList<ListableClassTest>().size()); 66 66 EXPECT_TRUE(objectListContains<ListableClassTest>(&test)); 67 67 } … … 70 70 { 71 71 ListableSubclassTest test; 72 EXPECT_EQ(1u, ObjectList<ListableClassTest> ::size());72 EXPECT_EQ(1u, ObjectList<ListableClassTest>().size()); 73 73 EXPECT_TRUE(objectListContains<ListableClassTest>(&test)); 74 EXPECT_EQ(1u, ObjectList<ListableSubclassTest> ::size());74 EXPECT_EQ(1u, ObjectList<ListableSubclassTest>().size()); 75 75 EXPECT_TRUE(objectListContains<ListableSubclassTest>(&test)); 76 76 } … … 78 78 TEST_F(ListableTest, RemovesFromObjectList) 79 79 { 80 EXPECT_EQ(0u, ObjectList<ListableClassTest> ::size());80 EXPECT_EQ(0u, ObjectList<ListableClassTest>().size()); 81 81 { 82 82 ListableClassTest test; 83 EXPECT_EQ(1u, ObjectList<ListableClassTest> ::size());83 EXPECT_EQ(1u, ObjectList<ListableClassTest>().size()); 84 84 EXPECT_TRUE(objectListContains<ListableClassTest>(&test)); 85 85 } 86 EXPECT_EQ(0u, ObjectList<ListableClassTest> ::size());86 EXPECT_EQ(0u, ObjectList<ListableClassTest>().size()); 87 87 } 88 88 89 89 TEST_F(ListableTest, RemovesFromAllObjectLists) 90 90 { 91 EXPECT_EQ(0u, ObjectList<ListableClassTest> ::size());92 EXPECT_EQ(0u, ObjectList<ListableSubclassTest> ::size());91 EXPECT_EQ(0u, ObjectList<ListableClassTest>().size()); 92 EXPECT_EQ(0u, ObjectList<ListableSubclassTest>().size()); 93 93 { 94 94 ListableSubclassTest test; 95 EXPECT_EQ(1u, ObjectList<ListableClassTest> ::size());95 EXPECT_EQ(1u, ObjectList<ListableClassTest>().size()); 96 96 EXPECT_TRUE(objectListContains<ListableClassTest>(&test)); 97 EXPECT_EQ(1u, ObjectList<ListableSubclassTest> ::size());97 EXPECT_EQ(1u, ObjectList<ListableSubclassTest>().size()); 98 98 EXPECT_TRUE(objectListContains<ListableSubclassTest>(&test)); 99 99 } 100 EXPECT_EQ(0u, ObjectList<ListableClassTest> ::size());101 EXPECT_EQ(0u, ObjectList<ListableSubclassTest> ::size());100 EXPECT_EQ(0u, ObjectList<ListableClassTest>().size()); 101 EXPECT_EQ(0u, ObjectList<ListableSubclassTest>().size()); 102 102 } 103 103 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
Note: See TracChangeset
for help on using the changeset viewer.