diff -r 25fce757be94 -r e02eb84a14d2 usbservices_plat/usb_personality_plugin_api/tsrc/usbpersonalitypluginapitest/src/UsbPersonalityPluginTest.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbservices_plat/usb_personality_plugin_api/tsrc/usbpersonalitypluginapitest/src/UsbPersonalityPluginTest.cpp	Wed Sep 01 12:20:49 2010 +0100
@@ -0,0 +1,326 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+// INCLUDE FILES
+#include <Stiftestinterface.h>
+#include "UsbPersonalityPluginTest.h"
+#include <SettingServerClient.h>
+#include "testdebug.h"
+
+// EXTERNAL DATA STRUCTURES
+
+// EXTERNAL FUNCTION PROTOTYPES  
+
+// CONSTANTS
+
+// MACROS
+
+// LOCAL CONSTANTS AND MACROS
+
+// MODULE DATA STRUCTURES
+
+// LOCAL FUNCTION PROTOTYPES
+
+// FORWARD DECLARATIONS
+
+// ============================= LOCAL FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CUsbPersonalityPluginTest::CUsbPersonalityPluginTest
+// C++ default constructor can NOT contain any code, that
+// might leave.
+// -----------------------------------------------------------------------------
+//
+CUsbPersonalityPluginTest::CUsbPersonalityPluginTest( 
+    CTestModuleIf& aTestModuleIf ):
+        CScriptBase( aTestModuleIf )
+    {
+    }
+
+// -----------------------------------------------------------------------------
+// CUsbPersonalityPluginTest::ConstructL
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CUsbPersonalityPluginTest::ConstructL()
+    {
+    //Read logger settings to check whether test case name is to be
+    //appended to log file name.
+    RSettingServer settingServer;
+    TInt ret = settingServer.Connect();
+    if(ret != KErrNone)
+        {
+        User::Leave(ret);
+        }
+    // Struct to StifLogger settigs.
+    TLoggerSettings loggerSettings; 
+    // Parse StifLogger defaults from STIF initialization file.
+    ret = settingServer.GetLoggerSettings( loggerSettings );
+    if( ret != KErrNone )
+        {
+        User::Leave( ret );
+        } 
+    // Close Setting server session
+    settingServer.Close();
+
+    TFileName logFileName;
+    
+    if( loggerSettings.iAddTestCaseTitle )
+        {
+        TName title;
+        TestModuleIf().GetTestCaseTitleL( title );
+        logFileName.Format( KUsbPersonalityPluginTestLogFileWithTitle, &title );
+        }
+    else
+        {
+        logFileName.Copy( KUsbPersonalityPluginTestLogFile );
+        }
+
+    iLog = CStifLogger::NewL( KUsbPersonalityPluginTestLogPath, 
+                          logFileName,
+                          CStifLogger::ETxt,
+                          CStifLogger::EFile,
+                          EFalse );
+    
+    SendTestClassVersion();
+    TestConstructL();
+    }
+
+// -----------------------------------------------------------------------------
+// CUsbPersonalityPluginTest::NewL
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+CUsbPersonalityPluginTest* CUsbPersonalityPluginTest::NewL( 
+    CTestModuleIf& aTestModuleIf )
+    {
+    CUsbPersonalityPluginTest* self = new (ELeave) CUsbPersonalityPluginTest( aTestModuleIf );
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop();
+    return self;
+    }
+
+// Destructor
+CUsbPersonalityPluginTest::~CUsbPersonalityPluginTest()
+    { 
+
+    // Delete resources allocated from test methods
+    TestDelete();
+
+    // Delete logger
+    delete iLog; 
+
+    }
+
+// -----------------------------------------------------------------------------
+// CUsbPersonalityPluginTest::RunMethodL
+// Run specified method. Contains also table of test mothods and their names.
+// -----------------------------------------------------------------------------
+
+TInt CUsbPersonalityPluginTest::RunMethodL( 
+    CStifItemParser& aItem ) 
+    {
+    return ExecuteTestBlock( aItem );
+    }
+
+// -----------------------------------------------------------------------------
+// CUsbPersonalityPluginTest::ExecuteTestBlock
+// -----------------------------------------------------------------------------
+
+TInt CUsbPersonalityPluginTest::ExecuteTestBlock( CStifItemParser& aItem )
+    {
+    TRACE_FUNC_ENTRY
+    iItem = &aItem;    
+    TInt res;
+    TUsbPersonalityPluginTestResult testResult;
+    
+    res = iItem -> GetString( _L( "tester" ), iTestBlockParams.iTestBlockName );
+    if ( res != KErrNone )
+        {
+        TRACE_INFO( "Getting test block name failed with: %d", res )
+        TRACE_FUNC_EXIT
+        return res;
+        }
+    TRACE_INFO( "Test block name: %S", &iTestBlockParams.iTestBlockName )
+    
+    TRACE( "Extracting test block parameters..." )
+    TRAP( res, TestBlocksInfoL() );
+    if ( res != KErrNone )
+        {
+        TRACE_INFO( "Extracting parameters failed: %d", res )
+        TRACE_FUNC_EXIT
+        return res;
+        }
+    if ( !iTestBlockFound )
+        {
+        TRACE( "Test block not found!" )
+        TRACE_FUNC_EXIT
+        return KErrNotFound;
+        }    
+    TRACE( "Extracting parameters successful" )
+    
+    TRAP( res, ( this ->*iTestBlockFunction )( iTestBlockParams, testResult ) );
+    if ( res != KErrNone )
+        {
+        TRACE_INFO( "ExecuteTestBlockL error: %d", res )
+        TRACE_FUNC_EXIT
+        return res;
+        }
+    
+    STIF_ASSERT_EQUALS( ETestCasePassed, testResult );
+    TRACE( "Test block passed!" );
+    TRACE_FUNC_EXIT 
+    return KErrNone;
+    } 
+
+// -----------------------------------------------------------------------------
+// CUsbPersonalityPluginTest::GetTestBlockParamL
+// -----------------------------------------------------------------------------
+
+void CUsbPersonalityPluginTest::GetTestBlockParamL( TGetTestBlockParamOperation aOperation, TTestBlockParamName aParamName )
+    {    
+    switch( aOperation )
+        {
+        case eGetString:
+            {
+            switch ( aParamName )
+                {
+                case eTestOption1:
+                    {
+                    User::LeaveIfError( iItem -> GetNextString( iTestBlockParams.iTestOption1 ) );
+                    break;
+                    }
+                case eTestOption2:
+                    {
+                    User::LeaveIfError( iItem -> GetNextString( iTestBlockParams.iTestOption2 ) );
+                    break;
+                    }
+                case eTestOption3:
+                    {
+                    User::LeaveIfError( iItem -> GetNextString( iTestBlockParams.iTestOption3 ) );
+                    break;
+                    }
+                default:
+                    {
+                    User::Leave( KErrArgument );
+                    break;
+                    }
+                }
+            break;
+            }
+        case eGetInt:
+            {
+            switch ( aParamName )
+                {
+                case eTestIntOption1:
+                    {
+                    User::LeaveIfError( iItem -> GetNextInt( iTestBlockParams.iTestIntOption1 ) );
+                    break;
+                    }
+                case eTestIntOption2:
+                    {
+                    User::LeaveIfError( iItem -> GetNextInt( iTestBlockParams.iTestIntOption2 ) );
+                    break;
+                    }
+                case eTestIntOption3:
+                    {
+                    User::LeaveIfError( iItem -> GetNextInt( iTestBlockParams.iTestIntOption3 ) );
+                    break;
+                    }
+                default:
+                    {
+                    User::Leave( KErrArgument );
+                    break;
+                    }
+                }
+            break;
+            }
+        case eGetChar:            
+            {
+            switch ( aParamName )
+                {
+                case eTestCharOption1:
+                    {
+                    User::LeaveIfError( iItem -> GetNextChar( iTestBlockParams.iTestCharOption1 ) );
+                    break;
+                    }
+                case eTestCharOption2:
+                    {
+                    User::LeaveIfError( iItem -> GetNextChar( iTestBlockParams.iTestCharOption2 ) );
+                    break;
+                    }
+                case eTestCharOption3:
+                    {
+                    User::LeaveIfError( iItem -> GetNextChar( iTestBlockParams.iTestCharOption3 ) );
+                    break;
+                    }
+                default:
+                    {
+                    User::Leave( KErrArgument );
+                    }
+                }
+            break;
+            }
+        default:
+            {
+            User::Leave( KErrArgument );
+            }
+        }
+    }
+
+//-----------------------------------------------------------------------------
+// CUsbPersonalityPluginTest::SendTestClassVersion
+// Method used to send version of test class
+//-----------------------------------------------------------------------------
+//
+void CUsbPersonalityPluginTest::SendTestClassVersion()
+	{
+	TVersion moduleVersion;
+	moduleVersion.iMajor = TEST_CLASS_VERSION_MAJOR;
+	moduleVersion.iMinor = TEST_CLASS_VERSION_MINOR;
+	moduleVersion.iBuild = TEST_CLASS_VERSION_BUILD;
+	
+	TFileName moduleName;
+	moduleName = _L("UsbPersonalityPluginTest.dll");
+
+	TBool newVersionOfMethod = ETrue;
+	TestModuleIf().SendTestModuleVersion(moduleVersion, moduleName, newVersionOfMethod);
+	}
+
+// ========================== OTHER EXPORTED FUNCTIONS =========================
+
+// -----------------------------------------------------------------------------
+// LibEntryL is a polymorphic Dll entry point.
+// Returns: CScriptBase: New CScriptBase derived object
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CScriptBase* LibEntryL( 
+    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
+    {
+
+    return ( CScriptBase* ) CUsbPersonalityPluginTest::NewL( aTestModuleIf );
+
+    }
+
+
+//  End of File