diff -r 000000000000 -r e686773b3f54 phonebookengines/contactsmodel/tsrc/Integration/TestContactSuite/src/TestContactSuiteServer.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/contactsmodel/tsrc/Integration/TestContactSuite/src/TestContactSuiteServer.cpp	Tue Feb 02 10:12:17 2010 +0200
@@ -0,0 +1,134 @@
+// Copyright (c) 2005-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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#include "TestContactSuiteServer.h"
+#include "TestAddFieldsStep.h"
+#include "TestUpdateFieldsStep.h"
+#include "TestDeleteFieldsStep.h"
+#include "TestAddMultipleContactsStep.h"
+#include "TestUpdateMultipleContactsStep.h"
+#include "TestDeleteMultipleContactsStep.h"
+#include "TestContactPerformanceStep.h"
+
+
+_LIT(KServerName,"TestContactSuite");
+CTestContactSuite* CTestContactSuite::NewL()
+/**
+ * @return - Instance of the test server
+ * Same code for Secure and non-secure variants
+ * Called inside the MainL() function to create and start the
+ * CTestServer derived server.
+ */
+	{
+	CTestContactSuite * server = new (ELeave) CTestContactSuite();
+	CleanupStack::PushL(server);
+	// CServer base class call which can be either StartL or ConstructL,
+	// the later will permit Server Logging.
+
+	server->StartL(KServerName);
+	//server->ConstructL(KServerName);
+	CleanupStack::Pop(server);
+	return server;
+	}
+
+// Secure variants much simpler
+// For EKA2, just an E32Main and a MainL()
+LOCAL_C void MainL()
+/**
+ * Secure variant
+ * Much simpler, uses the new Rendezvous() call to sync with the client
+ */
+	{
+	// Leave the hooks in for platform security
+#if (defined __DATA_CAGING__)
+	RProcess().DataCaging(RProcess::EDataCagingOn);
+	RProcess().DataCaging(RProcess::ESecureApiOn);
+#endif
+	CActiveScheduler* sched=NULL;
+	sched=new(ELeave) CActiveScheduler;
+	CActiveScheduler::Install(sched);
+	CTestContactSuite* server = NULL;
+	// Create the CTestServer derived server
+	TRAPD(err,server = CTestContactSuite::NewL());
+	if(!err)
+		{
+		RProcess::Rendezvous(KErrNone);
+		sched->Start();
+		}
+
+	delete server;
+	delete sched;
+	}
+
+GLDEF_C TInt E32Main()
+/**
+ * @return - Standard Epoc error code on process exit
+ * Secure variant only
+ * Process entry point. Called by client using RProcess API
+ */
+	{
+	__UHEAP_MARK;
+	CTrapCleanup* cleanup = CTrapCleanup::New();
+	if(cleanup == NULL)
+		{
+		return KErrNoMemory;
+		}
+	TRAP_IGNORE(MainL());
+	delete cleanup;
+	__UHEAP_MARKEND;
+	return KErrNone;
+    }
+
+CTestStep* CTestContactSuite::CreateTestStep(const TDesC& aStepName)
+/**
+ * @return - A CTestStep derived instance
+ * Secure and non-secure variants
+ * Implementation of CTestServer pure virtual
+ */
+	{
+	CTestStep* testStep = NULL;
+	// They are created "just in time" when the worker thread is created
+	// More test steps can be added below
+
+             if(aStepName == KTestAddFieldsStep)
+              	{
+              	testStep = new CTestAddFieldsStep();
+              	}
+             else if (aStepName == KTestUpdateFieldsStep)
+				{
+				testStep = new CTestUpdateFieldsStep();
+				}
+			 else if (aStepName == KTestDeleteFieldsStep)
+				{
+				testStep = new CTestDeleteFieldsStep();
+				}
+			else if (aStepName == KTestAddMultipleContactsStep)
+				{
+				testStep = new CTestAddMultipleContactsStep();
+				}
+			else if (aStepName == KTestUpdateMultipleContactsStep)
+				{
+				testStep = new CTestUpdateMultipleContactsStep();
+				}	
+			else if (aStepName == KTestDeleteMultipleContactsStep)
+				{
+				testStep = new CTestDeleteMultipleContactsStep();
+				}
+			else if (aStepName == KTestContactPerformanceStep)
+				{
+				testStep = new CTestContactPerformanceStep();
+				}
+	return testStep;
+	}