--- a/telephonyserverplugins/common_tsy/test/component/src/cctsysmsmessagingfu.cpp	Fri Apr 16 16:12:37 2010 +0300
+++ b/telephonyserverplugins/common_tsy/test/component/src/cctsysmsmessagingfu.cpp	Mon May 03 13:37:20 2010 +0300
@@ -1008,6 +1008,12 @@
     // that have iDeleteAfterClientAck = true
     //-------------------------------------------------------------------------
 
+    // Since Ack failed, the CTSY needs to ask to activate the sms routing again
+    data.Close();
+    compSmsRoutingTsyData.SerialiseL(data);
+    iMockLTSY.ExpectL(EMmTsyActivateSmsRouting);    
+    iMockLTSY.CompleteL(EMmTsyActivateSmsRouting, KErrNone, data);
+
     // make the server expect an acknowledgement
     messaging.ReceiveMessage(reqReceiveStatus, forMsg, receiveAttrPckg);
 
@@ -1476,7 +1482,13 @@
     // TEST B1, test NackSmsStored() when there are sms received
     // that have iDeleteAfterClientAck = true
     //-------------------------------------------------------------------------
-    
+  
+    // Since Nack failed, the CTSY needs to ask to activate the sms routing again  
+    data.Close();
+    compSmsRoutingTsyData.SerialiseL(data);
+    iMockLTSY.ExpectL(EMmTsyActivateSmsRouting);    
+    iMockLTSY.CompleteL(EMmTsyActivateSmsRouting, KErrNone, data);
+
     // make the server expect an acknowledgement
     messaging.ReceiveMessage(reqReceiveStatus, forMsg, receiveAttrPckg);
 
@@ -3005,11 +3017,9 @@
 
     User::WaitForRequest(reqStatus);
 
-    ERR_PRINTF2(_L("<font color=Orange>$CTSYKnownFailure: defect id = %d</font>"), 360701);
-    //SetReceiveModeCancel() is never called, the request cancel can't be completed
-    // Remove the function and correct comment in mm_messaging.cpp
-
-    ASSERT_EQUALS(KErrCancel, reqStatus.Int());
+    // Since SetReceiveMode completes without any delays, the cancel will not have any effect.
+    // The CMmSmsTsy::SetReceiveModeCancel should be removed from the code in the next cleanup, since it never been called.
+    ASSERT_EQUALS(KErrNone, reqStatus.Int());
 
     AssertMockLtsyStatusL();