diff -r 7333d7932ef7 -r 8b7f4e561641 installationservices/swi/test/tsisregistrytest_legacy/sessionstep.cpp --- a/installationservices/swi/test/tsisregistrytest_legacy/sessionstep.cpp Tue Aug 31 15:21:33 2010 +0300 +++ b/installationservices/swi/test/tsisregistrytest_legacy/sessionstep.cpp Wed Sep 01 12:22:02 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2004-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" @@ -21,8 +21,7 @@ @test @internalTechnology */ - -#include + #include #include #include "sessionstep.h" @@ -38,7 +37,6 @@ #include "sisregistrylog.h" #include -#include ///////////////////////////////////////////////////////////////////// // defs, Constants used by test steps @@ -46,8 +44,6 @@ _LIT(KNoUid, "nouid"); _LIT(KUid, "uid"); -_LIT(KCenRepKey, "cenrepkey"); -_LIT(KCenRepValue, "cenrepvalue"); _LIT(KDrivebitmapcount, "drivebitmapcout"); _LIT(KSid, "sid"); _LIT(KPackage, "package"); @@ -138,9 +134,10 @@ return TestStepResult(); } CleanupClosePushL(entry); - + + entry.EmbeddingPackagesL(packages); CleanupResetAndDestroyPushL(packages); - entry.EmbeddingPackagesL(packages); + if(packages.Count() != embeddingPkgCount) { @@ -656,60 +653,6 @@ return TestStepResult(); } - -///////////////////////////////////////////////////////////////////// -// CSetCenRepSettingStep - Set Central Reposatory Value -///////////////////////////////////////////////////////////////////// -CSetCenRepSettingStep::CSetCenRepSettingStep() - { - SetTestStepName(KSetCenRepSetting); - } - -TVerdict CSetCenRepSettingStep::doTestStepL() - { - SetTestStepResult(EPass); - TUid repUid; - if(!GetUidFromConfig(ConfigSection(), KUid, repUid)) - { - ERR_PRINTF1(_L("Package UID is missing in the configuration file!")); - SetTestStepResult(EFail); - return TestStepResult(); - } - - TInt cenRepKey; - if(!GetIntFromConfig(ConfigSection(), KCenRepKey, cenRepKey)) - { - ERR_PRINTF1(_L("Central Reposatory Key is missing in the configuration file!")); - SetTestStepResult(EFail); - return TestStepResult(); - } - - TInt cenRepValue; - if(!GetIntFromConfig(ConfigSection(), KCenRepValue, cenRepValue)) - { - ERR_PRINTF1(_L("Central Reposatory Value is missing in the configuration file!")); - SetTestStepResult(EFail); - return TestStepResult(); - } - - CRepository* rep = CRepository::NewLC(repUid); - TInt err = rep->Set(cenRepKey, cenRepValue); - - if( err == KErrNone ) - { - INFO_PRINTF4(_L("Setting Central Reposatory 0x%08x , key = %d, value = %d"),repUid,cenRepKey,cenRepValue); - } - else - { - SetTestStepResult(EFail); - ERR_PRINTF4(_L("Failed Setting Central Reposatory 0x%08x , key = %d, value = %d"),repUid,cenRepKey,cenRepValue); - } - - CleanupStack::PopAndDestroy(rep); - return TestStepResult(); - } - - ///////////////////////////////////////////////////////////////////// // CIsPackageInstalledStep - checks if packages are registered /////////////////////////////////////////////////////////////////////