--- a/kerneltest/e32test/usbho/t_otgdi/src/testcase0456.cpp Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/e32test/usbho/t_otgdi/src/testcase0456.cpp Wed Sep 01 12:34:56 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2009 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,10 +26,6 @@
#include "testcaseroot.h"
#include "testcasefactory.h"
#include "testcase0456.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "testcase0456Traces.h"
-#endif
@@ -42,10 +38,7 @@
CTestCase0456* CTestCase0456::NewL(TBool aHost)
{
- if(gVerboseOutput)
- {
- OstTraceFunctionEntry0(CTESTCASE0456_NEWL);
- }
+ LOG_FUNC
CTestCase0456* self = new (ELeave) CTestCase0456(aHost);
CleanupStack::PushL(self);
self->ConstructL();
@@ -57,10 +50,7 @@
CTestCase0456::CTestCase0456(TBool aHost)
: CTestCaseRoot(KTestCaseId, aHost)
{
- if(gVerboseOutput)
- {
- OstTraceFunctionEntry0(CTESTCASE0456_CTESTCASE0456);
- }
+ LOG_FUNC
}
@@ -69,10 +59,7 @@
*/
void CTestCase0456::ConstructL()
{
- if(gVerboseOutput)
- {
- OstTraceFunctionEntry0(CTESTCASE0456_CONSTRUCTL);
- }
+ LOG_FUNC
iRepeats = OPEN_REPEATS;
BaseConstructL();
@@ -81,10 +68,7 @@
CTestCase0456::~CTestCase0456()
{
- if(gVerboseOutput)
- {
- OstTraceFunctionEntry0(CTESTCASE0456_DCTESTCASE0456);
- }
+ LOG_FUNC
Cancel();
}
@@ -92,10 +76,7 @@
void CTestCase0456::ExecuteTestCaseL()
{
- if(gVerboseOutput)
- {
- OstTraceFunctionEntry0(CTESTCASE0456_EXECUTETESTCASEL);
- }
+ LOG_FUNC
iCaseStep = EPreconditions;
CActiveScheduler::Add(this);
@@ -106,16 +87,12 @@
void CTestCase0456::DescribePreconditions()
{
test.Printf(_L("Insert A connector beforehand.\n"));
- OstTrace0(TRACE_NORMAL, CTESTCASE0456_DESCRIBEPRECONDITIONS, "Insert A connector beforehand.\n");
}
void CTestCase0456::DoCancel()
{
- if(gVerboseOutput)
- {
- OstTraceFunctionEntry0(CTESTCASE0456_DOCANCEL);
- }
+ LOG_FUNC
// cancel our timer
iTimer.Cancel();
@@ -125,10 +102,7 @@
// handle event completion
void CTestCase0456::RunStepL()
{
- if(gVerboseOutput)
- {
- OstTraceFunctionEntry0(CTESTCASE0456_RUNSTEPL);
- }
+ LOG_FUNC
// Obtain the completion code for this CActive obj.
TInt completionCode(iStatus.Int());
@@ -138,7 +112,6 @@
case EPreconditions:
{
test.Printf(KPressAnyKeyToStart);
- OstTrace0(TRACE_NORMAL, CTESTCASE0456_RUNSTEPL_DUP01, KPressAnyKeyToStart);
iCaseStep = ELoadLdd;
RequestCharacter();
break;
@@ -147,7 +120,6 @@
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;
@@ -166,7 +138,6 @@
case ELoopDecrement:
test.Printf(_L("Repeat test\n"));
- OstTrace0(TRACE_NORMAL, CTESTCASE0456_RUNSTEPL_DUP03, "Repeat test\n");
if (--iRepeats)
iCaseStep = ELoadLdd;
@@ -183,7 +154,6 @@
default:
test.Printf(_L("<Error> unknown test step"));
- OstTrace0(TRACE_NORMAL, CTESTCASE0456_RUNSTEPL_DUP04, "<Error> unknown test step");
Cancel();
TestPolicy().SignalTestComplete(KErrCorrupt);
break;