- Timestamp:
- Aug 16, 2013, 9:39:29 PM (11 years ago)
- Location:
- code/branches/core6
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core6/src/libraries/core/config/CMakeLists.txt
r9560 r9653 6 6 ConfigFileManager.cc 7 7 ConfigFileSection.cc 8 Configurable.cc 8 9 ConfigValueContainer.cc 9 10 SettingsConfigFile.cc -
code/branches/core6/src/libraries/core/config/Configurable.h
r9577 r9653 48 48 { 49 49 public: 50 Configurable(); 51 50 52 /// Function to collect the SetConfigValue-macro calls. 51 53 void setConfigValues() {}; -
code/branches/core6/test/core/class/IdentifierClassHierarchyTest.cc
r9651 r9653 132 132 registerClass("Context", new ClassFactoryWithContext<Context>()); 133 133 registerClass("Listable", new ClassFactoryWithContext<Listable>()); 134 registerClass("Configurable", new ClassFactoryNoArgs<Configurable>()); 134 135 registerClass("OrxonoxInterface", new ClassFactoryNoArgs<OrxonoxInterface>()); 135 136 registerClass("OrxonoxClass", new ClassFactoryNoArgs<OrxonoxClass>()); … … 232 233 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(OrxonoxInterface))); 233 234 234 EXPECT_EQ(3u, identifier->getParents().size()); 235 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 236 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 235 EXPECT_EQ(4u, identifier->getParents().size()); 236 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 237 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 238 EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable))); 237 239 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface))); 238 240 } … … 255 257 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(OrxonoxInterface))); 256 258 257 EXPECT_EQ(3u, identifier->getParents().size()); 258 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 259 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 259 EXPECT_EQ(4u, identifier->getParents().size()); 260 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 261 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 262 EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable))); 260 263 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface))); 261 264 } … … 278 281 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseInterface1))); 279 282 280 EXPECT_EQ(4u, identifier->getParents().size()); 281 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 282 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 283 EXPECT_EQ(5u, identifier->getParents().size()); 284 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 285 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 286 EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable))); 283 287 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface))); 284 288 EXPECT_TRUE(contains(identifier->getParents(), Class(BaseInterface1))); … … 300 304 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseInterface2))); 301 305 302 EXPECT_EQ(4u, identifier->getParents().size()); 303 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 304 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 306 EXPECT_EQ(5u, identifier->getParents().size()); 307 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 308 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 309 EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable))); 305 310 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface))); 306 311 EXPECT_TRUE(contains(identifier->getParents(), Class(BaseInterface2))); … … 328 333 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(OrxonoxClass))); 329 334 330 EXPECT_EQ(3u, identifier->getParents().size()); 331 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 332 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 335 EXPECT_EQ(4u, identifier->getParents().size()); 336 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 337 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 338 EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable))); 333 339 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass))); 334 340 } … … 345 351 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseClass))); 346 352 347 EXPECT_EQ(4u, identifier->getParents().size()); 348 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 349 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 353 EXPECT_EQ(5u, identifier->getParents().size()); 354 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 355 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 356 EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable))); 350 357 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass))); 351 358 EXPECT_TRUE(contains(identifier->getParents(), Class(BaseClass))); … … 364 371 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(Interface1))); 365 372 366 EXPECT_EQ(7u, identifier->getParents().size()); 367 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 368 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 373 EXPECT_EQ(8u, identifier->getParents().size()); 374 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 375 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 376 EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable))); 369 377 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass))); 370 378 EXPECT_TRUE(contains(identifier->getParents(), Class(BaseClass))); … … 387 395 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(Interface2))); 388 396 389 EXPECT_EQ(9u, identifier->getParents().size()); 390 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 391 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 397 EXPECT_EQ(10u, identifier->getParents().size()); 398 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 399 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 400 EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable))); 392 401 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass))); 393 402 EXPECT_TRUE(contains(identifier->getParents(), Class(BaseClass))); … … 412 421 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(Interface2))); 413 422 414 EXPECT_EQ(9u, identifier->getParents().size()); 415 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 416 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 423 EXPECT_EQ(10u, identifier->getParents().size()); 424 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 425 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 426 EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable))); 417 427 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass))); 418 428 EXPECT_TRUE(contains(identifier->getParents(), Class(BaseClass))); … … 437 447 EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseInterface2))); 438 448 439 EXPECT_EQ(7u, identifier->getParents().size()); 440 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 441 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 449 EXPECT_EQ(8u, identifier->getParents().size()); 450 EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable))); 451 EXPECT_TRUE(contains(identifier->getParents(), Class(Listable))); 452 EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable))); 442 453 EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass))); 443 454 EXPECT_TRUE(contains(identifier->getParents(), Class(BaseClass))); -
code/branches/core6/test/core/class/IdentifierExternalClassHierarchyTest.cc
r9646 r9653 44 44 virtual void SetUp() 45 45 { 46 registerClass("Context", new ClassFactoryWithContext<Context>()); 47 registerClass("Listable", new ClassFactoryWithContext<Listable>()); 46 48 registerClass("Interface", static_cast<ClassFactory<Interface>*>(NULL), false).inheritsFrom(Class(Identifiable)); 47 49 registerClass("BaseClass", new ClassFactoryNoArgs<BaseClass>()); -
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.