--- a/graphicscomposition/surfaceupdate/tsrc/tsurfaceupdate.cpp	Thu May 27 14:13:51 2010 +0300
+++ b/graphicscomposition/surfaceupdate/tsrc/tsurfaceupdate.cpp	Fri Jun 11 14:58:47 2010 +0300
@@ -1759,56 +1759,6 @@
 	}
 
 /**
-  @SYMTestCaseID GRAPHICS-SURFACEUPDATE-0019
-
-
-  @SYMPREQ 1007
-  
-  @SYMREQ 8223
-
-  @SYMTestCaseDesc Starting the surface update server in two different threads.
-
-  @SYMTestPriority High
-
-  @SYMTestStatus Implemented
-
-  @SYMTestActions Start the surface update server in two different threads.
-  	
-  @SYMTestExpectedResults Thread 1: KErrNone
-     Thread 2: KErrAlreadyExists.
-*/
-void CTSurfaceUpdate::TestCase12L()
-	{
-	MSurfaceUpdateServerProvider *surfaceUpdateProvider = NULL;
-	TInt res = StartSurfaceUpdateServer(surfaceUpdateProvider);
-	TEST(res == KErrNone);
-	User::LeaveIfError(res);
-
-	_LIT(KThreadName, "TestServerStartupTwoThreads");
-	TTime tm;
-	TBuf<32> buf;
-	tm.UniversalTime();
-	TRAP(res, tm.FormatL(buf, _L("_%H%T%S%C")));
-	TEST(res == KErrNone);
-	User::LeaveIfError(res);
-	TBuf<128> threadName(KThreadName);
-	threadName.Append(buf); //guarantee uniqueness  of the thread name
-	RThread thread;
-	res = thread.Create(threadName,
-			TestServerStartupTwoThreads,
-			KDefaultStackSize,
-			&User::Heap(),
-			NULL);
-	TEST(res == KErrNone);
-	User::LeaveIfError(res);
-	TRequestStatus rendezvousStatus;
-	thread.Rendezvous(rendezvousStatus);
-	thread.Resume();
-	User::WaitForRequest(rendezvousStatus);
-	TEST(KErrAlreadyExists == rendezvousStatus.Int());
-	}
-	
-/**
 Starting the update server in another thread - called from TestCase12
 */
 TInt CTSurfaceUpdate::TestServerStartupTwoThreads(TAny*)
@@ -2252,28 +2202,20 @@
 		}
 	case 12:
  		{
- 		((CTSurfaceUpdateStep*)iStep)->SetTestStepID(_L("GRAPHICS-SURFACEUPDATE-0019"));
- 		INFO_PRINTF1(_L("TestCase12"));
- 		TRAPD(ret, TestCase12L());
- 		TEST(ret == KErrNone);
- 		break;
-		}
-	case 13:
- 		{
  		((CTSurfaceUpdateStep*)iStep)->SetTestStepID(_L("GRAPHICS-SURFACEUPDATE-0020"));
  		INFO_PRINTF1(_L("TestCase13L"));
  		TRAPD(ret, TestCase13L());
  		TEST(ret == KErrNone);
  		break;
 		}
-	case 14:
+	case 13:
  		{
  		((CTSurfaceUpdateStep*)iStep)->SetTestStepID(_L("GRAPHICS-SURFACEUPDATE-0022"));
  		INFO_PRINTF1(_L("TestCase14"));
  		TestCase14();
  		break;
 		}
-	case 15:
+	case 14:
  		{
 		((CTSurfaceUpdateStep*)iStep)->SetTestStepID(_L("GRAPHICS-SURFACEUPDATE-0023"));
  		INFO_PRINTF1(_L("TestCase15"));
@@ -2281,7 +2223,7 @@
  		TEST(ret == KErrNone);
  		break;
 		}
-	case 16:
+	case 15:
  		{
 		((CTSurfaceUpdateStep*)iStep)->SetTestStepID(_L("GRAPHICS-SURFACEUPDATE-0024"));
  		INFO_PRINTF1(_L("TestCase16"));
@@ -2289,7 +2231,7 @@
  		TEST(ret == KErrNone);
  		break;
 		}
-	case 17:
+	case 16:
  		{
 		((CTSurfaceUpdateStep*)iStep)->SetTestStepID(_L("GRAPHICS-SURFACEUPDATE-0028"));
  		INFO_PRINTF1(_L("TestCase17"));
@@ -2297,7 +2239,7 @@
  		TEST(ret == KErrNone);
  		break;
 		}
-	case 18:
+	case 17:
  		{
 		((CTSurfaceUpdateStep*)iStep)->SetTestStepID(_L("GRAPHICS-SURFACEUPDATE-0025"));
  		INFO_PRINTF1(_L("TestCase18"));
@@ -2305,7 +2247,7 @@
  		TEST(ret == KErrNone);
  		break;
 		}
-	case 19:
+	case 18:
 		{
 		((CTSurfaceUpdateStep*)iStep)->SetTestStepID(_L("GRAPHICS-SURFACEUPDATE-0027"));
 	 	INFO_PRINTF1(_L("TestCaseNotifyWhenAvailableGlobal"));
@@ -2313,7 +2255,7 @@
  		TEST(ret == KErrNone);
  		break;
 		}
-	case 20:
+	case 19:
 		{
 		((CTSurfaceUpdateStep*)iStep)->SetTestStepID(_L("GRAPHICS-SURFACEUPDATE-0029"));
 	 	INFO_PRINTF1(_L("TestCaseRegisterIdenticalPrioritiesL"));
@@ -2321,7 +2263,7 @@
  		TEST(ret == KErrNone);
  		break;
 		}
-	case 21:
+	case 20:
  		{//should be the last test case
 		((CTSurfaceUpdateStep*)iStep)->SetTestStepID(_L("GRAPHICS-SURFACEUPDATE-0021"));
  		INFO_PRINTF1(_L("TestCaseTerminateServer"));