--- a/sysstatemgmt/systemstateplugins/adptplugin/src/stateadaptationref.cpp Tue Aug 31 16:29:05 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/adptplugin/src/stateadaptationref.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"
@@ -10,21 +10,10 @@
//
// Contributors:
//
-// Description: This adaptation plugin implementation is for test/reference purposes.
-// The loading of this plugin is controlled through test macro defined in the iby file "ssmcompatibility.iby".
-// If the macro "TEST_SSM_MACRO" is not defined, original plugins are loaded and this plugin is not loaded.
-// If the test P & S key is set in the test code, the calls are routed to the reference or dummy implementations.
-// Else the actual plugins are loaded and the calls are routed to the actual implementations.
-// The test P & S key which it looks for is KStateAdaptationPluginPropertyKey (0x2000D76A)
+// Description:
//
-#include <e32property.h>
-#include <ssm/ssmstate.h>
#include "stateadaptationref.h"
-#include "ssmdebug.h"
-
-const TUint32 KStateAdaptationPluginPropertyKey = 0x2000D76A;
-const TUid KPropertyCategory={0x2000D75B};
/**
Static method to create new State Adaptation Plugin.
@@ -51,7 +40,6 @@
CStateAdaptationRef::~CStateAdaptationRef()
{
delete iTimer;
- iSaaStateAdaptationLib.Close();
}
CStateAdaptationRef::CStateAdaptationRef()
@@ -60,10 +48,6 @@
void CStateAdaptationRef::ConstructL()
{
- DEBUGPRINT1A("Loading Actual plugins");
- _LIT(KSaaStateAdaptationDLL, "saastateadaptation.dll");
- User::LeaveIfError(iSaaStateAdaptationLib.Load(KSaaStateAdaptationDLL));
- iSaaStateAdaptationDll = (MStateAdaptation *)(iSaaStateAdaptationLib.Lookup(1)());
iTimer = CStateRefAdaptationTimer::NewL();
}
@@ -73,84 +57,39 @@
delete this;
}
-void CStateAdaptationRef::RequestCoopSysStateChange(TSsmState aState, TRequestStatus& aStatus)
+void CStateAdaptationRef::RequestCoopSysStateChange(TSsmState /*aState*/, TRequestStatus& aStatus)
{
- if(!IsTestPsKeyDefined())
- {
- DEBUGPRINT1A("RequestCoopSysStateChange:: Calling Actual plugins functions (saastateadaptation.dll)");
- iSaaStateAdaptationDll->RequestCoopSysStateChange(aState, aStatus);
- }
- else
- {
- DEBUGPRINT1A("RequestCoopSysStateChange:: Calling ref plugins functions (stateadaptationref.dll)");
- aStatus = KRequestPending;
- TRequestStatus* status = &aStatus;
- User::RequestComplete(status, KErrNone);
- }
+ aStatus = KRequestPending;
+ TRequestStatus* status = &aStatus;
+ User::RequestComplete(status, KErrNone);
}
void CStateAdaptationRef::RequestCoopSysSelfTest(TRequestStatus& aStatus)
{
- if(!IsTestPsKeyDefined())
- {
- DEBUGPRINT1A("RequestCoopSysSelfTest:: Calling Actual plugins functions (saastateadaptation.dll)");
- iSaaStateAdaptationDll->RequestCoopSysSelfTest(aStatus);
- }
- else
- {
- DEBUGPRINT1A("RequestCoopSysSelfTest:: Calling ref plugins functions (stateadaptationref.dll)");
- aStatus = KRequestPending;
- TRequestStatus* status = &aStatus;
- User::RequestComplete(status, KErrNone);
- }
+ aStatus = KRequestPending;
+ TRequestStatus* status = &aStatus;
+ User::RequestComplete(status, KErrNone);
}
-void CStateAdaptationRef::RequestCoopSysPerformRestartActions(TInt aReason, TRequestStatus& aStatus)
+void CStateAdaptationRef::RequestCoopSysPerformRestartActions(TInt /*aReason*/, TRequestStatus& aStatus)
{
- if(!IsTestPsKeyDefined())
- {
- DEBUGPRINT1A("RequestCoopSysPerformRestartActions:: Calling Actual plugins functions (saastateadaptation.dll)");
- iSaaStateAdaptationDll->RequestCoopSysPerformRestartActions(aReason, aStatus);
- }
- else
- {
- DEBUGPRINT1A("RequestCoopSysPerformRestartActions:: Calling ref plugins functions (stateadaptationref.dll)");
- aStatus = KRequestPending;
- TRequestStatus* status = &aStatus;
- User::RequestComplete(status, KErrNone);
- }
+ aStatus = KRequestPending;
+ TRequestStatus* status = &aStatus;
+ User::RequestComplete(status, KErrNone);
}
-void CStateAdaptationRef::RequestCoopSysPerformShutdownActions(TInt aReason, TRequestStatus& aStatus)
+void CStateAdaptationRef::RequestCoopSysPerformShutdownActions(TInt /*aReason*/, TRequestStatus& aStatus)
{
- if(!IsTestPsKeyDefined())
- {
- DEBUGPRINT1A("RequestCoopSysPerformShutdownActions:: Calling Actual plugins functions (saastateadaptation.dll)");
- iSaaStateAdaptationDll->RequestCoopSysPerformShutdownActions(aReason, aStatus);
- }
- else
- {
- DEBUGPRINT1A("RequestCoopSysPerformShutdownActions:: Calling ref plugins functions (stateadaptationref.dll)");
- aStatus = KRequestPending;
- TRequestStatus* status = &aStatus;
- User::RequestComplete(status, KErrNone);
- }
+ aStatus = KRequestPending;
+ TRequestStatus* status = &aStatus;
+ User::RequestComplete(status, KErrNone);
}
-void CStateAdaptationRef::RequestCoopSysPerformRfsActions(TSsmRfsType aRfsType, TRequestStatus& aStatus)
+void CStateAdaptationRef::RequestCoopSysPerformRfsActions(TSsmRfsType /*aRfsType*/, TRequestStatus& aStatus)
{
- if(!IsTestPsKeyDefined())
- {
- DEBUGPRINT1A("RequestCoopSysPerformRfsActions:: Calling Actual plugins functions (saastateadaptation.dll)");
- iSaaStateAdaptationDll->RequestCoopSysPerformRfsActions(aRfsType, aStatus);
- }
- else
- {
- DEBUGPRINT1A("RequestCoopSysPerformRfsActions:: Calling ref plugins functions (stateadaptationref.dll)");
- aStatus = KRequestPending;
- TRequestStatus* status = &aStatus;
- User::RequestComplete(status, KErrNone);
- }
+ aStatus = KRequestPending;
+ TRequestStatus* status = &aStatus;
+ User::RequestComplete(status, KErrNone);
}
/**
@@ -159,16 +98,10 @@
*/
void CStateAdaptationRef::RequestCancel()
{
- if(!IsTestPsKeyDefined())
- {
- DEBUGPRINT1A("RequestCancel:: Calling Actual plugins functions (saastateadaptation.dll)");
- iSaaStateAdaptationDll->RequestCancel();
- }
}
/**
- The reference implementation completes with KErrNotSupported. This is required for automated testing.
- Actual plugins return expected values and this can be verified by manual testing
+ The reference implementation completes with KErrNotSupported since there isn't a Cooperating System on HRP/Techview.
On a device, State Adaptation Plug-in would request for notification from the Cooperating System for 'aEvent'.
The above mentioned implementation is modified to facilitate testing and increase the code coverage of the Adaptation
@@ -187,22 +120,8 @@
*/
void CStateAdaptationRef::NotifyCoopSysEvent(TDes8& /*aEvent*/, TRequestStatus& aStatus)
{
- if(!IsTestPsKeyDefined())
- {
- /* Only ssmpowersup.dll has an outstanding request. If this is passed to the actual plugin, the
- request will never complete till a power event happens. This would add the test code requests in a queue
- and the test code waits indefinitely. Hence, complete the request with KErrServerTerminated. This would free
- the queue for test code to be executed. It has not impact on the test environment */
- aStatus = KRequestPending;
- TRequestStatus* status = &aStatus;
- User::RequestComplete(status, KErrServerTerminated);
- }
- else
- {
- DEBUGPRINT1A("NotifyCoopSysEvent:: Calling ref plugins functions (stateadaptationref.dll)");
- aStatus = KRequestPending;
- iTimer->After(2000000,aStatus);
- }
+ aStatus = KRequestPending;
+ iTimer->After(2000000,aStatus);
}
/**
@@ -211,36 +130,13 @@
*/
void CStateAdaptationRef::NotifyCancel()
{
- if(!IsTestPsKeyDefined())
- {
- DEBUGPRINT1A("NotifyCancel:: Calling Actual plugins functions (saastateadaptation.dll)");
- iSaaStateAdaptationDll->NotifyCancel();
- }
- else
- {
- DEBUGPRINT1A("NotifyCancel:: Calling ref plugins functions (stateadaptationref.dll)");
- if(iTimer->IsActive())
- {
- iTimer->Cancel();
- }
- }
+ if(iTimer->IsActive())
+ {
+ iTimer->Cancel();
+ }
}
-/**
- Helper function to check for P&S Key
-*/
-TBool CStateAdaptationRef::IsTestPsKeyDefined()
- {
- TBool testPsKeyDefined = EFalse;
- TInt result = RProperty::Get(KPropertyCategory, KStateAdaptationPluginPropertyKey, testPsKeyDefined);
- DEBUGPRINT3(_L("KStateAdaptationPluginPropertyKey %d Error %d"), testPsKeyDefined, result);
- if ((KErrNone != result) && (KErrNotFound != result))
- {
- //Could not retrieve property value. Tests might fail
- DEBUGPRINT1A("IsTestPsKeyDefined ERROR :: Could not retrieve property value)");
- }
- return testPsKeyDefined;
- }
+
CStateRefAdaptationTimer::CStateRefAdaptationTimer():CTimer(CActive::EPriorityUserInput)
{