--- a/sysstatemgmt/systemstateplugins/test/tunitgsapolicy/src/tgsa_step_fail.cpp	Tue Aug 31 16:29:05 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/test/tunitgsapolicy/src/tgsa_step_fail.cpp	Wed Sep 01 12:34:26 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2009 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"
@@ -27,19 +27,12 @@
 #include <ssm/ssmcommandlist.h>
 #include <ssm/ssmcmd.hrh>
 #include <ssm/ssmcommand.h>
-#include "ssmsubstateext.hrh"
 
 #include "tgsa_step_fail.h"
 
-TSsmCommandType ArrFail[] = {   ESsmCmdCustomCommand,       //r_cmd_sastate
-                                ESsmCmdPublishSystemState,  //r_cmd_publishstate
-                                ESsmCmdSetPAndSKey,         //r_cmd_psstate
-                                ESsmCmdCustomCommand,       //r_cmd_cancelmonitoring
-                                ESsmCmdSetPAndSKey,         //r_cmd_killsplash
-                                ESsmCmdCustomCommand,       //r_cmd_contactservice
-                                ESsmCmdStartApp,            //r_cmd_sysap
-                                ESsmCmdMultipleWait         //r_cmd_multiwaitforever
-                                };
+TSsmCommandType ArrFail[] = { ESsmCmdPublishSystemState, ESsmCmdPersistHalAttributes, 
+							ESsmCmdFinaliseDrives, ESsmCmdPowerOff };
+
 CGsaFailTest::~CGsaFailTest()
 	{
 	}
@@ -119,10 +112,8 @@
  void CGsaFailTest::doTestPrepareCommandListL()
 	{
 	INFO_PRINTF1(_L("> CGsaFailTest::doTestPrepareCommandListL"));
-	//The default substate in the actual (fail policy) is mapped to 
-	//ESsmStateFail = 0x30
-	//Hence testing for the same.
-	TestPrepareCommandListL(ESsmFail ,ESsmStateFail , KErrNone);
+	TestPrepareCommandListL(ESsmFail ,KSsmAnySubState, KErrNone);
+	TestPrepareCommandListL(ESsmFail ,KSsmAnySubState, KErrNone);
 	TestPrepareCommandListL(ESsmFail ,100, KErrNotFound);
 	}
 
@@ -134,7 +125,7 @@
 	{
 	INFO_PRINTF1(_L("> CGsaFailTest::doTestCommandListL"));
 
-	TestCommandListL(ESsmFail, ESsmStateFail, (sizeof(ArrFail)/sizeof(ArrFail[0])));
+	TestCommandListL(ESsmFail, KSsmAnySubState, (sizeof(ArrFail)/sizeof(ArrFail[0])));
 	}
 
 /**
@@ -146,11 +137,11 @@
 	{
 	CGsaStatePolicyFail* policy = CreateAndInitializeFailPolicyLC();
 
-	TSsmState state(ESsmFail, ESsmStateFail);
+	TSsmState state(ESsmFail, KSsmAnySubState);
 	TSsmState result(0, 0);
 	TestGetNextState(policy, state, KErrNone, result);
 
-	TSsmState firstState(ESsmFail, ESsmStateFail);
+	TSsmState firstState(ESsmFail, KSsmAnySubState);
 	TestGetNextState(policy, firstState, KErrNone, result);
 
 	TSsmState unknownState(ESsmFail, 100);
@@ -275,7 +266,7 @@
 void CGsaFailTest::TestGetNextState(CGsaStatePolicyFail* aPolicy, TSsmState aCurrentTransition, TInt aError, TSsmState aResult)
 	{
 	TRequestStatus trs;
-	TSsmState state(ESsmFail, ESsmStateFail);
+	TSsmState state(ESsmFail, KSsmAnySubState);
 	aPolicy->PrepareCommandList(state, KErrNone, trs);
 	StartScheduler();
 	User::WaitForRequest(trs);