diff -r 667e88a979d7 -r 31a8f755b7fe featuremgmt/featuremgr/test/rtest/src/t_fmgrbadclient.cpp --- a/featuremgmt/featuremgr/test/rtest/src/t_fmgrbadclient.cpp Mon Mar 15 12:46:30 2010 +0200 +++ b/featuremgmt/featuremgr/test/rtest/src/t_fmgrbadclient.cpp Thu Apr 01 00:19:42 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -85,7 +85,7 @@ } else { - RDebug::Print(_L("*** Expression evaluated to false. Line %d\r\n"), aLine); + TheTest.Printf(_L("*** Expression evaluated to false. Line %d\r\n"), aLine); } TheTest(EFalse, aLine); } @@ -168,6 +168,7 @@ void Close(); TInt SendReceive(TInt aFunction); TInt SendReceive(TInt aFunction, const TIpcArgs& aArgs); + void SendReceive(TInt aFunction, const TIpcArgs& aArgs, TRequestStatus& aStatus); private: TInt DoCreateSession(); @@ -198,6 +199,11 @@ return RSessionBase::SendReceive(aFunction, aArgs); } +void RTestFeatMgrSession::SendReceive(TInt aFunction, const TIpcArgs& aArgs, TRequestStatus& aStatus) + { + RSessionBase::SendReceive(aFunction, aArgs, aStatus); + } + TInt RTestFeatMgrSession::DoCreateSession() { const TInt KRetry( 2 ); @@ -236,7 +242,7 @@ return err; } -void PrintIterationCount(TInt aIteration) +void PrintIterationCount(TInt aIteration, TBool aFromThread = EFalse) { if((aIteration % 100) == 0) { @@ -245,7 +251,14 @@ TDateTime dt = time.DateTime(); TBuf<16> tbuf; tbuf.Format(_L("%02d:%02d:%02d.%06d"), dt.Hour(), dt.Minute(), dt.Second(), dt.MicroSecond()); - RDebug::Print(_L("-----[%S] Test iterations: %d\r\n"), &tbuf, aIteration); + if(aFromThread) + { + RDebug::Print(_L("-----[%S] Test iterations: %d\r\n"), &tbuf, aIteration); + } + else + { + TheTest.Printf(_L("-----[%S] Test iterations: %d\r\n"), &tbuf, aIteration); + } } } @@ -272,9 +285,7 @@ while(++data.iIteration <= KTestIterCount) { - RDebug::Print(_L("++++ %d\r\n"), data.iIteration); - - PrintIterationCount(data.iIteration); + PrintIterationCount(data.iIteration, ETrue); TIpcArgs args; data.iFunction = Math::Rand(data.iSeed) % (EFeatMgrSWIEnd + 1);//EFeatMgrSWIEnd - the last server message number (without resource checking IPCs)) for(TInt i=0;i