diff -r e8c1ea2c6496 -r 8758140453c0 email/mobilitytestframework/inc/cimmobilitytestframework.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email/mobilitytestframework/inc/cimmobilitytestframework.h	Thu Jan 21 12:53:44 2010 +0000
@@ -0,0 +1,68 @@
+// 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 the License "Symbian Foundation License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __CIMMOBILITYTESTFRAMEWORK_H__
+#define __CIMMOBILITYTESTFRAMEWORK_H__
+
+#include <e32base.h>
+#include <msvstd.h>
+#include <cs_mobility_apiext.h>  // MMobilityProtocolResp
+#include "mmsgtestpropertywatcher.h"
+#include "timmobilitytestmtmstate.h"
+
+// Forward class references
+class CImMobilityManager;
+class CMsgTestPropertyWatcher;
+
+/**
+The test framework class.
+
+@internalComponent
+@released
+*/
+class CImMobilityTestFramework : public CBase,
+									public MMsgTestPropertyWatcher
+	{
+public:
+	IMPORT_C static void Create(TMsvId aServiceId, CImMobilityManager& aMobilityManager);
+	IMPORT_C static void Delete(CImMobilityManager& aMobilityManager);
+	IMPORT_C static void MtmState(TMsvId aServiceId, TImMobilityTestMtmState aMtmState);
+	IMPORT_C static TMsvId GetServiceId(MMobilityProtocolResp& aProtocol);
+
+	~CImMobilityTestFramework();
+	TMsvId ServiceId();
+	CImMobilityManager& MobilityManager();
+	void TimerExpired();
+	
+	// from MMsgTestPropertyWatcher
+	void HandleEventL(RProperty& aProperty, TUint /*aKey*/);
+
+private:
+	static void NewL(TMsvId aServiceId, CImMobilityManager& aMobilityManager);
+	CImMobilityTestFramework(TMsvId aServiceId, CImMobilityManager& aMobilityManager);
+	void ConstructL();
+
+private:
+	// Mobility manager
+	CImMobilityManager& iMobilityManager;
+
+	// Service Id of related MTM
+	TMsvId iServiceId;
+	
+	// Property watcher for Publish&Subscribe
+	CMsgTestPropertyWatcher* iPropertyWatcher;
+	};
+
+#endif //__CIMMOBILITYTESTFRAMEWORK_H__