diff -r f5d4820de50d -r 4fde310f06fe stif/TestServer/src/TestExecutionThread.cpp --- a/stif/TestServer/src/TestExecutionThread.cpp Tue May 25 18:01:01 2010 +0300 +++ b/stif/TestServer/src/TestExecutionThread.cpp Mon Jun 14 11:37:33 2010 +0300 @@ -272,22 +272,7 @@ __TRACEI (KInit, ( _L("Loaded test module[%S]"), &moduleName ) ); } - // Verify the UID - TUid KUidTestModule = TUid::Uid ( 0x101FB3E7 ); - TUidType requiredUID( KDynamicLibraryUid, KSharedLibraryUid, KUidTestModule ); - - TUidType moduleUID = aModule.Type(); - if ( moduleUID != requiredUID ) - { - // New instance can't be created - RDebug::Print( ( _L("STIF TF: Test module has invalid UID. Aborting loading!") ) ); - __TRACEI (KError, ( CStifLogger::EError, _L("Test module has invalid UID. Aborting loading!"))); - tmpBuffer.Format(_L("Module [%S] has invalid UID"), &moduleName); - ErrorPrint( 1, tmpBuffer ); - ModuleContainer().OperationErrorResult() = KErrNotSupported; - return KErrNotSupported; - } - + // Get pointer to first exported function ModuleContainer().OperationText() = _L("1st EXPORTED function"); CTestInterfaceFactory libEntry; @@ -2156,7 +2141,7 @@ ------------------------------------------------------------------------------- */ -void CTestThreadContainer::IsServerAlive() +void CTestThreadContainer::IsServerAlive() const { if( iServerThread.ExitType() != EExitPending ) @@ -2187,7 +2172,7 @@ ------------------------------------------------------------------------------- */ -CTestExecution& CTestThreadContainer::TestExecution() +CTestExecution& CTestThreadContainer::TestExecution() const { IsServerAlive(); @@ -2199,7 +2184,32 @@ return *execution; }; + +/* +------------------------------------------------------------------------------- + + Class: CTestThreadContainer + + Method: GetTestCaseArguments + + Description: Get test case arguments + + Parameters: None + Return Values: test case arguments + + Errors/Exceptions: + + Status: Proposal + +------------------------------------------------------------------------------- +*/ +const TDesC& CTestThreadContainer::GetTestCaseArguments() const + { + return TestExecution().GetTestCaseArguments(); + } + + /* -------------------------------------------------------------------------------