- Timestamp:
- Aug 16, 2013, 9:39:29 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core6/test/core/class/IdentifierSimpleClassHierarchyTest.cc
r9651 r9653 48 48 registerClass("Context", new ClassFactoryWithContext<Context>()); 49 49 registerClass("Listable", new ClassFactoryWithContext<Listable>()); 50 registerClass("Configurable", new ClassFactoryNoArgs<Configurable>()); 50 51 registerClass("OrxonoxInterface", new ClassFactoryNoArgs<OrxonoxInterface>()); 51 52 registerClass("OrxonoxClass", new ClassFactoryNoArgs<OrxonoxClass>()); … … 101 102 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(OrxonoxInterface))); 102 103 103 EXPECT_EQ( 3u, identifier->getParents().size());104 EXPECT_EQ(4u, identifier->getParents().size()); 104 105 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 105 106 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 107 EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable))); 106 108 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface))); 107 109 } … … 120 122 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(OrxonoxClass))); 121 123 122 EXPECT_EQ( 3u, identifier->getParents().size());124 EXPECT_EQ(4u, identifier->getParents().size()); 123 125 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 124 126 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 127 EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable))); 125 128 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass))); 126 129 } … … 138 141 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseClass))); 139 142 140 EXPECT_EQ( 6u, identifier->getParents().size());143 EXPECT_EQ(7u, identifier->getParents().size()); 141 144 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 142 145 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 146 EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable))); 143 147 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface))); 144 148 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass)));
Note: See TracChangeset
for help on using the changeset viewer.