FCL/sf/os/kernelhwsrv: comparison kerneltest/f32test/shostmassstorage/msman/test/t

equal deleted inserted replaced

-:94f2adf59133
+:b2826f67641f
-// 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 the License "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include "cblockdevicetester.h"
 #include "cmsdrive.h"
 #include "tmsprintdrive.h"
 #include "ttestutils.h"
-#include "tmslog.h"
 extern CMsDrive* msDrive;
 RTest test(_L("T_MSBOT"));
 RFs fsSession;
 CTestBot* CTestBot::NewL()
 {
-__MSFNSLOG
+CTestBot* r = new (ELeave) CTestBot();
-	CTestBot* r = new (ELeave) CTestBot();
+CleanupStack::PushL(r);
-	CleanupStack::PushL(r);
+r->ConstructL();
-	r->ConstructL();
+CleanupStack::Pop();
-	CleanupStack::Pop();
+return r;
-	return r;
 }
 void CTestBot::ConstructL()
 {
-__MSFNLOG
 TInt driveNumber = msDrive->DriveNumber();
 iBotTester = CBotTester::NewL(driveNumber);
 }
 CTestBot::CTestBot()
 {
-__MSFNLOG
 }
 CTestBot::~CTestBot()
 {
-__MSFNLOG
 delete iBotTester;
 }
 /**
 USB Mass Storage Class Bulk-Only Transport
 @param aTestCase
 @param testName
 */
 void CTestBot::CswResetRecovery(CBotTester::TTestCase aTestCase, const TDesC& aTestName)
 {
-__MSFNLOG
 TInt res;
 test.Start(aTestName);
 RMassStoragePublisher msPublisher(RMassStoragePublisher::KBotResetProperty);
 }
 void CTestBot::NoDataResetRecovery(CBotTester::TTestCase aTestCase, const TDesC& aTestName)
 {
-__MSFNLOG
 TInt res;
 test.Start(aTestName);
 RMassStoragePublisher msPublisher(RMassStoragePublisher::KBotResetProperty);
 }
 void CTestBot::NoDataClearStall(CBotTester::TTestCase aTestCase, const TDesC& aTestName)
 {
-__MSFNLOG
 TInt res;
 test.Start(aTestName);
 RMassStoragePublisher msPublisher(RMassStoragePublisher::KStallProperty);
 }
 void CTestBot::DataOutClearStall(CBotTester::TTestCase aTestCase, const TDesC& aTestName)
 {
-__MSFNLOG
 TInt res;
 test.Start(aTestName);
 RMassStoragePublisher msPublisher(RMassStoragePublisher::KStallProperty);
 }
 void CTestBot::DataInClearStall(CBotTester::TTestCase aTestCase, const TDesC& aTestName)
 {
-__MSFNLOG
 TInt res;
 test.Start(aTestName);
 RMassStoragePublisher msPublisher(RMassStoragePublisher::KStallProperty);
 2. CSW is not valid
 3. Host shall perform a Reset Recovery
 */
 void CTestBot::tTagMismatch()
 {
-__MSFNLOG
 CswResetRecovery(CBotTester::ETestCaseTagMismatch, KTagMismatch);
 }
 /**
 2. CSW is not valid.
 3. Host shall perform a Reset Recovery.
 */
 void CTestBot::tInvalidSignature()
 {
-__MSFNLOG
 CswResetRecovery(CBotTester::ETestCaseInvalidSignature, KInvalidSignature);
 }
 /**
 2. Host shall clear the Bulk-In pipe.
 3. Host shall attempt to receive the CSW again.
 */
 void CTestBot::tNoDataStallCsw()
 {
-__MSFNLOG
 NoDataClearStall(CBotTester::ETestCaseNoDataStallCsw, KNoDataStallCsw);
 }
 /**
 Hn CSW Phase Error status
 1. Host expect no data transfer and CSW status = 02h (Phase Error.
 2. Host shall peroform a reset recovery.
 */
 void CTestBot::tNoDataPhaseError()
 {
-__MSFNLOG
 NoDataResetRecovery(CBotTester::ETestCaseNoDataPhaseError, KNoDataPhaseError);
 }
 void CTestBot::tDoStallCsw()
 {
-__MSFNLOG
 DataOutClearStall(CBotTester::ETestCaseDoStallCsw, KDoStallCsw);
 }
 void CTestBot::tDoStallData()
 {
-__MSFNLOG
 DataOutClearStall(CBotTester::ETestCaseDoStallData, KDoStallData);
 }
 void CTestBot::tDoPhaseError()
 {
-__MSFNLOG
 CswResetRecovery(CBotTester::ETestCaseDoPhaseError, KDoPhaseError);
 }
 void CTestBot::tDoResidue()
 {
-__MSFNLOG
 TInt res;
 test.Start(KDoResidue);
 res = iBotTester->SetTest(CBotTester::ETestCaseDoResidue);
 test_KErrNone(res);
 res = iBotTester->WriteEnableFile();
 }
 void CTestBot::tDiStallCsw()
 {
-__MSFNLOG
 DataInClearStall(CBotTester::ETestCaseDiStallCsw, KDiStallCsw);
 }
 void CTestBot::tDiStallData()
 {
-__MSFNLOG
 DataInClearStall(CBotTester::ETestCaseDiStallData, KDiStallData);
 }
 void CTestBot::tDiPhaseError()
 {
-__MSFNLOG
 CswResetRecovery(CBotTester::ETestCaseDiPhaseError, KDiPhaseError);
 }
 void CTestBot::tDiResidue()
 {
-__MSFNLOG
 TInt res;
 test.Start(KDiResidue);
 // First write test file to drive
 res = iBotTester->InitReadEnableFile();

changeset 297	b2826f67641f
parent 0	a41df078684a