diff -r a179b74831c9 -r c1f20ce4abcf kerneltest/e32test/usbho/t_otgdi/src/testcase0671.cpp --- a/kerneltest/e32test/usbho/t_otgdi/src/testcase0671.cpp Thu Aug 19 11:14:22 2010 +0300 +++ b/kerneltest/e32test/usbho/t_otgdi/src/testcase0671.cpp Tue Aug 31 16:34:26 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of the License "Eclipse Public License v1.0" @@ -24,6 +24,10 @@ #include "testcaseroot.h" #include "testcasewd.h" #include "testcase0671.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "testcase0671Traces.h" +#endif @@ -34,7 +38,10 @@ CTestCase0671* CTestCase0671::NewL(TBool aHost) { - LOG_FUNC + if(gVerboseOutput) + { + OstTraceFunctionEntry0(CTESTCASE0671_NEWL); + } CTestCase0671* self = new (ELeave) CTestCase0671(aHost); CleanupStack::PushL(self); self->ConstructL(); @@ -46,7 +53,10 @@ CTestCase0671::CTestCase0671(TBool aHost) : CTestCaseRoot(KTestCaseId, aHost) { - LOG_FUNC + if(gVerboseOutput) + { + OstTraceFunctionEntry0(CTESTCASE0671_CTESTCASE0671); + } } @@ -82,7 +92,10 @@ void CTestCase0671::DoCancel() { - LOG_FUNC + if(gVerboseOutput) + { + OstTraceFunctionEntry0(CTESTCASE0671_DOCANCEL); + } // cancel our timer iTimer.Cancel(); @@ -110,19 +123,29 @@ { // H4 width **************************** test.Printf(_L("***************************\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_DESCRIBEPRECONDITIONS, "***************************\n"); test.Printf(_L("* This test uses a Mini-A *\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_DESCRIBEPRECONDITIONS_DUP01, "* This test uses a Mini-A *\n"); test.Printf(_L("* to Mini-B cable to link *\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_DESCRIBEPRECONDITIONS_DUP02, "* to Mini-B cable to link *\n"); test.Printf(_L("* the H4 board to the OPT *\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_DESCRIBEPRECONDITIONS_DUP03, "* the H4 board to the OPT *\n"); test.Printf(_L("* and makes use of the *\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_DESCRIBEPRECONDITIONS_DUP04, "* and makes use of the *\n"); test.Printf(_L("* USB OPT test code *\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_DESCRIBEPRECONDITIONS_DUP05, "* USB OPT test code *\n"); test.Printf(_L("***************************\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_DESCRIBEPRECONDITIONS_DUP06, "***************************\n"); } // handle event completion void CTestCase0671::RunStepL() { - LOG_FUNC + if(gVerboseOutput) + { + OstTraceFunctionEntry0(CTESTCASE0671_RUNSTEPL); + } // Obtain the completion code for this CActive obj. TInt completionCode(iStatus.Int()); TBuf aDescription; @@ -155,9 +178,13 @@ case EConnectAtoB: // H4 width **************************** test.Printf(_L("\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_RUNSTEPL_DUP01, "\n"); test.Printf(_L("***********************\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_RUNSTEPL_DUP02, "***********************\n"); test.Printf(_L("Connect H4(B) to OPT(A)\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_RUNSTEPL_DUP03, "Connect H4(Bto OPT(A)\n"); test.Printf(KPressAnyKeyToContinue); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_RUNSTEPL_DUP04, KPressAnyKeyToContinue); iCaseStep = EStartOptTD5_5; RequestCharacter(); @@ -166,10 +193,15 @@ case EStartOptTD5_5: // H4 width **************************** test.Printf(_L("On the OPT, select:\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_RUNSTEPL_DUP05, "On the OPT, select:\n"); test.Printf(_L(" Certified FS-B-UUT Test\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_RUNSTEPL_DUP06, " Certified FS-B-UUT Test\n"); test.Printf(_L(" Test TD.5.5\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_RUNSTEPL_DUP07, " Test TD.5.5\n"); test.Printf(_L(" And then Click 'Run' ")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_RUNSTEPL_DUP08, " And then Click 'Run' "); test.Printf(_L(" When test starts, press any key")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_RUNSTEPL_DUP09, " When test starts, press any key"); iCaseStep = EPromptYOpt5_5; RequestCharacter(); break; @@ -177,6 +209,7 @@ case EPromptYOpt5_5: iCaseStep = EConfirmOpt5_5; test.Printf(_L("Did it PASS (Y/N)?")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_RUNSTEPL_DUP10, "Did it PASS (Y/N?"); RequestCharacter(); // 30 seconds for user input iWDTimer->IssueRequest(KDelayDurationForTest4_5, this, &CancelKB); break; @@ -223,6 +256,7 @@ default: test.Printf(_L(" unknown test step")); + OstTrace0(TRACE_NORMAL, CTESTCASE0671_RUNSTEPL_DUP11, " unknown test step"); Cancel(); return (TestFailed(KErrCorrupt, _L(" unknown test step"))); }