# HG changeset patch # User hgs # Date 1282591146 -3600 # Node ID 5accba95f577e17bb4b2498d4707014e25bcd241 # Parent e358f888b1fe2d3c3a94e92303a8136101b92033 2010wk29_03 diff -r e358f888b1fe -r 5accba95f577 devsound/devsoundrefplugin/src/sounddevice/DevSoundUtility.cpp --- a/devsound/devsoundrefplugin/src/sounddevice/DevSoundUtility.cpp Mon Aug 23 19:57:49 2010 +0100 +++ b/devsound/devsoundrefplugin/src/sounddevice/DevSoundUtility.cpp Mon Aug 23 20:19:06 2010 +0100 @@ -11,14 +11,7 @@ // Contributors: // // Description: -// MMF\SoundDev\src\SoundDevice\DevSoundUtility.cpp -// File: DevSoundUtility.cpp -// Author: Vasudevan Ramachandraiah -// Date: July 16, 2002 // Class that provides API to list ECOM plugin implementation IDs -// (c) Nokia Inc. -// Revisions: -// Date: Author Description // // diff -r e358f888b1fe -r 5accba95f577 mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/test3gp.dcf diff -r e358f888b1fe -r 5accba95f577 mm_pub/drm_audio_player_api/tsrc/data/mmc/drm/testmp3.dcf diff -r e358f888b1fe -r 5accba95f577 mmdevicefw/mdfunittest/codecapi/omx/pcmcodec/src/OmxPCMCodec.cpp --- a/mmdevicefw/mdfunittest/codecapi/omx/pcmcodec/src/OmxPCMCodec.cpp Mon Aug 23 19:57:49 2010 +0100 +++ b/mmdevicefw/mdfunittest/codecapi/omx/pcmcodec/src/OmxPCMCodec.cpp Mon Aug 23 20:19:06 2010 +0100 @@ -448,7 +448,6 @@ // request notification of further queue events iQueueStatus = KRequestPending; iMessageQueue.NotifyDataAvailable(iQueueStatus); - //TBool lastBuffer=EFalse; TODO UNUSED! } } @@ -612,7 +611,6 @@ iCurrentCodec->Convert(&srcBuffer->pBuffer[iInputBufferPos], &destBuffer->pBuffer[destBufferPos], samplesToConvert); iInputBufferPos = 0; // finished buffer - so reset inputSamplesRequired -= availableSamples; -// TInt filled = availableSamples; TODO UNUSED destBuffer->nFilledLen = (TInt)((TReal)availableSamples * iOutputSamplesPerInputSample); srcBuffer->nFilledLen = 0; iBuffersToEmpty.Remove(0); diff -r e358f888b1fe -r 5accba95f577 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/TSU_MMF_DEVSOUND_SUITE.iby --- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/TSU_MMF_DEVSOUND_SUITE.iby Mon Aug 23 19:57:49 2010 +0100 +++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/TSU_MMF_DEVSOUND_SUITE.iby Mon Aug 23 20:19:06 2010 +0100 @@ -43,12 +43,21 @@ data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_DEVSOUND_SUITE_debug.script \TSU_MMF_DEVSOUND_SUITE_debug.script data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_DEVSOUND_SUITE_Alloc.script \TSU_MMF_DEVSOUND_SUITE_Alloc.script -data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.script \TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.script + #ifndef SYMBIAN_MULTIMEDIA_A3FDEVSOUND data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_DEVSOUND_SUITE_PREEMPTION.script \TSU_MMF_DEVSOUND_SUITE_PREEMPTION.script #endif // SYMBIAN_MULTIMEDIA_A3FDEVSOUND +#ifdef MM_TB101_L +// include specific TB10.1 (Sirocco) Tests +data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_DEVSOUND_NOTIFICATION_SUITE_notsupported.script \TSU_MMF_DEVSOUND_NOTIFICATION_SUITE_notsupported.script +#else +// include tests that would not run on TB10.1 branch (Pre TB10.1 HW ref tests) +data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_DEVSOUND_SUITE_debug_reference_HW.script \TSU_MMF_DEVSOUND_SUITE_debug_reference_HW.script +data=EPOCROOT##epoc32\data\c\mm\TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.script \TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.script +#endif + //REM Test files for DEVSOUND_SUITE tests ECOM_PLUGIN(tsu_mmf_devsound_testdevice.dll,101f9f50.rsc) data=EPOCROOT##epoc32\data\c\TSU_MMF_DEVSOUND_SUITE\Input\garbage.raw \TSU_MMF_DEVSOUND_SUITE\Input\garbage.raw diff -r e358f888b1fe -r 5accba95f577 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/bld.inf --- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/bld.inf Mon Aug 23 19:57:49 2010 +0100 +++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/bld.inf Mon Aug 23 20:19:06 2010 +0100 @@ -52,6 +52,8 @@ ../scripts/TSU_MMF_DEVSOUND_SUITE_NOCAP.script c:/mm/tsu_mmf_devsound_suite_nocap.script ../scripts/TSU_MMF_DEVSOUND_SUITE_MMDDCAP.script c:/mm/tsu_mmf_devsound_suite_mmddcap.script ../scripts/TSU_MMF_DEVSOUND_SUITE_UECAP.script c:/mm/tsu_mmf_devsound_suite_uecap.script +../scripts/TSU_MMF_DEVSOUND_SUITE_debug_reference_HW.script c:/mm/TSU_MMF_DEVSOUND_SUITE_debug_reference_HW.script +../scripts/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE_notsupported.script c:/mm/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE_notsupported.script // DEVSOUND data files ../TestFiles/PCM_08_16_m.raw c:/tsu_mmf_devsound_suite/input/pcm_08_16_m.raw diff -r e358f888b1fe -r 5accba95f577 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/devsoundtest_test.pkg --- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/devsoundtest_test.pkg Mon Aug 23 19:57:49 2010 +0100 +++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/group/devsoundtest_test.pkg Mon Aug 23 20:19:06 2010 +0100 @@ -48,7 +48,7 @@ "\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\DevSoundTest\scripts\TSU_MMF_DEVSOUND_SUITE_debug.script"-"c:\TSU_MMF_DEVSOUND_SUITE_debug.script" "\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\DevSoundTest\scripts\TSU_MMF_DEVSOUND_SUITE_Alloc.script"-"c:\TSU_MMF_DEVSOUND_SUITE_Alloc.script" -"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\DevSoundTest\scripts\TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.script"-"c:\TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.script" +"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\DevSoundTest\scripts\TSU_MMF_DEVSOUND_NOTIFICATION_SUITE_notsupported.script"-"c:\TSU_MMF_DEVSOUND_NOTIFICATION_SUITE_notsupported.script" //"\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\DevSoundTest\scripts\TSU_MMF_DEVSOUND_SUITE_PREEMPTION.script"-"c:\TSU_MMF_DEVSOUND_SUITE_PREEMPTION.script" "\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\DevSoundTest\scripts\TSU_MMF_SDEVSOUND_SUITE.script"-"c:\TSU_MMF_SDEVSOUND_SUITE.script" "\sf\os\mm\mmlibs\mmfw\tsrc\mmfunittest\DevSoundTest\scripts\TSU_MMF_DEVSOUND_SUITE_NOCAP.script"-"c:\TSU_MMF_DEVSOUND_SUITE_NOCAP.script" diff -r e358f888b1fe -r 5accba95f577 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/inc/TSU_MMF_DEVSOUND_NOTIFICATION_STEP.h --- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/inc/TSU_MMF_DEVSOUND_NOTIFICATION_STEP.h Mon Aug 23 19:57:49 2010 +0100 +++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/inc/TSU_MMF_DEVSOUND_NOTIFICATION_STEP.h Mon Aug 23 20:19:06 2010 +0100 @@ -717,4 +717,11 @@ TFixedArray iStateHandlers; }; +class CTestStepDevSound0051:public CTestStepDevSoundNotification + { +public: + CTestStepDevSound0051(); + TVerdict DoTestStepL(); + }; + #endif// __TSU_MMF_DEVSOUND_NOTIFICATION_STEP_H__ diff -r e358f888b1fe -r 5accba95f577 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE_notsupported.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE_notsupported.script Mon Aug 23 20:19:06 2010 +0100 @@ -0,0 +1,33 @@ +#!/bin/sh +# +# Script %name: TSU_MMF_DEVSOUND_NOTIFICATION_SUITE_notsupported.script % +# Instance: fa1sosd2_1 +# %version: 2 % +# Description: +# %created_by: jitrama % +# %date_created: Tue Jun 29 11:24:17 2010 % + +// Copyright (c) 2004-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: +// + + +LOAD_SUITE TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.dll + +delay 1000 + +//! @SYMTestCaseID MM-MMF-DEVSOUNDNOTIFICATION-U-0051-HP + +RUN_TEST_STEP -1, TSU_MMF_DEVSOUND_NOTIFICATION_SUITE, MM-MMF-DEVSOUNDNOTIFICATION-U-0051-HP +TEST_COMPLETE \ No newline at end of file diff -r e358f888b1fe -r 5accba95f577 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/TSU_MMF_DEVSOUND_SUITE_debug.script --- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/TSU_MMF_DEVSOUND_SUITE_debug.script Mon Aug 23 19:57:49 2010 +0100 +++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/TSU_MMF_DEVSOUND_SUITE_debug.script Mon Aug 23 20:19:06 2010 +0100 @@ -97,18 +97,7 @@ RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0018-HP TEST_COMPLETE -//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0019-HP -RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0019-HP -TEST_COMPLETE -//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0020-HP - -RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0020-HP -TEST_COMPLETE -//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0021-HP - -RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0021-HP -TEST_COMPLETE //! @SYMTestCaseID MM-MMF-DEVSOUND-U-0022-HP RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0022-HP @@ -137,14 +126,7 @@ RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0028-HP TEST_COMPLETE -//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0029-HP -RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0029-HP -TEST_COMPLETE -//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0030-HP - -RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0030-HP -TEST_COMPLETE //! @SYMTestCaseID MM-MMF-DEVSOUND-U-0031-HP RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0031-HP @@ -161,11 +143,6 @@ RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0034-HP TEST_COMPLETE -//Fix for DEF054803 -//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0060-HP - -RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0060-HP -TEST_COMPLETE //! @SYMTestCaseID MM-MMF-DEVSOUND-U-0101-HP @@ -187,21 +164,6 @@ RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0063-HP TEST_COMPLETE -//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0064-HP - -RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0064-HP -TEST_COMPLETE - -//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0073-HP - -RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0073-HP -TEST_COMPLETE - -//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0074-HP - -RUN_TEST_STEP 60000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0074-HP -TEST_COMPLETE - //! @SYMTestCaseID MM-MMF-DEVSOUND-U-0103-HP RUN_TEST_STEP 60000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0103-HP diff -r e358f888b1fe -r 5accba95f577 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/TSU_MMF_DEVSOUND_SUITE_debug_reference_HW.script --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/scripts/TSU_MMF_DEVSOUND_SUITE_debug_reference_HW.script Mon Aug 23 20:19:06 2010 +0100 @@ -0,0 +1,77 @@ +#!/bin/sh +# +# Script %name: TSU_MMF_DEVSOUND_SUITE_debug_reference_HW.script % +# Instance: fa1sosd2_2 +# %version: 2 % +# Description: +# %created_by: jitrama % +# %date_created: Thu Jun 24 17:08:28 2010 % + + +// Copyright (c) 2003-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: +// + + +PRINT +PRINT +PRINT IMPORTANT NOTE: THIS SUITE SHOULD ONLY BE RUN IN WINSCW UDEB and ARM UREL MODE due to PREQ1509 submission (DEF123715). +PRINT +PRINT + + +LOAD_SUITE TSU_MMF_DEVSOUND_SUITE.dll + +delay 1000 + +//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0019-HP + +RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0019-HP +TEST_COMPLETE +//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0020-HP + +RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0020-HP +TEST_COMPLETE +//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0021-HP + +RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0021-HP +TEST_COMPLETE +//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0029-HP + +RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0029-HP +TEST_COMPLETE +//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0030-HP + +RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0030-HP +TEST_COMPLETE +//Fix for DEF054803 +//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0060-HP + +RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0060-HP +TEST_COMPLETE + +//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0064-HP + +RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0064-HP +TEST_COMPLETE + +//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0073-HP + +RUN_TEST_STEP 15000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0073-HP +TEST_COMPLETE + +//! @SYMTestCaseID MM-MMF-DEVSOUND-U-0074-HP + +RUN_TEST_STEP 60000, TSU_MMF_DEVSOUND_SUITE, MM-MMF-DEVSOUND-U-0074-HP +TEST_COMPLETE diff -r e358f888b1fe -r 5accba95f577 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_NOTIFICATION_STEP.cpp --- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_NOTIFICATION_STEP.cpp Mon Aug 23 19:57:49 2010 +0100 +++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_NOTIFICATION_STEP.cpp Mon Aug 23 20:19:06 2010 +0100 @@ -4743,6 +4743,34 @@ /** * + * CTestStepDevSound0051 + * + */ +CTestStepDevSound0051::CTestStepDevSound0051() + { + iTestStepName = _L("MM-MMF-DEVSOUNDNOTIFICATION-U-0051-HP"); + } + +/** + * + * DoTestStepL + * @result TVerdict + * + */ +TVerdict CTestStepDevSound0051::DoTestStepL(void) + { + INFO_PRINTF1(_L("Testing Register for notification on Nokia adaption, KErrNotSupported will be returned")); + TVerdict result = EFail; + result = iDevSoundClient1->TestRegisterAsClient(KMMFEventCategoryAudioResourceAvailable); + if (result == EPass) + { + return EFail; + } + return EPass; + } + +/** + * * NewL * CEventNotification* * diff -r e358f888b1fe -r 5accba95f577 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.cpp --- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.cpp Mon Aug 23 19:57:49 2010 +0100 +++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_NOTIFICATION_SUITE.cpp Mon Aug 23 20:19:06 2010 +0100 @@ -117,5 +117,6 @@ AddTestStepL(new(ELeave) CTestStepDevSound0048()); AddTestStepL(new(ELeave) CTestStepDevSound0049()); AddTestStepL(new(ELeave) CTestStepDevSound0050()); + AddTestStepL(new(ELeave) CTestStepDevSound0051()); } diff -r e358f888b1fe -r 5accba95f577 mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_STEP.cpp --- a/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_STEP.cpp Mon Aug 23 19:57:49 2010 +0100 +++ b/mmlibs/mmfw/tsrc/mmfunittest/DevSoundTest/src/TSU_MMF_DEVSOUND_STEP.cpp Mon Aug 23 20:19:06 2010 +0100 @@ -285,7 +285,7 @@ { iCallbackError = KErrNone; iExpectedValue = KErrNone; - INFO_PRINTF1(_L("Initializing DevSound")); + INFO_PRINTF2(_L("Initializing DevSound aMode=%d"), aMode); ResetCallbacks(); // Initialize @@ -324,8 +324,8 @@ TVerdict CTestStepDevSound::TestInitialize(TUid aHwDeviceUid, TMMFState aMode) { iCallbackError = KErrNone; - iExpectedValue = KErrNone; - INFO_PRINTF1(_L("Initializing DevSound")); + + INFO_PRINTF3(_L("Initializing DevSound aHwDeviceUid=0x%x aMode=%d"), aHwDeviceUid, aMode); ResetCallbacks(); // Initialize @@ -375,8 +375,8 @@ TVerdict CTestStepDevSound::TestInitialize(TFourCC& aDataType, TMMFState aMode) { iCallbackError = KErrNone; - iExpectedValue = KErrNone; - INFO_PRINTF1(_L("Initializing DevSound")); + + INFO_PRINTF3(_L("Initializing DevSound aDataType=0x%x aMode=%d"), aDataType.FourCC(), aMode); ResetCallbacks(); // Initialize @@ -492,7 +492,7 @@ ResetCallbacks(); - INFO_PRINTF1(_L("Playing Simple Tone")); + INFO_PRINTF3(_L("Playing Simple Tone aFreq=%d aDur=%d"), aFreq, aDur.Int64()); TRAPD(err, iMMFDevSound->PlayToneL(aFreq, aDur)); if (err) { @@ -542,7 +542,7 @@ // Set request active iAL->InitialiseActiveListener(); - INFO_PRINTF1(_L("Playing DTMF String")); + INFO_PRINTF2(_L("Playing DTMF String %S"), &aDTMFString); TRAPD(err, iMMFDevSound->PlayDTMFStringL(aDTMFString)); // Start the active scheduler and catch the callback CActiveScheduler::Start(); @@ -935,6 +935,8 @@ */ TVerdict CTestStepDevSound::TestDigitalPlayback(TInt aNumSamples, TDesC& aFilename, TFourCC& aDataType) { + INFO_PRINTF4(_L("TestDigitalPlayback aNumSamples=%d aFilename=%S aDataType=0x%x"), aNumSamples, &aFilename, aDataType.FourCC()); + //Initialize TVerdict initOK = TestInitialize(aDataType, EMMFStatePlaying); if (initOK != EPass) @@ -1054,6 +1056,8 @@ */ TVerdict CTestStepDevSound::TestDigitalRecord(TInt aNumSamples, TDesC& aFilename, TFourCC& aDataType) { + INFO_PRINTF4(_L("TestDigitalRecord aNumSamples=%d aFilename=%S aDataType=0x%x"), aNumSamples, &aFilename, aDataType.FourCC()); + //Initialize TVerdict initOK = TestInitialize(aDataType, EMMFStateRecording); if (initOK != EPass) @@ -1605,8 +1609,8 @@ TVerdict CTestStepDevSoundInitializeFourCCPlay::DoTestStepL(void) { INFO_PRINTF1(_L("Testing Initialize with fourCC code Play")); - TFourCC pcm8(' ','P','U','8'); //use unsigned pcm8 fourcc code - return TestInitialize(pcm8, EMMFStatePlaying); + TFourCC pcm(' ','P','1','6'); //use pcm16 fourcc code + return TestInitialize(pcm, EMMFStatePlaying); } /** @@ -1678,8 +1682,8 @@ TVerdict CTestStepDevSoundInitializeFourCCRecord::DoTestStepL(void) { INFO_PRINTF1(_L("Testing Initialize with fourCC code Record")); - TFourCC pcm8(' ','P','U','8'); //use unsigned pcm8 fourcc code - return TestInitialize(pcm8, EMMFStateRecording); + TFourCC pcm(' ', 'P', '1', '6'); //use pcm16 fourcc code + return TestInitialize(pcm, EMMFStateRecording); } /** @@ -1914,9 +1918,9 @@ { return EInconclusive; } - iExpectedValue = KErrCorrupt; + //iExpectedValue = KErrCorrupt; //Return KErrUnderFlow by Nokia adaption TestPlayDTMFString(dtmfString); - if (iCallbackError != iExpectedValue) + if (iCallbackError == KErrNone) { return EFail; } @@ -1952,9 +1956,9 @@ return EInconclusive; } TestSetVolume(iMMFDevSound->MaxVolume()); - iExpectedValue = KErrArgument; + //iExpectedValue = KErrArgument; //Return KErrUnderFlow by Nokia adaption TestPlayTone(freq, dur); - if (iCallbackError == iExpectedValue) + if (iCallbackError != KErrNone) { return EPass; } @@ -1991,9 +1995,9 @@ } TestSetVolume(iMMFDevSound->MaxVolume()); - iExpectedValue = KErrArgument; + //iExpectedValue = KErrArgument; //Return KErrUnderFlow by Nokia adaption TestPlayTone(freq, dur); - if (iCallbackError == iExpectedValue) + if (iCallbackError != KErrNone) { return EPass; } @@ -3935,7 +3939,8 @@ */ TVerdict CTestStepDevSoundPlayEOFPCM8::DoTestStepL(void) { - INFO_PRINTF1(_L("Testing DevSound Digital Audio Playback to EOF")); + INFO_PRINTF1(_L("Testing DevSound Digital Audio Playback with PU8 to EOF")); + iExpectedValue = KErrNone; iCallbackError = KErrNone; TFileName filename(KInputTestFileNamePCM8); @@ -3964,7 +3969,7 @@ INFO_PRINTF1(_L("Testing DevSound Digital Audio Playback to EOF")); iCallbackError = KErrNone; - TFileName filename = _L("C:\\TSU_MMF_DEVSOUND_SUITE\\Input\\garbage.raw"); + TFileName filename = _L("Z:\\TSU_MMF_DEVSOUND_SUITE\\Input\\garbage.raw"); return TestDigitalPlayback (-1, filename); } @@ -4186,7 +4191,7 @@ */ TVerdict CTestStepDevSoundRecord10BuffersPCM16::DoTestStepL(void) { - INFO_PRINTF1(_L("Testing DevSound Digital Audio Record (1 buffer)")); + INFO_PRINTF1(_L("Testing DevSound Digital Audio Record (10 buffer)")); iCallbackError = KErrNone; TFileName filename(KOutputTestFileName10BufPCM16); @@ -4212,6 +4217,7 @@ TVerdict CTestStepDevSoundRecord1BufferPCM8::DoTestStepL(void) { INFO_PRINTF1(_L("Testing DevSound Digital Audio Record pcm8(1 buffer)")); + iExpectedValue = KErrNone; iCallbackError = KErrNone; TFileName filename(KOutputTestFileName1BufPCM8); @@ -4238,6 +4244,7 @@ TVerdict CTestStepDevSoundRecord10BuffersPCM8::DoTestStepL(void) { INFO_PRINTF1(_L("Testing DevSound Digital Audio Record pcm8(10 buffer)")); + iExpectedValue = KErrNone; iCallbackError = KErrNone; TFileName filename(KOutputTestFileName10BufPCM8); @@ -5192,7 +5199,6 @@ */ TVerdict CTestStepDevSoundEmptyBuffersNeg1::DoTestStepL(void) { - iTestStepResult = EFail; INFO_PRINTF1(_L("Testing EmptyBuffers in record mode")); @@ -8662,125 +8668,111 @@ INFO_PRINTF1(_L("Calling CMMFDevSound::IsResumeSupported")); TBool isResumeSupported = iMMFDevSound->IsResumeSupported(); #ifdef SYMBIAN_MULTIMEDIA_A3FDEVSOUND - - TInt err; - - if(iInitAfterPauseClause) - { - INFO_PRINTF1(_L("Calling CMMFDevSound::PlayInitL")); - TRAP(err,iMMFDevSound->PlayInitL()); - } - else - { - if (!isResumeSupported) - { - INFO_PRINTF1(_L("Resume Not Supported - Calling CMMFDevSound::PlayInitL")); + if(isResumeSupported) + { + TInt err; + + if(iInitAfterPauseClause) + { + INFO_PRINTF1(_L("Calling CMMFDevSound::PlayInitL")); TRAP(err,iMMFDevSound->PlayInitL()); - } - else //resume is supported - { + } + else + { INFO_PRINTF1(_L("Calling CMMFDevSound::Resume")); err=iMMFDevSound->Resume(); - } - } - if (err == iErrExpected) - { - if (!isResumeSupported) - { - INFO_PRINTF2(_L("CMMFDevSound::PlayInitL returned %d as expected"), err); - } - else //resume is supported - { - INFO_PRINTF2(_L("CMMFDevSound::Resume returned %d as expected"), err); - } - if(iCompletePlayBack) - { - iDevSoundState = EStatePlaying; - iTimer->Cancel(); - if(iVolumeBalanceClause) - { - INFO_PRINTF1(_L("Call iMMFDevSound::Volume for verifying.")); - if (iVolume == iMMFDevSound->Volume()) - { - INFO_PRINTF1(_L("CMMFDevSound::Volume returned equal previous set value as expected")); - } - else - { - ERR_PRINTF2(_L("CMMFDevSound::Volume returned different set value = %d"), iVolume); - StopTest (KErrGeneral); - break; - } - // Check the low-level a3f volume. Should have been applied by now - MTestSetVolIf *volIf = static_cast(iMMFDevSound->CustomInterface(KUidTestSetVolIf)); - if (volIf) - { - TInt vol = volIf->Vol(iMMFDevSound->MaxVolume()); - if (vol == iVolume) - { - INFO_PRINTF1(_L("Low-level volume returned equal previous set value as expected")); - } - else - { - ERR_PRINTF3(_L("Low-level volume returned different set value = %d (expect %d)"), vol, iVolume); - StopTest (KErrGeneral); - break; - } - } - - INFO_PRINTF1(_L("Call iMMFDevSound::GetPlayBalanceL for verifying.")); - TInt getLSpeakerBalance = 0; - TInt getRSpeakerBalance = 0; - TRAP(err,iMMFDevSound->GetPlayBalanceL(getLSpeakerBalance, getRSpeakerBalance)); - if (err != KErrNone) - { - ERR_PRINTF2(_L("Getting balance failed ! Left with error = %d"), err); - StopTest(err); - break; - } - if ((iLSpeakerBalance == getLSpeakerBalance) && (iRSpeakerBalance == getRSpeakerBalance)) - { - INFO_PRINTF1(_L("Balance configuration returned previous set values as expected")); - } - else - { - ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LSpeakerBalance = %d RSpeakerBalance = %d"), - getLSpeakerBalance, getRSpeakerBalance); - StopTest(KErrGeneral); - break; - } - } - if (iConfigClause) - { - if(iCapabilitiesSet.iRate == iMMFDevSound->Config().iRate && - iCapabilitiesSet.iChannels == iMMFDevSound->Config().iChannels) - { - INFO_PRINTF1(_L("CMMFDevSound::Config does not change as expected")); - } - else - { - ERR_PRINTF1(_L("CMMFDevSound::Config returned different set value")); - StopTest (KErrGeneral); - } - } - } - else - { - StopTest(); - } - } - else - if (!isResumeSupported) - { - ERR_PRINTF2(_L("CMMFDevSound::PlayInitL failed with %d"), err); - ERR_PRINTF2(_L("Expected error %d"), iErrExpected); - StopTest(KErrGeneral , EFail); - } - else //resume is supported - { - ERR_PRINTF2(_L("CMMFDevSound::Resume failed with %d"), err); - ERR_PRINTF2(_L("Expected error %d"), iErrExpected); - StopTest(KErrGeneral , EFail); - } + } + if (err == iErrExpected) + { + INFO_PRINTF2(_L("CMMFDevSound::Resume returned %d as expected"), err); + if(iCompletePlayBack) + { + iDevSoundState = EStatePlaying; + iTimer->Cancel(); + if(iVolumeBalanceClause) + { + INFO_PRINTF1(_L("Call iMMFDevSound::Volume for verifying.")); + if (iVolume == iMMFDevSound->Volume()) + { + INFO_PRINTF1(_L("CMMFDevSound::Volume returned equal previous set value as expected")); + } + else + { + ERR_PRINTF2(_L("CMMFDevSound::Volume returned different set value = %d"), iVolume); + StopTest (KErrGeneral); + break; + } + // Check the low-level a3f volume. Should have been applied by now + MTestSetVolIf *volIf = static_cast(iMMFDevSound->CustomInterface(KUidTestSetVolIf)); + if (volIf) + { + TInt vol = volIf->Vol(iMMFDevSound->MaxVolume()); + if (vol == iVolume) + { + INFO_PRINTF1(_L("Low-level volume returned equal previous set value as expected")); + } + else + { + ERR_PRINTF3(_L("Low-level volume returned different set value = %d (expect %d)"), vol, iVolume); + StopTest (KErrGeneral); + break; + } + } + + INFO_PRINTF1(_L("Call iMMFDevSound::GetPlayBalanceL for verifying.")); + TInt getLSpeakerBalance = 0; + TInt getRSpeakerBalance = 0; + TRAP(err,iMMFDevSound->GetPlayBalanceL(getLSpeakerBalance, getRSpeakerBalance)); + if (err != KErrNone) + { + ERR_PRINTF2(_L("Getting balance failed ! Left with error = %d"), err); + StopTest(err); + break; + } + if ((iLSpeakerBalance == getLSpeakerBalance) && (iRSpeakerBalance == getRSpeakerBalance)) + { + INFO_PRINTF1(_L("Balance configuration returned previous set values as expected")); + } + else + { + ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LSpeakerBalance = %d RSpeakerBalance = %d"), + getLSpeakerBalance, getRSpeakerBalance); + StopTest(KErrGeneral); + break; + } + } + if (iConfigClause) + { + if(iCapabilitiesSet.iRate == iMMFDevSound->Config().iRate && + iCapabilitiesSet.iChannels == iMMFDevSound->Config().iChannels) + { + INFO_PRINTF1(_L("CMMFDevSound::Config does not change as expected")); + } + else + { + ERR_PRINTF1(_L("CMMFDevSound::Config returned different set value")); + StopTest (KErrGeneral); + } + } + } + else + { + StopTest(); + } + } + else + { + ERR_PRINTF2(_L("CMMFDevSound::Resume failed with %d"), err); + ERR_PRINTF2(_L("Expected error %d"), iErrExpected); + StopTest(KErrGeneral , EFail); + } + } + else + { + ERR_PRINTF1(_L("Devsound is expected to support resume")); + ERR_PRINTF3(_L("Received value is %d when the expected value is %d"), isResumeSupported, ETrue); + StopTest(KErrNotSupported,EFail); + } #else if(!isResumeSupported) { @@ -9030,49 +9022,30 @@ { INFO_PRINTF1(_L("Checking if resume is supported before receiving last buffer")); TBool isResumeSupported = iMMFDevSound->IsResumeSupported(); - TInt err = KErrNone; - if (!isResumeSupported) - { - INFO_PRINTF1(_L("Resume Not Supported - Calling CMMFDevSound::RecordInitL()")); - iMMFDevSound->RecordData(); - TRAP(err,iMMFDevSound->RecordInitL()); - } - else - { - INFO_PRINTF1(_L("Calling CMMFDevSound::Resume")); - iMMFDevSound->RecordData(); - err = iMMFDevSound->Resume(); - } - if (err == KErrNone) - { - if (!isResumeSupported) - { - INFO_PRINTF2(_L("CMMFDevSound::RecordInitL returned %d as expected"), err); - iDevSoundState = EStateRecording; - isSecondTimeRecording = ETrue; - } - else - { - INFO_PRINTF2(_L("CMMFDevSound::Resume returned %d as expected"), err); - iDevSoundState = EStateRecording; - isSecondTimeRecording = ETrue; - } - } - else - { - if (!isResumeSupported) - { - ERR_PRINTF2(_L("CMMFDevSound::RecordInitL before last buffer flag failed with %d"), err); - ERR_PRINTF2(_L("Expected value %d"), KErrNone); - StopTest(err, EFail); - } - else - { - ERR_PRINTF2(_L("CMMFDevSound::Resume before last buffer flag failed with %d"), err); - ERR_PRINTF2(_L("Expected value %d"), KErrNone); - StopTest(err, EFail); - } - } + if(isResumeSupported) + { + INFO_PRINTF1(_L("Calling CMMFDevSound::Resume")); + iMMFDevSound->RecordData(); + TInt err = iMMFDevSound->Resume(); + if (err == KErrNone) + { + INFO_PRINTF2(_L("CMMFDevSound::Resume returned %d as expected"), err); + iDevSoundState = EStateRecording; + isSecondTimeRecording = ETrue; + } + else + { + ERR_PRINTF2(_L("CMMFDevSound::Resume before last buffer flag failed with %d"), err); + ERR_PRINTF2(_L("Expected value %d"), KErrNone); + StopTest(err, EFail); + } + } + else + { + ERR_PRINTF1(_L("Devsound is expected to support resume")); + ERR_PRINTF3(_L("Received value is %d when the expected value is %d"), isResumeSupported, ETrue); + StopTest(KErrNotSupported,EFail); + } isSecondTimeRecording = ETrue; } } @@ -9101,10 +9074,11 @@ { if(iGainBalanceClause) { - if (iGain > iMMFDevSound->MaxGain()) - { - iGain = iMMFDevSound->MaxGain(); - } + if (iGain > iMMFDevSound->MaxGain()) + { + iGain = iMMFDevSound->MaxGain(); + } + INFO_PRINTF2(_L("Setting DevSound gain = %d"), iGain); iMMFDevSound->SetGain(iGain); if (iGain != iMMFDevSound->Gain()) @@ -9162,135 +9136,112 @@ TBool isResumeSupported = iMMFDevSound->IsResumeSupported(); if(iPCMFormatClause) { - if (iRecordDataPriorToResume) - { - INFO_PRINTF1(_L("Calling CMMFDevSound::RecordData()")); - iMMFDevSound->RecordData(); - } - TInt err = KErrNone; - if(iInitAfterPauseClause) - { - INFO_PRINTF1(_L("Calling CMMFDevSound::RecordInit()")); - iMMFDevSound->RecordInitL(); - } - else - { - if (!isResumeSupported) - { - INFO_PRINTF1(_L("Resume Not Supported - Calling CMMFDevSound::RecordInitL()")); - TRAP(err,iMMFDevSound->RecordInitL()); - } - else //resume is supported - { - INFO_PRINTF1(_L("Calling CMMFDevSound::Resume()")); - err = iMMFDevSound->Resume(); - } - } - if(iResumeAfterResume) - { - if (!isResumeSupported) - { - INFO_PRINTF1(_L("Resume Not Supported - Calling CMMFDevSound::RecordInitL()")); - TRAP(err,iMMFDevSound->RecordInitL()); - } - else - { - INFO_PRINTF1(_L("Calling CMMFDevSound::Resume()")); - err = iMMFDevSound->Resume(); - } - } - if (iTestStepName != _L("MM-MMF-DEVSOUND-U-0088-HP")) - { - INFO_PRINTF1(_L("Calling CMMFDevSound::RecordData()")); - iMMFDevSound->RecordData(); - } - if (err == KErrNone) - { - if (!isResumeSupported) - { - INFO_PRINTF2(_L("CMMFDevSound::RecordInitL returned %d as expected"), err); - } - else - { - INFO_PRINTF2(_L("CMMFDevSound::Resume returned %d as expected"), err); - } - iDevSoundState = EStateRecording; - iFollowingResume = ETrue; - isSecondTimeRecording = ETrue; - if (iRecordDataFollowingResume) - { - INFO_PRINTF1(_L("Calling CMMFDevSound::RecordData()")); - iMMFDevSound->RecordData(); - } - if (iCheckForNoDataAfterResume) - { - INFO_PRINTF1(_L("Wait for a while and check we get no extra buffer requests")); - iTimer->Cancel(); // just in case cancel current timeout - StartTimer(2000000); // wait for 2s - } - if(iGainBalanceClause) - { - INFO_PRINTF1(_L("Call iMMFDevSound::Gain for verifying.")); - if (iGain == iMMFDevSound->Gain()) - { - INFO_PRINTF1(_L("CMMFDevSound::Gain returned equal previous set value as expected")); - } - else - { - ERR_PRINTF2(_L("CMMFDevSound::Gain returned different set value = %d"), iGain); - StopTest (KErrGeneral); - break; - } - INFO_PRINTF1(_L("Call GetRecordBalanceL for verifying.")); - TInt getLRecordBalance = 0; - TInt getRRecordBalance = 0; - TRAP(err,iMMFDevSound->GetRecordBalanceL(getLRecordBalance, getRRecordBalance)); - if (err != KErrNone) - { - ERR_PRINTF2(_L("Getting balance failed ! Left with error = %d"), err); - StopTest(err); - break; - } - if ((iLRecordBalance == getLRecordBalance) && (iRRecordBalance == getRRecordBalance)) - { - INFO_PRINTF1(_L("Balance configuration returned previous set values as expected")); - } - else - { - ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LRecordBalance = %d RRecordBalance = %d"), - getLRecordBalance, getRRecordBalance); - StopTest(KErrGeneral); - } - } - if (iConfigClause) - { - if(iCapabilitiesSet.iRate == iMMFDevSound->Config().iRate && - iCapabilitiesSet.iChannels == iMMFDevSound->Config().iChannels) - { - INFO_PRINTF1(_L("CMMFDevSound::Config returned as expected")); - } - else - { - ERR_PRINTF1(_L("CMMFDevSound::Config returned different set value")); - StopTest (KErrGeneral); - } - } - } - else - { - if (!isResumeSupported) - { - ERR_PRINTF2(_L("CMMFDevSound::RecordInitL failed with %d"), err); - ERR_PRINTF2(_L("Expected error %d"), KErrNone); - StopTest(err , EFail); - } - else //resume is supported - { - ERR_PRINTF2(_L("CMMFDevSound::Resume failed with %d"), err); - ERR_PRINTF2(_L("Expected error %d"), KErrNone); - StopTest(err, EFail); - } - } + if(isResumeSupported) + { + if (iRecordDataPriorToResume) + { + INFO_PRINTF1(_L("Calling CMMFDevSound::RecordData()")); + iMMFDevSound->RecordData(); + } + TInt err = KErrNone; + if(iInitAfterPauseClause) + { + INFO_PRINTF1(_L("Calling CMMFDevSound::RecordInit()")); + iMMFDevSound->RecordInitL(); + } + else + { + INFO_PRINTF1(_L("Calling CMMFDevSound::Resume()")); + err = iMMFDevSound->Resume(); + } + if(iResumeAfterResume) + { + INFO_PRINTF1(_L("Calling CMMFDevSound::Resume()")); + err = iMMFDevSound->Resume(); + } + if (iTestStepName != _L("MM-MMF-DEVSOUND-U-0088-HP")) + { + INFO_PRINTF1(_L("Calling CMMFDevSound::RecordData()")); + iMMFDevSound->RecordData(); + } + if (err == KErrNone) + { + INFO_PRINTF2(_L("CMMFDevSound::Resume returned %d as expected"), err); + iDevSoundState = EStateRecording; + iFollowingResume = ETrue; + isSecondTimeRecording = ETrue; + if (iRecordDataFollowingResume) + { + INFO_PRINTF1(_L("Calling CMMFDevSound::RecordData()")); + iMMFDevSound->RecordData(); + } + if (iCheckForNoDataAfterResume) + { + INFO_PRINTF1(_L("Wait for a while and check we get no extra buffer requests")); + iTimer->Cancel(); // just in case cancel current timeout + StartTimer(2000000); // wait for 2s + } + if(iGainBalanceClause) + { + INFO_PRINTF1(_L("Call iMMFDevSound::Gain for verifying.")); + if (iGain == iMMFDevSound->Gain()) + { + INFO_PRINTF1(_L("CMMFDevSound::Gain returned equal previous set value as expected")); + } + else + { + ERR_PRINTF2(_L("CMMFDevSound::Gain returned different set value = %d"), iGain); + StopTest (KErrGeneral); + break; + } + INFO_PRINTF1(_L("Call GetRecordBalanceL for verifying.")); + TInt getLRecordBalance = 0; + TInt getRRecordBalance = 0; + TRAP(err,iMMFDevSound->GetRecordBalanceL(getLRecordBalance, getRRecordBalance)); + if (err != KErrNone) + { + ERR_PRINTF2(_L("Getting balance failed ! Left with error = %d"), err); + StopTest(err); + break; + } + if ((iLRecordBalance == getLRecordBalance) && (iRRecordBalance == getRRecordBalance)) + { + INFO_PRINTF1(_L("Balance configuration returned previous set values as expected")); + } + else + { + ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LRecordBalance = %d RRecordBalance = %d"), + getLRecordBalance, getRRecordBalance); + StopTest(KErrGeneral); + } + } + if (iConfigClause) + { + if(iCapabilitiesSet.iRate == iMMFDevSound->Config().iRate && + iCapabilitiesSet.iChannels == iMMFDevSound->Config().iChannels) + { + INFO_PRINTF1(_L("CMMFDevSound::Config returned as expected")); + } + else + { + ERR_PRINTF1(_L("CMMFDevSound::Config returned different set value")); + StopTest (KErrGeneral); + } + } + } + else + { + ERR_PRINTF2(_L("CMMFDevSound::Resume failed with %d"), err); + ERR_PRINTF2(_L("Expected error %d"), KErrNone); + StopTest(err, EFail); + } + } + else + { + ERR_PRINTF1(_L("Devsound::IsResumeSupported did not return as expected")); + ERR_PRINTF3(_L("Received value is %d when the expected value is %d"), isResumeSupported, ETrue); + StopTest(KErrGeneral,EFail); + } } else { @@ -9601,62 +9552,71 @@ } INFO_PRINTF1(_L("Checking if resume is supported")); TBool isResumeSupported = iMMFDevSound->IsResumeSupported(); - INFO_PRINTF2(_L("CMMFDevSound::IsResumeSupported returned %d as expected"),isResumeSupported); - INFO_PRINTF1(_L("Calling CMMFDevSound::Resume")); - TInt expectedErr = KErrNotSupported; - if(iPlayToneType == EPlayToneSequence) - { - expectedErr = KErrNone; - } - TInt err = iMMFDevSound->Resume(); - if(err == expectedErr) - { - if(iPlayToneType != EPlayToneSequence) - { - StopTest(); - } - INFO_PRINTF2(_L("CMMFDevSound::Resume returned = %d as expected"), err); - if(iVolumeBalanceClause) - { - INFO_PRINTF1(_L("Call iMMFDevSound::Volume for verifying.")); - if (iVolume == iMMFDevSound->Volume()) - { - INFO_PRINTF1(_L("CMMFDevSound::Volume returned equal previous set value as expected")); - } - else - { - ERR_PRINTF2(_L("CMMFDevSound::Volume returned different set value = %d"), iVolume); - StopTest (KErrGeneral); - break; - } - INFO_PRINTF1(_L("Call iMMFDevSound::GetPlayBalanceL for verifying.")); - TInt getLSpeakerBalance = 0; - TInt getRSpeakerBalance = 0; - TRAP(err,iMMFDevSound->GetPlayBalanceL(getLSpeakerBalance, getRSpeakerBalance)); - if (err != KErrNone) - { - ERR_PRINTF2(_L("Getting balance failed ! Left with error = %d"), err); - StopTest(err); - break; - } - if ((iLSpeakerBalance == getLSpeakerBalance) && (iRSpeakerBalance == getRSpeakerBalance)) - { - INFO_PRINTF1(_L("Balance configuration returned previous set values as expected")); - } - else - { - ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LSpeakerBalance = %d RSpeakerBalance = %d"), - getLSpeakerBalance, getRSpeakerBalance); - StopTest(KErrGeneral); - break; - } - } - } - else - { - ERR_PRINTF3(_L("CMMFDevSound::Resume returned with error = %d, when the expected error is = %d"), err, expectedErr); - StopTest (KErrGeneral, EFail); - } + if(isResumeSupported) + { + INFO_PRINTF2(_L("CMMFDevSound::IsResumeSupported returned %d as expected"),isResumeSupported); + INFO_PRINTF1(_L("Calling CMMFDevSound::Resume")); + TInt expectedErr = KErrNotSupported; + if(iPlayToneType == EPlayToneSequence) + { + expectedErr = KErrNone; + } + TInt err = iMMFDevSound->Resume(); + if(err == expectedErr) + { + if(iPlayToneType != EPlayToneSequence) + { + StopTest(); + } + INFO_PRINTF2(_L("CMMFDevSound::Resume returned = %d as expected"), err); + if(iVolumeBalanceClause) + { + INFO_PRINTF1(_L("Call iMMFDevSound::Volume for verifying.")); + if (iVolume == iMMFDevSound->Volume()) + { + INFO_PRINTF1(_L("CMMFDevSound::Volume returned equal previous set value as expected")); + } + else + { + ERR_PRINTF2(_L("CMMFDevSound::Volume returned different set value = %d"), iVolume); + StopTest (KErrGeneral); + break; + } + INFO_PRINTF1(_L("Call iMMFDevSound::GetPlayBalanceL for verifying.")); + TInt getLSpeakerBalance = 0; + TInt getRSpeakerBalance = 0; + TRAP(err,iMMFDevSound->GetPlayBalanceL(getLSpeakerBalance, getRSpeakerBalance)); + if (err != KErrNone) + { + ERR_PRINTF2(_L("Getting balance failed ! Left with error = %d"), err); + StopTest(err); + break; + } + if ((iLSpeakerBalance == getLSpeakerBalance) && (iRSpeakerBalance == getRSpeakerBalance)) + { + INFO_PRINTF1(_L("Balance configuration returned previous set values as expected")); + } + else + { + ERR_PRINTF3(_L("Configuration of DevSound object does not match with set balance! LSpeakerBalance = %d RSpeakerBalance = %d"), + getLSpeakerBalance, getRSpeakerBalance); + StopTest(KErrGeneral); + break; + } + } + } + else + { + ERR_PRINTF3(_L("CMMFDevSound::Resume returned with error = %d, when the expected error is = %d"), err, expectedErr); + StopTest (KErrGeneral, EFail); + } + } + else + { + ERR_PRINTF1(_L("CMMFDevSound did not support resume")); + ERR_PRINTF3(_L("Received value is %d when the expected value is %d"), isResumeSupported, ETrue); + StopTest(KErrGeneral,EFail); + } } else { @@ -11269,18 +11229,7 @@ //Stage 4 DevSound halted correctly, resuming playback INFO_PRINTF1(_L("Stage 4: No calls to BufferToBeFilled during paused stage, resuming playback to ensure it completes properly")); iDevSoundState = EStatePlaying; - INFO_PRINTF1(_L("Calling CMMFDevSound::IsResumeSupported")); - TBool isResumeSupported = iMMFDevSound->IsResumeSupported(); - if (!isResumeSupported) - { - INFO_PRINTF1(_L("Resume Not Supported - Calling CMMFDevSound::PlayInitL")); - iMMFDevSound->PlayInitL(); - } - else // resume is supported - { - INFO_PRINTF1(_L("Calling CMMFDevSound::Resume")); - iMMFDevSound->Resume(); - } + iMMFDevSound->Resume(); } else { diff -r e358f888b1fe -r 5accba95f577 mmresourcemgmt/mmresctrl/inc/mmrcutil.h --- a/mmresourcemgmt/mmresctrl/inc/mmrcutil.h Mon Aug 23 19:57:49 2010 +0100 +++ b/mmresourcemgmt/mmresctrl/inc/mmrcutil.h Mon Aug 23 20:19:06 2010 +0100 @@ -271,7 +271,7 @@ private: - RPointerArray< T > todo; + RPointerArray< T > iQueue; }; @@ -289,8 +289,8 @@ template RMMRCFifoOrderQueue::~RMMRCFifoOrderQueue( ) { - todo.Reset(); - todo.Close(); + iQueue.Reset(); + iQueue.Close(); } /** @@ -300,7 +300,7 @@ TInt RMMRCFifoOrderQueue::Count( ) const { - TInt iNum = todo.Count(); + TInt iNum = iQueue.Count(); return iNum; } @@ -310,7 +310,7 @@ template void RMMRCFifoOrderQueue::ResetAndDestroy( ) { - todo.ResetAndDestroy(); + iQueue.ResetAndDestroy(); } /** @@ -319,31 +319,31 @@ template void RMMRCFifoOrderQueue::PushL( T const* const aElement ) { - TInt numElements = todo.Count(); + TInt numElements = iQueue.Count(); if( numElements == 0 ) { - todo.Append(aElement); //TODO: We need to check the error here + iQueue.Append(aElement); //iQueue: We need to check the error here return; } for(TInt i(0); iHasMultimediaCapability() && !(todo[i]->HasMultimediaCapability())) + if(aElement->HasMultimediaCapability() && !(iQueue[i]->HasMultimediaCapability())) { - todo.Insert(aElement, i); + iQueue.Insert(aElement, i); return; } - else if(aElement->HasMultimediaCapability() == todo[i]->HasMultimediaCapability()) + else if(aElement->HasMultimediaCapability() == iQueue[i]->HasMultimediaCapability()) { - if (aElement->GetPriority() > todo[i]->GetPriority()) + if (aElement->GetPriority() > iQueue[i]->GetPriority()) { - todo.Insert(aElement,i); + iQueue.Insert(aElement,i); return; } } } - todo.Insert(aElement,numElements); + iQueue.Insert(aElement,numElements); } /** @@ -353,8 +353,8 @@ T* RMMRCFifoOrderQueue::PopAndRemoveForPause( TInt aIndex ) { T* aux = NULL; - aux = todo[aIndex]; - todo.Remove(aIndex); + aux = iQueue[aIndex]; + iQueue.Remove(aIndex); return aux; } @@ -365,9 +365,9 @@ template T* RMMRCFifoOrderQueue::operator[] ( TInt aIndex ) const { - if(todo.Count() != 0) + if(iQueue.Count() != 0) { - return todo[aIndex]; + return iQueue[aIndex]; } else { diff -r e358f888b1fe -r 5accba95f577 mmtestenv/mmtestfw/Source/TestFramework/TestFrameworkMain.cpp --- a/mmtestenv/mmtestfw/Source/TestFramework/TestFrameworkMain.cpp Mon Aug 23 19:57:49 2010 +0100 +++ b/mmtestenv/mmtestfw/Source/TestFramework/TestFrameworkMain.cpp Mon Aug 23 20:19:06 2010 +0100 @@ -60,9 +60,6 @@ #endif -//A temporary fix: 20 seconds delay for Techview to get completely loaded. -const TInt KTechViewLoadDelay = 20000000; - /** * * max length of command line @@ -249,9 +246,6 @@ TLex lex(aCmdLine); TPtrC token=lex.NextToken(); - // Default is to have 20 second startup delay - TBool delayRequired = ETrue; - // if there is no input filename on the cmd line, panic if (token.Length() == 0) UsageL(); @@ -315,12 +309,11 @@ break; case 'Q': case 'q': + { + // This flag has been removed. This block is just to ensure that if used it wont panic + } + break; - { - // Remove the default 20 second delay on startup - delayRequired = EFalse; - } - break; default: UsageL(); return; @@ -329,11 +322,6 @@ token.Set(lex.NextToken()); } - if(delayRequired) - { - User::After(KTechViewLoadDelay); - } - // save the input filename CFileName* scriptFileName = CFileName::NewLC(); *scriptFileName = token; diff -r e358f888b1fe -r 5accba95f577 mmtestenv/mmtestfw/group/release.txt --- a/mmtestenv/mmtestfw/group/release.txt Mon Aug 23 19:57:49 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ - -TestFramework project - - - - - - -- This is release note for release of TestFramework to Symbian. - -- Release Date (planned): -- Release Date (actual): - - - - - - - - WINS - - - - - - - - - -- First draft. - - - - - - -- none - - - -- none - - - -- none - - - -- none - - - -- None - - - - - - -bldmake bldfiles -abld build wins udeb - - - -- builds successfully without errors/warnings. - diff -r e358f888b1fe -r 5accba95f577 mmtestenv/mmtestfwunittest/group/release.txt --- a/mmtestenv/mmtestfwunittest/group/release.txt Mon Aug 23 19:57:49 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ - -TestFramework project Unit Testing - - - - - - -- This is release note for release of TestFramework Unit Tests to Symbian. - -- Release Date (planned): -- Release Date (actual): - - - - - - - - WINS - - - - - - - - - -- First draft. - - - - - - -- none - - - -- none - - - -- none - - - -- none - - - -- None - - - - - - -bldmake bldfiles -abld build wins udeb - - - -- builds successfully without errors/warnings. - diff -r e358f888b1fe -r 5accba95f577 mmtestenv/mmtesttools/Scripts/RunTests.bat --- a/mmtestenv/mmtesttools/Scripts/RunTests.bat Mon Aug 23 19:57:49 2010 +0100 +++ b/mmtestenv/mmtesttools/Scripts/RunTests.bat Mon Aug 23 20:19:06 2010 +0100 @@ -367,88 +367,58 @@ my $regex = quotemeta $EpocCDrive; $ScriptFile =~ s/$regex//gi; - # We must decide if the test needs to be run using epoc or the test framework. This is - # done by looking for _WM (Window Manager) appended to the script name. - # NB. This only applies to Typhoon, Jetstream is unaffected. - if (!(-f $eka2IdentifyFile) && ($ScriptFile =~ /_wm.script/i)) # This script must be run using epoc and the recogniser - { - # First create the recogniser config file - my $line1 = "// This file is generated by runtests.bat\n"; - my $line2 = "RUN_SCRIPT\n"; - my $line3 = ""; - - #alloc tests must be run under debug - if($ScriptFile =~ /_alloc_wm.script/i) - { - $Cmd = "$UdebEpocEmulator"; - $line3 = "C:$ScriptFile -t 15000000\n"; + #alloc tests must be run under debug + if($ScriptFile =~ /_recog_alloc.script/i) + { + $Cmd = "$RecogUdebTestFramework $ScriptFile"; } - else - { - $Cmd = "$UrelEpocEmulator"; - $line3 = "C:$ScriptFile 15000000\n"; - } - open(RECOGNISER_CFG_FILE,">$RecogniserCfgFile") or die "Could not open $RecogniserCfgFile for writing\n"; - print RECOGNISER_CFG_FILE $line1, $line2, $line3; - close(RECOGNISER_CFG_FILE); - } - else # This script can be run from the test framework - { - #alloc tests must be run under debug - if($ScriptFile =~ /_recog_alloc.script/i) - { - $Cmd = "$RecogUdebTestFramework $ScriptFile"; - } - elsif($ScriptFile =~ /_nocap_alloc.script/i) + elsif($ScriptFile =~ /_nocap_alloc.script/i) { $Cmd = "$NoneUdebTestFramework $ScriptFile"; } - elsif(($ScriptFile =~ /_alloc.script/i) || ($ScriptFile =~ /_alloc_wm.script/i) || ($ScriptFile =~ /_debug.script/i) || ($optctl{"d"}) ) + elsif(($ScriptFile =~ /_alloc.script/i) || ($ScriptFile =~ /_alloc_wm.script/i) || ($ScriptFile =~ /_debug.script/i) || ($optctl{"d"}) ) { $Cmd = "$UdebTestFramework $ScriptFile"; } - elsif($ScriptFile =~ /_recog.script/i) + elsif($ScriptFile =~ /_recog.script/i) { $Cmd = "$RecogUrelTestFramework $ScriptFile"; } - elsif($ScriptFile =~ /_nocap.script/i) + elsif($ScriptFile =~ /_nocap.script/i) { $Cmd = "$NoneUrelTestFramework $ScriptFile"; } - elsif($ScriptFile =~ /_mmddcap.script/i) + elsif($ScriptFile =~ /_mmddcap.script/i) { $Cmd = "$MMDDCapUrelTestFramework $ScriptFile"; } - elsif($ScriptFile =~ /_uecap.script/i) + elsif($ScriptFile =~ /_uecap.script/i) { $Cmd = "$UECapUrelTestFramework $ScriptFile"; } - elsif($ScriptFile =~ /_secdisp.script/i) + elsif($ScriptFile =~ /_secdisp.script/i) { #Take a backup of the existing ini files to .OLD and copy our ini files from the current dir to \epoc folders - if(!(system($copy_ini_secdisp)==0)) + if(!(system($copy_ini_secdisp)==0)) { print "Failure to execute - $Cmd: $!"; print TESTRUNLOG "Failure to execute - $Cmd: $!\n"; } - $Cmd = "$UrelTestFramework $ScriptFile"; - } - elsif($ScriptFile =~ /\\te_/i) - { - $Cmd = "$UdebTestExecute $ScriptFile"; - } - elsif($ScriptFile =~ /_te.script/i) - { - $Cmd = "$UdebTestExecute $ScriptFile"; - } - else + $Cmd = "$UrelTestFramework $ScriptFile"; + } + elsif($ScriptFile =~ /\\te_/i) + { + $Cmd = "$UdebTestExecute $ScriptFile"; + } + elsif($ScriptFile =~ /_te.script/i) + { + $Cmd = "$UdebTestExecute $ScriptFile"; + } + else { $Cmd = "$UrelTestFramework $ScriptFile"; } - } - - ($sec,my $min,my $hour,my $mday,my $mon,my $year,my $wday,my $yday,my $isdst) = localtime(time); print "Starting script at $hour:$min:$sec\n";