--- a/telephonyserverplugins/common_tsy/test/integration/src/comparisonfunctions.cpp	Thu May 06 15:10:38 2010 +0100
+++ b/telephonyserverplugins/common_tsy/test/integration/src/comparisonfunctions.cpp	Wed Jun 02 16:33:50 2010 +0100
@@ -206,18 +206,28 @@
 		{
 		if(aLogError == ELogError)
 			{
+			TBuf<255> apn, username, password;
+			apn.Copy(iValue.iAccessPointName);
+			username.Copy(iValue.iProtocolConfigOption.iAuthInfo.iUsername);
+			password.Copy(iValue.iProtocolConfigOption.iAuthInfo.iPassword);
 			_LIT(KAssertRPacketContextErrorEqualsTextA,"FAILURE");
 			_LIT(KAssertRPacketContextErrorEqualsTextB," Got apn=%S,username=%S,password=%S");
 			_LIT(KAssertRPacketContextErrorEqualsTextC," Expected apn=%S,username=%S,password=%S");
 			ERR_PRINTF1(KAssertRPacketContextErrorEqualsTextA);
 			ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextB, 
-				&iValue.iAccessPointName,
-				&iValue.iProtocolConfigOption.iAuthInfo.iUsername,
-				&iValue.iProtocolConfigOption.iAuthInfo.iPassword);
+				&apn,
+				&username,
+				&password);
+			apn.SetLength(0);
+			username.SetLength(0);
+			password.SetLength(0);
+			apn.Copy(iExpected.iAccessPointName);
+			username.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iUsername);
+			password.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iPassword);
 			ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextC,
-				&iExpected.iAccessPointName,
-				&iExpected.iProtocolConfigOption.iAuthInfo.iUsername,
-				&iExpected.iProtocolConfigOption.iAuthInfo.iPassword);	
+				&apn,
+				&username,
+				&password);	
 			}
 		return EFalse;
 		}
@@ -246,18 +256,30 @@
 		{
 		if(aLogError == ELogError)
 			{
+			TBuf<255> apn, username, password;
+			apn.Copy(iValue.iAccessPointName);
+			username.Copy(iValue.iProtocolConfigOption.iAuthInfo.iUsername);
+			password.Copy(iValue.iProtocolConfigOption.iAuthInfo.iPassword);
+
 			_LIT(KAssertRPacketContextErrorEqualsTextA,"FAILURE");
 			_LIT(KAssertRPacketContextErrorEqualsTextB," Got apn=%S,username=%S,password=%S");
 			_LIT(KAssertRPacketContextErrorEqualsTextC," Expected apn=%S,username=%S,password=%S");
 			ERR_PRINTF1(KAssertRPacketContextErrorEqualsTextA);
 			ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextB, 
-				&iValue.iAccessPointName,
-				&iValue.iProtocolConfigOption.iAuthInfo.iUsername,
-				&iValue.iProtocolConfigOption.iAuthInfo.iPassword);
+				&apn,
+				&username,
+				&password);
+			apn.SetLength(0);
+			username.SetLength(0);
+			password.SetLength(0);
+			apn.Copy(iExpected.iAccessPointName);
+			username.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iUsername);
+			password.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iPassword);
 			ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextC,
-				&iExpected.iAccessPointName,
-				&iExpected.iProtocolConfigOption.iAuthInfo.iUsername,
-				&iExpected.iProtocolConfigOption.iAuthInfo.iPassword);	
+				&apn,
+				&username,
+				&password);	
+
 			}
 		return EFalse;
 		}
@@ -286,18 +308,28 @@
 		{
 		if(aLogError == ELogError)
 			{
+			TBuf<255> apn, username, password;
+			apn.Copy(iValue.iAccessPointName);
+			username.Copy(iValue.iProtocolConfigOption.iAuthInfo.iUsername);
+			password.Copy(iValue.iProtocolConfigOption.iAuthInfo.iPassword);
 			_LIT(KAssertRPacketContextErrorEqualsTextA,"FAILURE");
 			_LIT(KAssertRPacketContextErrorEqualsTextB," Got apn=%S,username=%S,password=%S");
 			_LIT(KAssertRPacketContextErrorEqualsTextC," Expected apn=%S,username=%S,password=%S");
 			ERR_PRINTF1(KAssertRPacketContextErrorEqualsTextA);
 			ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextB, 
-				&iValue.iAccessPointName,
-				&iValue.iProtocolConfigOption.iAuthInfo.iUsername,
-				&iValue.iProtocolConfigOption.iAuthInfo.iPassword);
+				&apn,
+				&username,
+				&password);
+			apn.SetLength(0);
+			username.SetLength(0);
+			password.SetLength(0);
+			apn.Copy(iExpected.iAccessPointName);
+			username.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iUsername);
+			password.Copy(iExpected.iProtocolConfigOption.iAuthInfo.iPassword);
 			ERR_PRINTF4(KAssertRPacketContextErrorEqualsTextC,
-				&iExpected.iAccessPointName,
-				&iExpected.iProtocolConfigOption.iAuthInfo.iUsername,
-				&iExpected.iProtocolConfigOption.iAuthInfo.iPassword);	
+				&apn,
+				&username,
+				&password);	
 			}
 		return EFalse;
 		}