--- a/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpSessionSRTP.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/rtpstack/tsrc/ut_rtpstack/src/UT_CRtpSessionSRTP.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -521,29 +521,14 @@
delete iTestMKI128Bits;
delete iTestAuthTag80Bits;
- iDecryptedPayload = NULL;
- iTestPayload160Bits = NULL;
- iTestMKI128Bits = NULL;
- iTestAuthTag80Bits = NULL;
-
delete iStreamIn;
delete iStreamOut;
delete iSRTPSession;
-
- iStreamIn = NULL;
- iStreamOut = NULL;
- iSRTPSession = NULL;
-
+
delete iRFC3711_SessionEncrKey128bits;
delete iRFC3711_SessionSaltKey128bits;
delete iRFC3711_SessionAuthKey128bits;
-
- iRFC3711_SessionEncrKey128bits = NULL;
- iRFC3711_SessionSaltKey128bits = NULL;
- iRFC3711_SessionAuthKey128bits = NULL;
-
-
- iRFC3711_TestMasterKey128bits.Zero();
+ iRFC3711_TestMasterKey128bits.Zero();
iRFC3711_TestMasterSalt112bits.Zero();
iMKI.Zero();
@@ -662,7 +647,7 @@
RTP_EUNIT_ASSERT_EQUALS(status, KErrNone)
}
-void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendRtpPacket_OneL( )
+void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendRtpPacket_1L( )
{
//Test more branch
TInt error( KErrNone );
@@ -698,7 +683,7 @@
RTP_EUNIT_ASSERT_EQUALS(status, KErrNone)
}
-void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendRtpPacket_OneAL( )
+void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendRtpPacket_1AL( )
{
TInt error( KErrNone );
@@ -772,7 +757,7 @@
}
- void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendRtpPacket_TwoAL( )
+ void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendRtpPacket_2AL( )
{
TInt error( KErrNone );
@@ -886,7 +871,7 @@
}
-void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_OnRtpReceived_OneL( )
+void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_OnRtpReceived_1L( )
{
//cover more branch
@@ -937,7 +922,7 @@
}
-void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendSRTCPReportL()
+void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_SendSRTCPReport()
{
TInt error( KErrNone );
TRtpSSRC ssrcOut( 1234 );
@@ -1005,7 +990,7 @@
}
-void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_OnRtcpReceivedL()
+void UT_CRtpSessionSrtp::UT_CRtpSessionSrtp_OnRtcpReceived()
{
HBufC8* encSrtcpPacket =HBufC8::NewLC(KRTCPPacket().Length());
*encSrtcpPacket=KRTCPPacket;
@@ -1119,14 +1104,14 @@
"CRtpSessionSrtp",
"SendRtpPacket",
"FUNCTIONALITY",
- SetupL, UT_CRtpSessionSrtp_SendRtpPacket_OneL, Teardown)
+ SetupL, UT_CRtpSessionSrtp_SendRtpPacket_1L, Teardown)
EUNIT_TEST(
"SendRtpPacket4 - test ",
"CRtpSessionSrtp",
"SendRtpPacket",
"FUNCTIONALITY",
- SetupL, UT_CRtpSessionSrtp_SendRtpPacket_OneAL, Teardown)
+ SetupL, UT_CRtpSessionSrtp_SendRtpPacket_1AL, Teardown)
EUNIT_TEST(
"SendRtpPacket5 - test ",
@@ -1140,7 +1125,7 @@
"CRtpSessionSrtp",
"SendRtpPacket",
"FUNCTIONALITY",
- SetupL, UT_CRtpSessionSrtp_SendRtpPacket_TwoAL, Teardown)
+ SetupL, UT_CRtpSessionSrtp_SendRtpPacket_2AL, Teardown)
EUNIT_TEST(
"OnRtpReceived1 - test ",
@@ -1154,20 +1139,20 @@
"CRtpSessionSrtp",
"OnRtpReceived",
"FUNCTIONALITY",
- SetupL, UT_CRtpSessionSrtp_OnRtpReceived_OneL, Teardown)
+ SetupL, UT_CRtpSessionSrtp_OnRtpReceived_1L, Teardown)
EUNIT_TEST(
"SendSRTCPReport ",
"CRtpSessionSrtp",
"SendSRTCPReport",
"FUNCTIONALITY",
- SetupL, UT_CRtpSessionSrtp_SendSRTCPReportL, Teardown)
+ SetupL, UT_CRtpSessionSrtp_SendSRTCPReport, Teardown)
EUNIT_TEST(
"OnRtcpReceived ",
"CRtpSessionSrtp",
"OnRtcpReceived",
"FUNCTIONALITY",
- SetupL, UT_CRtpSessionSrtp_OnRtcpReceivedL, Teardown)
+ SetupL, UT_CRtpSessionSrtp_OnRtcpReceived, Teardown)
EUNIT_END_TEST_TABLE