--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPStreamOut.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPStreamOut.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -334,16 +334,10 @@
{
delete iDecryptedPayload;
delete iTestPayload160Bits;
-
- iDecryptedPayload = NULL;
- iTestPayload160Bits = NULL;
//delete iTestMKI128Bits;
delete iStreamOut;
delete iSRTPSession;
-
- iStreamOut = NULL;
- iSRTPSession = NULL;
delete iRFC3711_SessionEncrKey128bits;
@@ -352,23 +346,17 @@
delete iRFC3711_RtcpEncrKey128bits;
delete iRFC3711_RtcpSaltKey128bits;
delete iRFC3711_RtcpAuthKey128bits;
-
- iRFC3711_SessionEncrKey128bits = NULL;
- iRFC3711_SessionSaltKey128bits = NULL;
- iRFC3711_SessionAuthKey128bits = NULL;
- iRFC3711_RtcpEncrKey128bits = NULL;
- iRFC3711_RtcpSaltKey128bits = NULL;
- iRFC3711_RtcpAuthKey128bits = NULL;
+
}
-void UT_CSRTPStreamOut::UT_CSRTPStreamOut_NewL_OneL( )
+void UT_CSRTPStreamOut::UT_CSRTPStreamOut_NewL_1L( )
{
CSRTPStreamOut* tempStreamOut = CSRTPStreamOut::NewL(*iSRTPSession, (TUint)1);
EUNIT_ASSERT(tempStreamOut->SSRC()== 1);
delete tempStreamOut;
}
-void UT_CSRTPStreamOut::UT_CSRTPStreamOut_NewL_TwoL( )
+void UT_CSRTPStreamOut::UT_CSRTPStreamOut_NewL_2L( )
{
HBufC8* masterKey = HBufC8::NewL(KRFC3711_TestMasterKey128bits().Length());
CleanupStack::PushL( masterKey );
@@ -411,7 +399,7 @@
delete srtpSession;
}
-void UT_CSRTPStreamOut::UT_CSRTPStreamOut_NewL_ThreeL( )
+void UT_CSRTPStreamOut::UT_CSRTPStreamOut_NewL_3L( )
{
HBufC8* masterKey = HBufC8::NewL(KRFC3711_TestMasterKey128bits().Length());
CleanupStack::PushL( masterKey );
@@ -776,20 +764,20 @@
"CSRTPStreamOut",
"NewL",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStreamOut_NewL_OneL, Teardown)
+ SetupL, UT_CSRTPStreamOut_NewL_1L, Teardown)
EUNIT_TEST(
"NewL2 - test ",
"CSRTPStreamOut",
"NewL2",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStreamOut_NewL_TwoL, Teardown)
+ SetupL, UT_CSRTPStreamOut_NewL_2L, Teardown)
EUNIT_TEST(
"NewL3 - test ",
"CSRTPStreamOut",
"NewL3",
"FUNCTIONALITY",
- SetupL, UT_CSRTPStreamOut_NewL_ThreeL, Teardown)
+ SetupL, UT_CSRTPStreamOut_NewL_3L, Teardown)
EUNIT_TEST(
"ProtectRtpL - test ",