--- a/kerneltest/e32test/usbho/t_usbdi/src/TestCaseFactory.cpp	Wed Aug 18 11:08:29 2010 +0300
+++ b/kerneltest/e32test/usbho/t_usbdi/src/TestCaseFactory.cpp	Thu Sep 02 21:54:16 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"
@@ -18,6 +18,10 @@
 
 #include "TestCaseFactory.h"
 #include "testdevicebase.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "TestCaseFactoryTraces.h"
+#endif
 #include <e32debug.h>
 
 namespace NUnitTesting_USBDI
@@ -25,23 +29,29 @@
 	
 RTestFactory& RTestFactory::Instance()
 	{
+	OstTraceFunctionEntry1( RTESTFACTORY_INSTANCE_ENTRY, 0 );
 	static RTestFactory singleton;
+	OstTraceFunctionExitExt( RTESTFACTORY_INSTANCE_EXIT, 0, ( TUint )&( singleton ) );
 	return singleton;
 	}
 	
 RTestFactory::~RTestFactory()
 	{
+	OstTraceFunctionEntry1( RTESTFACTORY_RTESTFACTORY_ENTRY, this );
+	OstTraceFunctionExit1( RTESTFACTORY_RTESTFACTORY_EXIT, this );
 	}
 	
 	
 RTestFactory::RTestFactory()
 :	iTestCases(TStringIdentity::Hash,TStringIdentity::Id)
 	{
+	OstTraceFunctionEntry1( RTESTFACTORY_RTESTFACTORY_ENTRY_DUP01, this );
+	OstTraceFunctionExit1( RTESTFACTORY_RTESTFACTORY_EXIT_DUP01, this );
 	}
 	
 void RTestFactory::RegisterTestCase(const TDesC& aTestCaseId,TBaseTestCaseFunctor const* aFunctor)
 	{
-	LOG_CFUNC
+    OstTraceFunctionEntryExt( RTESTFACTORY_REGISTERTESTCASE_ENTRY, 0 );
 
 	LOG_INFO((_L("Registering test case '%S'"),&aTestCaseId))
 	
@@ -50,14 +60,15 @@
 	if(err != KErrNone)
 		{
 		// Log that a test case could not be registered due to err
-		RDebug::Printf("Test case '%S' could not be registered with test case factory",&aTestCaseId);
+		OstTraceExt1(TRACE_NORMAL, RTESTFACTORY_REGISTERTESTCASE, "Test case '%S' could not be registered with test case factory",aTestCaseId);
 		}
+	OstTraceFunctionExit1( RTESTFACTORY_REGISTERTESTCASE_EXIT, 0 );
 	}
 
 
 CBaseTestCase* RTestFactory::CreateTestCaseL(const TDesC& aTestCaseId,TBool aHostRole)
 	{
-	LOG_CFUNC
+	OstTraceFunctionEntryExt( RTESTFACTORY_CREATETESTCASEL_ENTRY, 0 );
 	
 	TStringIdentity key(aTestCaseId);
 	const TBaseTestCaseFunctor& functor = *(*Instance().iTestCases.Find(key));
@@ -67,18 +78,19 @@
 
 void RTestFactory::ListRegisteredTestCases()
 	{
-	LOG_CFUNC
+	OstTraceFunctionEntry1( RTESTFACTORY_LISTREGISTEREDTESTCASES_ENTRY, 0 );
 	RFactoryMap::TIter it(Instance().iTestCases);
 	
-	RDebug::Printf("-------- F A C T O R Y ---------");
+	OstTrace0(TRACE_NORMAL, RTESTFACTORY_LISTREGISTEREDTESTCASES, "-------- F A C T O R Y ---------");
 	
 	TInt count(0);
 	for(count=0; count<Instance().iTestCases.Count(); count++)
 		{
-		RDebug::Printf("%d: %S",count,it.NextKey());
+		OstTrace1(TRACE_NORMAL, RTESTFACTORY_LISTREGISTEREDTESTCASES_DUP01, "%d",count);
 		}
 	
-	RDebug::Printf("--------------------------------");
+	OstTrace0(TRACE_NORMAL, RTESTFACTORY_LISTREGISTEREDTESTCASES_DUP02, "--------------------------------");
+	OstTraceFunctionExit1( RTESTFACTORY_LISTREGISTEREDTESTCASES_EXIT, 0 );
 	}
 
 	}