diff -r a179b74831c9 -r c1f20ce4abcf kerneltest/e32test/usbho/t_otgdi/src/testcase0456.cpp --- a/kerneltest/e32test/usbho/t_otgdi/src/testcase0456.cpp Thu Aug 19 11:14:22 2010 +0300 +++ b/kerneltest/e32test/usbho/t_otgdi/src/testcase0456.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" @@ -26,6 +26,10 @@ #include "testcaseroot.h" #include "testcasefactory.h" #include "testcase0456.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "testcase0456Traces.h" +#endif @@ -38,7 +42,10 @@ CTestCase0456* CTestCase0456::NewL(TBool aHost) { - LOG_FUNC + if(gVerboseOutput) + { + OstTraceFunctionEntry0(CTESTCASE0456_NEWL); + } CTestCase0456* self = new (ELeave) CTestCase0456(aHost); CleanupStack::PushL(self); self->ConstructL(); @@ -50,7 +57,10 @@ CTestCase0456::CTestCase0456(TBool aHost) : CTestCaseRoot(KTestCaseId, aHost) { - LOG_FUNC + if(gVerboseOutput) + { + OstTraceFunctionEntry0(CTESTCASE0456_CTESTCASE0456); + } } @@ -59,7 +69,10 @@ */ void CTestCase0456::ConstructL() { - LOG_FUNC + if(gVerboseOutput) + { + OstTraceFunctionEntry0(CTESTCASE0456_CONSTRUCTL); + } iRepeats = OPEN_REPEATS; BaseConstructL(); @@ -68,7 +81,10 @@ CTestCase0456::~CTestCase0456() { - LOG_FUNC + if(gVerboseOutput) + { + OstTraceFunctionEntry0(CTESTCASE0456_DCTESTCASE0456); + } Cancel(); } @@ -76,7 +92,10 @@ void CTestCase0456::ExecuteTestCaseL() { - LOG_FUNC + if(gVerboseOutput) + { + OstTraceFunctionEntry0(CTESTCASE0456_EXECUTETESTCASEL); + } iCaseStep = EPreconditions; CActiveScheduler::Add(this); @@ -87,12 +106,16 @@ void CTestCase0456::DescribePreconditions() { test.Printf(_L("Insert A connector beforehand.\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0456_DESCRIBEPRECONDITIONS, "Insert A connector beforehand.\n"); } void CTestCase0456::DoCancel() { - LOG_FUNC + if(gVerboseOutput) + { + OstTraceFunctionEntry0(CTESTCASE0456_DOCANCEL); + } // cancel our timer iTimer.Cancel(); @@ -102,7 +125,10 @@ // handle event completion void CTestCase0456::RunStepL() { - LOG_FUNC + if(gVerboseOutput) + { + OstTraceFunctionEntry0(CTESTCASE0456_RUNSTEPL); + } // Obtain the completion code for this CActive obj. TInt completionCode(iStatus.Int()); @@ -112,6 +138,7 @@ case EPreconditions: { test.Printf(KPressAnyKeyToStart); + OstTrace0(TRACE_NORMAL, CTESTCASE0456_RUNSTEPL_DUP01, KPressAnyKeyToStart); iCaseStep = ELoadLdd; RequestCharacter(); break; @@ -120,6 +147,7 @@ case ELoadLdd: test.Printf(_L("Load the LDD iteration %d/%d\n"), OPEN_REPEATS-iRepeats+1, OPEN_REPEATS); + OstTraceExt2(TRACE_NORMAL, CTESTCASE0456_RUNSTEPL_DUP02, "Load the LDD iteration %d/%d\n", OPEN_REPEATS-iRepeats+1, OPEN_REPEATS); if (!StepLoadLDD()) { break; @@ -138,6 +166,7 @@ case ELoopDecrement: test.Printf(_L("Repeat test\n")); + OstTrace0(TRACE_NORMAL, CTESTCASE0456_RUNSTEPL_DUP03, "Repeat test\n"); if (--iRepeats) iCaseStep = ELoadLdd; @@ -154,6 +183,7 @@ default: test.Printf(_L(" unknown test step")); + OstTrace0(TRACE_NORMAL, CTESTCASE0456_RUNSTEPL_DUP04, " unknown test step"); Cancel(); TestPolicy().SignalTestComplete(KErrCorrupt); break;