- Timestamp:
- Aug 16, 2013, 9:20:59 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core6/test/core/class/IdentifierSimpleClassHierarchyTest.cc
r9646 r9651 46 46 virtual void SetUp() 47 47 { 48 registerClass("Context", new ClassFactoryWithContext<Context>()); 49 registerClass("Listable", new ClassFactoryWithContext<Listable>()); 48 50 registerClass("OrxonoxInterface", new ClassFactoryNoArgs<OrxonoxInterface>()); 49 51 registerClass("OrxonoxClass", new ClassFactoryNoArgs<OrxonoxClass>()); … … 99 101 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(OrxonoxInterface))); 100 102 101 EXPECT_EQ( 2u, identifier->getParents().size());103 EXPECT_EQ(3u, identifier->getParents().size()); 102 104 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 105 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 103 106 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface))); 104 107 } … … 117 120 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(OrxonoxClass))); 118 121 119 EXPECT_EQ( 2u, identifier->getParents().size());122 EXPECT_EQ(3u, identifier->getParents().size()); 120 123 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 124 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 121 125 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass))); 122 126 } … … 134 138 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseClass))); 135 139 136 EXPECT_EQ( 5u, identifier->getParents().size());140 EXPECT_EQ(6u, identifier->getParents().size()); 137 141 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 142 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 138 143 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface))); 139 144 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass)));
Note: See TracChangeset
for help on using the changeset viewer.