diff -r e53adc4c49de -r df67dc5d759e datacommsserver/esockserver/test/providers/dummy/src/dummypr_subconnprov.cpp --- a/datacommsserver/esockserver/test/providers/dummy/src/dummypr_subconnprov.cpp Mon May 03 13:39:24 2010 +0300 +++ b/datacommsserver/esockserver/test/providers/dummy/src/dummypr_subconnprov.cpp Fri May 14 14:12:43 2010 +0100 @@ -27,6 +27,7 @@ #include "dummypr_subconnprov.h" #include "dummypr_metaconnprov.h" +#include "activityTest.h" #include @@ -133,7 +134,7 @@ NODEACTIVITY_END() } -// Activity Map +// Activity Map For test-code ridden scpr namespace DummySCPRStates { DEFINE_ACTIVITY_MAP(stateMap) @@ -144,9 +145,26 @@ ACTIVITY_MAP_END_BASE(SCprActivities, coreSCprActivities) } +// Activity Map For vanilla cpr +namespace VanillaDummySCPRStates +{ +DECLARE_DEFINE_ACTIVITY_MAP(stateMap) + ACTIVITY_MAP_ENTRY(CancelTestBindToActivity, CancelBindTo) +ACTIVITY_MAP_END_BASE(SCprActivities, coreSCprActivities) +} + CDummySubConnectionProvider* CDummySubConnectionProvider::NewL(ESock::CSubConnectionProviderFactoryBase& aFactory) { - CDummySubConnectionProvider* self = new (ELeave) CDummySubConnectionProvider(aFactory); + CDummySubConnectionProvider* self = new (ELeave) CDummySubConnectionProvider(aFactory, DummySCPRStates::stateMap::Self()); + CleanupStack::PushL(self); + self->ConstructL(KDummySCPRPreallocatedActivityBufferSize); + CleanupStack::Pop(self); + return self; + } + +CDummySubConnectionProvider* CDummySubConnectionProvider::NewVanillaL(ESock::CSubConnectionProviderFactoryBase& aFactory) + { + CDummySubConnectionProvider* self = new (ELeave) CDummySubConnectionProvider(aFactory, VanillaDummySCPRStates::stateMap::Self()); CleanupStack::PushL(self); self->ConstructL(KDummySCPRPreallocatedActivityBufferSize); CleanupStack::Pop(self); @@ -154,8 +172,8 @@ } -CDummySubConnectionProvider::CDummySubConnectionProvider(CSubConnectionProviderFactoryBase& aFactory) -:CCoreSubConnectionProvider(aFactory,DummySCPRStates::stateMap::Self()) +CDummySubConnectionProvider::CDummySubConnectionProvider(CSubConnectionProviderFactoryBase& aFactory, const MeshMachine::TNodeActivityMap& aActivityMap) +:CCoreSubConnectionProvider(aFactory, aActivityMap) { LOG_NODE_CREATE(KDummySCPRTag, CDummySubConnectionProvider); }