mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-13 11:43:49 +00:00
All unit tests that run now pass.
This commit is contained in:
parent
b173e5571c
commit
fae1bad96c
4 changed files with 19 additions and 22 deletions
|
|
@ -47,10 +47,10 @@ public:
|
|||
public:
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
virtual void registerInterfaces( const SimComponent *owner )
|
||||
virtual void registerInterfaces( SimComponent *owner )
|
||||
{
|
||||
// Register a cached interface for this
|
||||
registerCachedInterface( NULL, "aU32", this, &mMyId );
|
||||
owner->registerCachedInterface( NULL, "aU32", this, &mMyId );
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -66,7 +66,7 @@ public:
|
|||
ComponentInterfaceList list;
|
||||
|
||||
// Enumerate the interfaces on the owner, only ignore interfaces that this object owns
|
||||
if( !_getOwner()->getInterfaces( &list, NULL, "aU32", this, true ) )
|
||||
if( !owner->getInterfaces( &list, NULL, "aU32", this, true ) )
|
||||
return false;
|
||||
|
||||
// Sanity check before just assigning all willy-nilly
|
||||
|
|
@ -131,23 +131,19 @@ TEST(SimComponent, Composition)
|
|||
<< "testComponent did not properly set the mOwner field of componentB to NULL.";
|
||||
|
||||
// Register the object with the simulation, kicking off the interface registration
|
||||
const bool registered = testComponent->registerObject();
|
||||
EXPECT_TRUE( registered )
|
||||
ASSERT_TRUE( testComponent->registerObject() )
|
||||
<< "Failed to register testComponent";
|
||||
|
||||
// Interface tests
|
||||
if( registered )
|
||||
{
|
||||
{
|
||||
SCOPED_TRACE("componentA");
|
||||
componentA->unit_test();
|
||||
}
|
||||
{
|
||||
SCOPED_TRACE("componentB");
|
||||
componentB->unit_test();
|
||||
}
|
||||
testComponent->deleteObject();
|
||||
SCOPED_TRACE("componentA");
|
||||
componentA->unit_test();
|
||||
}
|
||||
{
|
||||
SCOPED_TRACE("componentB");
|
||||
componentB->unit_test();
|
||||
}
|
||||
|
||||
testComponent->deleteObject();
|
||||
};
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue