--- a/authenticationservices/authenticationserver/group/bld.inf	Thu Jul 01 18:10:29 2010 +0530
+++ b/authenticationservices/authenticationserver/group/bld.inf	Thu Jul 22 18:30:16 2010 +0530
@@ -30,9 +30,6 @@
 
 PRJ_EXPORTS
 
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/authserver/authserver_client.h		/epoc32/include/authserver/authserver_client.h
-#endif
 ../inc/authserver/authclient.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/authclient.h)
 ../inc/authserver/authexpression.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/authexpression.h)
 ../inc/authserver/authexpression.inl		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/authexpression.inl)
@@ -46,9 +43,6 @@
 ../inc/authserver/protectionkey.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/protectionkey.h)
 ../inc/authserver/aspubsubdefs.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/aspubsubdefs.h)
 ../inc/authserver/idandstring.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/idandstring.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/authserver/log.h						/epoc32/include/authserver/log.h
-#endif
 ../inc/authserver/authpatchdata.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(authserver/authpatchdata.h)
 
 

--- a/authenticationservices/authenticationserver/group/security_authserver.mrp	Thu Jul 01 18:10:29 2010 +0530
+++ b/authenticationservices/authenticationserver/group/security_authserver.mrp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-
 component	security_authserver
 source	\sf\os\security\authenticationservices\authenticationserver
 binary	\sf\os\security\authenticationservices\authenticationserver\group	all

--- a/authorisation/userpromptservice/database/source/upsdb.cpp	Thu Jul 01 18:10:29 2010 +0530
+++ b/authorisation/userpromptservice/database/source/upsdb.cpp	Thu Jul 22 18:30:16 2010 +0530
@@ -20,7 +20,7 @@
 /**
  @file
  @internalTechnology
- @prototype
+ @released
 */
 
 #include "upsdbw.h"

--- a/authorisation/userpromptservice/database/source/upsdbcompact.cpp	Thu Jul 01 18:10:29 2010 +0530
+++ b/authorisation/userpromptservice/database/source/upsdbcompact.cpp	Thu Jul 22 18:30:16 2010 +0530
@@ -20,7 +20,7 @@
 /**
  @file
  @internalTechnology
- @prototype
+ @released
 */
  
 #include "upsdbw.h"

--- a/authorisation/userpromptservice/database/source/upsdbw.cpp	Thu Jul 01 18:10:29 2010 +0530
+++ b/authorisation/userpromptservice/database/source/upsdbw.cpp	Thu Jul 22 18:30:16 2010 +0530
@@ -20,7 +20,7 @@
 /**
  @file
  @internalTechnology
- @prototype
+ @released
 */
 
 #include "upsdbw.h"

--- a/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbbase.cpp	Thu Jul 01 18:10:29 2010 +0530
+++ b/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbbase.cpp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -348,7 +348,7 @@
 	}
 	
 
-RPointerArray<CDecisionRecord> CUpsDbBaseStep::GetDecisionsL(CDecisionDbW &aUpsDb, CDecisionFilter &aFilter, TBool aCancel)
+void CUpsDbBaseStep::GetDecisionsL(CDecisionDbW &aUpsDb, CDecisionFilter &aFilter, TBool aCancel, RPointerArray<CDecisionRecord>& aRecordList)
 /**
    Get a set of decision records from the database. Uses multiple records lookup method (RDbView).
    Prints the consumed time to perform this operation.
@@ -363,7 +363,6 @@
 
 	dbView->EvaluateView(iWaiter->iStatus);
 	TInt num = 0;
-	RPointerArray<CDecisionRecord> recordList;
 	if(aCancel)
 		{
 		dbView->Cancel();
@@ -371,18 +370,16 @@
 		}
 	else
 		{
-		iWaiter->WaitActiveL(KErrNone);	
-		CleanupClosePushL(recordList);
+		iWaiter->WaitActiveL(KErrNone);
 		CDecisionRecord *record = NULL;		
 		
 		while((record = dbView->NextDecisionL()) != NULL)
 			{
 			CleanupStack::PushL(record);
 			num++;
-			recordList.AppendL(record);
+			aRecordList.AppendL(record);
 			CleanupStack::Pop(record);
 			}
-		CleanupStack::Pop(&recordList);	
 		}
 	
 	//Timer is stopped
@@ -391,8 +388,6 @@
 	
 	INFO_PRINTF3(_L("%d records retrieved in %Ld microseconds."), num, elapsedTime);
 	CleanupStack::PopAndDestroy(dbView);
-
-	return recordList;
 	}
 	
 
@@ -555,7 +550,7 @@
 	
 	CDecisionRecord *record = NULL;
 	CDecisionFilter *filter = NULL;
-	RPointerArray<CDecisionRecord> recordList;
+	RPointerArray<CDecisionRecord> recordList;	
 	TBuf8<KUpsMaxFingerprintLength> bufFp;
 	TBuf8<KUpsMaxClientEntityLength> bufCe;
 	TBuf<KUpsDescriptionLength> bufDes;
@@ -572,16 +567,16 @@
 		InsertRecordL(aUpsDb,*record);
 		
 		filter = CreateFilterLC(flag,clientId,evaluatorId,serviceId,serverId,bufFp,bufCe,policyVersion,recordId,bufDes,result,evaluatorInfo,EEqual);
-		recordList = GetDecisionsL(aUpsDb,*filter,EFalse);
+		CleanupResetAndDestroyPushL(recordList);
+		GetDecisionsL(aUpsDb, *filter, EFalse, recordList);
 		if(recordList.Count() != 1)
 			{
 			SetTestStepResult(EFail);
+			CleanupStack::PopAndDestroy(3, record);
 			break;
-			}
-		recordList.Close();	
-		CleanupStack::PopAndDestroy(2,record);
-		}
-	
+			}		
+		CleanupStack::PopAndDestroy(3, record);
+		}	
 	}
 
 

--- a/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbperformance.cpp	Thu Jul 01 18:10:29 2010 +0530
+++ b/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbperformance.cpp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -107,40 +107,41 @@
 	filter->SetClientSid(clientId,EEqual);
 	
 	INFO_PRINTF2(_L("Lookup for ClientSid=%d"),clientId.iUid);
-	
-	RPointerArray<CDecisionRecord> recordList = GetDecisionsL(*decisionDb,*filter,EFalse);
-	recordList.Reset();
-	CleanupStack::PopAndDestroy(filter);
+	RPointerArray<CDecisionRecord> recordList;
+	CleanupResetAndDestroyPushL(recordList);
+
+	GetDecisionsL(*decisionDb, *filter, EFalse, recordList);	
+	CleanupStack::PopAndDestroy(2, filter);
 	
 	//Get a set of decision records with EvaluatorId
 	TUid evaluatorId = TUid::Uid(iRetrieveNum%iEvaluatorNum + 1000000 + iRecordNum);
 	filter = CDecisionFilter::NewLC();
 	filter->SetEvaluatorId(evaluatorId,EEqual);
-	
+	CleanupResetAndDestroyPushL(recordList);
 	INFO_PRINTF2(_L("Lookup for EvaluatorId=%d"),evaluatorId.iUid);
 	
-	GetDecisionsL(*decisionDb,*filter,EFalse);
-	CleanupStack::PopAndDestroy(filter);
+	GetDecisionsL(*decisionDb, *filter, EFalse, recordList);
+	CleanupStack::PopAndDestroy(2, filter);
 	
 	//Get a set of decision records with ServiceId
 	TUid serviceId = TUid::Uid(iRetrieveNum%iServiceNum + 10000 + iRecordNum);
 	filter = CDecisionFilter::NewLC();
 	filter->SetServiceId(serviceId,EEqual);
-	
+	CleanupResetAndDestroyPushL(recordList);
 	INFO_PRINTF2(_L("Lookup for ServiceId=%d"),serviceId.iUid);
 	
-	GetDecisionsL(*decisionDb,*filter,EFalse);
-	CleanupStack::PopAndDestroy(filter);
+	GetDecisionsL(*decisionDb, *filter, EFalse, recordList);
+	CleanupStack::PopAndDestroy(2, filter);
 	
 	//Get a set of decision records with ServerSid
 	TUid serverId = TUid::Uid(iRetrieveNum%iServerNum + 100000 + iRecordNum);
 	filter = CDecisionFilter::NewLC();
 	filter->SetServerSid(serverId,EEqual);
-	
+	CleanupResetAndDestroyPushL(recordList);
 	INFO_PRINTF2(_L("Lookup for ServerSid=%d"),serverId.iUid);
 	
-	GetDecisionsL(*decisionDb,*filter,EFalse);
-	CleanupStack::PopAndDestroy(filter);
+	GetDecisionsL(*decisionDb, *filter, EFalse, recordList);
+	CleanupStack::PopAndDestroy(2, filter);
 	
 	//Lookup for Fingerprint
 	TBuf8<KDbMaxName>bufFP;
@@ -151,11 +152,11 @@
 	filter = CDecisionFilter::NewLC();
 		
 	filter->SetFingerprintL(md5FP->Hash(bufFP),EEqual);
-	
+	CleanupResetAndDestroyPushL(recordList);
 	INFO_PRINTF1(_L("Lookup for a Fingerprint"));
 	
-	GetDecisionsL(*decisionDb,*filter,EFalse);
-	CleanupStack::PopAndDestroy(filter);
+	GetDecisionsL(*decisionDb, *filter, EFalse, recordList);
+	CleanupStack::PopAndDestroy(2, filter);
 	
 	//Lookup for ClientEntity
 	TBuf8<KDbMaxName>bufCE;
@@ -166,11 +167,11 @@
 	filter = CDecisionFilter::NewLC();
 	
 	filter->SetClientEntityL(md5CE->Hash(bufCE),EEqual);
-	
+	CleanupResetAndDestroyPushL(recordList);
 	INFO_PRINTF1(_L("Lookup for a ClientEntity"));
 	
-	GetDecisionsL(*decisionDb,*filter,EFalse);
-	CleanupStack::PopAndDestroy(filter);
+	GetDecisionsL(*decisionDb, *filter, EFalse, recordList);
+	CleanupStack::PopAndDestroy(2, filter);
 	
 	//Get a single record
 	md5FP->Reset();

--- a/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbstep.cpp	Thu Jul 01 18:10:29 2010 +0530
+++ b/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbstep.cpp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -449,23 +449,23 @@
 			upsDb = CDecisionDbW::NewL(iDbLocation,iFs);
 			CleanupStack::PushL(upsDb);
 			
-			RPointerArray<CDecisionRecord> recordList = GetDecisionsL(*upsDb,*filter,iCancel);
+			RPointerArray<CDecisionRecord> recordList;
+			CleanupResetAndDestroyPushL(recordList);
+			GetDecisionsL(*upsDb, *filter, iCancel, recordList);
 			
 			TInt recNum;
 			recNum = recordList.Count();
 			if(recNum)
-				{
-				CleanupClosePushL(recordList);
+				{				
 				OpenDecisionFileL(EFileWrite);
 			
 				for(TInt i=0; i<recNum; ++i)
 					{
 					WriteDecisionL(*recordList[i]);
 					}
-				CloseDecisionFile();
-				CleanupStack::Pop(&recordList);
+				CloseDecisionFile();				
 				}
-			recordList.Close();
+			CleanupStack::PopAndDestroy(&recordList);			
 				
 			TInt expectedRecords;
 			if(EFalse == GetIntFromConfig(ConfigSection(),KExpectedRecords,expectedRecords))

--- a/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbstep.h	Thu Jul 01 18:10:29 2010 +0530
+++ b/authorisation/userpromptservice/database/test/tupsdb/source/tupsdbstep.h	Thu Jul 22 18:30:16 2010 +0530
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -32,6 +32,7 @@
 #include <test/tefunit.h>
 #include <hash.h>
 #include "upscommon.h"
+#include <scs/cleanuputils.h>
 
 using namespace UserPromptService;
 
@@ -113,7 +114,7 @@
 	CDecisionRecord *GetDecisionLC(CDecisionDbW &aUpsDb, CDecisionFilter &aFilter);
 
 	//Get a set of decision records from the database
-	RPointerArray<CDecisionRecord> GetDecisionsL(CDecisionDbW &aUpsDb, CDecisionFilter &aFilter, TBool aCancel);
+	void GetDecisionsL(CDecisionDbW &aUpsDb, CDecisionFilter &aFilter, TBool aCancel, RPointerArray<CDecisionRecord>& aRecordList);
 
 	//Delete a set of records
 	void RemoveDecisionsL(CDecisionDbW &aUpsDb, CDecisionFilter &aFilter);	

--- a/authorisation/userpromptservice/group/bld.inf	Thu Jul 01 18:10:29 2010 +0530
+++ b/authorisation/userpromptservice/group/bld.inf	Thu Jul 22 18:30:16 2010 +0530
@@ -24,13 +24,14 @@
 #include "../examples/bld.inf"
 
 PRJ_EXPORTS
-../inc/ups.hrh			/epoc32/include/ups/ups.hrh
+../inc/ups.hrh			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ups/ups.hrh)
 ../inc/upsconst.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ups/upsconst.h)
 ../inc/upserr.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ups/upserr.h)
 ../inc/upstypes.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ups/upstypes.h)
 ../inc/ups.iby			/epoc32/rom/include/ups.iby
 
 
+
 PRJ_TESTEXPORTS
 ../inc/tups.iby				/epoc32/rom/include/tups.iby
 ../inc/tups_integ.iby		/epoc32/rom/include/tups_integ.iby

--- a/authorisation/userpromptservice/group/security_ups.mrp	Thu Jul 01 18:10:29 2010 +0530
+++ b/authorisation/userpromptservice/group/security_ups.mrp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,18 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
 
 component	security_ups
 source	\sf\os\security\authorisation\userpromptservice\bwins

--- a/authorisation/userpromptservice/server/source/upsclient/upsclientserver.cpp	Thu Jul 01 18:10:29 2010 +0530
+++ b/authorisation/userpromptservice/server/source/upsclient/upsclientserver.cpp	Thu Jul 22 18:30:16 2010 +0530
@@ -20,7 +20,7 @@
 /**
  @file
  @internalTechnology
- @prototype
+ @released
 */
 #include <s32strm.h>
 #include <ups/upstypes.h>

--- a/authorisation/userpromptservice/test/inc_private/tups_notifiertypes.h	Thu Jul 01 18:10:29 2010 +0530
+++ b/authorisation/userpromptservice/test/inc_private/tups_notifiertypes.h	Thu Jul 22 18:30:16 2010 +0530
@@ -20,7 +20,7 @@
 /**
  @file
  @internalTechnology 
- @prototype 
+ @released 
 */
 
 #ifndef TUPSNOTIFIERTYPES_H

--- a/authorisation/userpromptservice/test/tups/corrupted_db_integ/ups_corrupted2.db	Thu Jul 01 18:10:29 2010 +0530
+++ b/authorisation/userpromptservice/test/tups/corrupted_db_integ/ups_corrupted2.db	Thu Jul 22 18:30:16 2010 +0530
@@ -1,2 +1,2 @@
-  The chances of interpreting this file as a real ups database are the same of England winning the
+  The chances of interpreting this file as a real ups database are the same of England winning the
   next football world cup. 
\ No newline at end of file

--- a/authorisation/userpromptutils/group/security_ups_utils.mrp	Thu Jul 01 18:10:29 2010 +0530
+++ b/authorisation/userpromptutils/group/security_ups_utils.mrp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,18 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
 
 component	security_ups_utils
 source	\sf\os\security\authorisation\userpromptutils

--- a/contentmgmt/cafrecogniserconfig/ABLD.BAT	Thu Jul 01 18:10:29 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-@ECHO OFF
-
-REM Bldmake-generated batch file - ABLD.BAT
-REM ** DO NOT EDIT **
-
-perl -S ABLD.PL "\sf\os\security\contentmgmt\cafrecogniserconfig\\" %1 %2 %3 %4 %5 %6 %7 %8 %9
-if errorlevel==1 goto CheckPerl
-goto End
-
-:CheckPerl
-perl -v >NUL
-if errorlevel==1 echo Is Perl, version 5.003_07 or later, installed?
-goto End
-
-:End

--- a/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafrecogniserconfig/security_reccafconfig.mrp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-
 component		security_reccafconfig
 binary			\sf\os\security\contentmgmt\cafrecogniserconfig all
 exports			\sf\os\security\contentmgmt\cafrecogniserconfig security_caf2

--- a/contentmgmt/cafstreamingsupport/group/bld.inf	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/group/bld.inf	Thu Jul 22 18:30:16 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
@@ -49,6 +49,7 @@
 
 #ifndef TOOLS
 #ifndef TOOLS2
+
 // Common test stream agent implementation projects 
 stashared.mmp
 staclient.mmp		
@@ -69,13 +70,8 @@
 PRJ_TESTEXPORTS
 
 ../test/tscaf/scripts/tscaf.ini				z:/tcaf/tscaf/tscaf.ini
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 ../test/tscaf/scripts/tscaf.script				z:/tcaf/tscaf/tscaf.script
 ../test/tscaf/scripts/tscaf_oom.script			z:/tcaf/tscaf/tscaf_oom.script
-#else
-../test/tscaf/scripts/tscaf_without_upward_dependent.script				z:/tcaf/tscaf/tscaf.script
-../test/tscaf/scripts/tscaf_oom_without_upward_dependent.script			z:/tcaf/tscaf/tscaf_oom.script
-#endif
 ../test/tscaf/scripts/tscafipsec.script			z:/tcaf/tscaf/tscafipsec.script
 ../test/tscaf/scripts/tscafipsec_oom.script			z:/tcaf/tscaf/tscafipsec_oom.script
 ../test/tscaf/scripts/tscafipsecmanual.script			z:/tcaf/tscaf/tscafipsecmanual.script

--- a/contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/group/security_streamingcaf.mrp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-
 component		security_streamingcaf
 source			\sf\os\security\contentmgmt\cafstreamingsupport
 binary			\sf\os\security\contentmgmt\cafstreamingsupport\group all

--- a/contentmgmt/cafstreamingsupport/group/staclient.mmp	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/group/staclient.mmp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
@@ -25,9 +25,10 @@
 
 USERINCLUDE 	../test/streamingtestagent/inc
 USERINCLUDE 	../../referencedrmagent/RefTestAgent/streamingrefagent/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/api
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 SOURCEPATH 	../test/streamingtestagent/source/client
 SOURCE 		staclient.cpp
@@ -36,9 +37,7 @@
 LIBRARY		scsclient.lib
 LIBRARY		estor.lib
 LIBRARY		cafutils.lib
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
-LIBRARY		sdpcodec.lib
-#endif
+LIBRARY		localsdpcodec.lib
 LIBRARY		stashared.lib
 LIBRARY 	streamingcaf.lib efsrv.lib
 SMPSAFE

--- a/contentmgmt/cafstreamingsupport/group/staserver.mmp	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/group/staserver.mmp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
@@ -23,10 +23,12 @@
 CAPABILITY	DRM NetworkControl NetworkServices
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 USERINCLUDE 	../test/streamingtestagent/inc
 USERINCLUDE 	../../referencedrmagent/RefTestAgent/streamingrefagent/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/api
+
 
 SOURCEPATH 	../test/streamingtestagent/source/server
 SOURCE 		staserver.cpp
@@ -38,9 +40,7 @@
 LIBRARY		efsrv.lib
 LIBRARY		cafutils.lib
 LIBRARY		estor.lib
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
-LIBRARY		sdpcodec.lib
-#endif
+LIBRARY		localsdpcodec.lib
 LIBRARY		bafl.lib
 LIBRARY		stashared.lib
 LIBRARY 	streamingcaf.lib

--- a/contentmgmt/cafstreamingsupport/group/stashared.mmp	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/group/stashared.mmp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
@@ -26,9 +26,11 @@
 USERINCLUDE 	../test/streamingtestagent/inc
 USERINCLUDE 	../test/streamingtestagent_singleprocess/inc
 USERINCLUDE 	../../referencedrmagent/RefTestAgent/streamingrefagent/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/api
+
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 SOURCEPATH 	../test/streamingtestagent/source/shared
 SOURCE		testprotstrdesc.cpp
@@ -45,9 +47,7 @@
 LIBRARY		estor.lib
 LIBRARY		staclient.lib
 LIBRARY		srautils.lib
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
-LIBRARY		sdpcodec.lib
-#endif
+LIBRARY		localsdpcodec.lib
 LIBRARY		efsrv.lib
 LIBRARY		bafl.lib
 SMPSAFE

--- a/contentmgmt/cafstreamingsupport/group/tscaf.mmp	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/group/tscaf.mmp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
@@ -46,9 +46,11 @@
 USERINCLUDE	../test/streamingtestagent/inc
 USERINCLUDE	../test/streamingtestagent_singleprocess/inc
 USERINCLUDE	../../referencedrmagent/RefTestAgent/streamingrefagent/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/api
+
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY euser.lib 
 LIBRARY estlib.lib
@@ -59,9 +61,7 @@
 LIBRARY testexecutelogclient.lib
 LIBRARY rfileloggerclient.lib
 LIBRARY cafutils.lib
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
-LIBRARY sdpcodec.lib
-#endif
+LIBRARY localsdpcodec.lib
 LIBRARY bafl.lib
 LIBRARY streamingcaf.lib
 LIBRARY stashared.lib

--- a/contentmgmt/cafstreamingsupport/group/tscaf_singleprocess_streamagent.mmp	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/group/tscaf_singleprocess_streamagent.mmp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
@@ -35,15 +35,15 @@
 USERINCLUDE 	../test/streamingtestagent_singleprocess/inc
 USERINCLUDE 	../test/streamingtestagent/inc
 USERINCLUDE 	../../referencedrmagent/RefTestAgent/streamingrefagent/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/api
+
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY 	euser.lib
 LIBRARY		streamingcaf.lib
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
-LIBRARY		sdpcodec.lib
-#endif
+LIBRARY		localsdpcodec.lib
 LIBRARY 	stashared.lib 
 LIBRARY 	srautils.lib
 

--- a/contentmgmt/cafstreamingsupport/group/tscaf_streamagent01.mmp	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/group/tscaf_streamagent01.mmp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
@@ -34,15 +34,15 @@
 
 USERINCLUDE 	../test/streamingtestagent/inc
 USERINCLUDE 	../../referencedrmagent/RefTestAgent/streamingrefagent/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/api
+
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY 	euser.lib
 LIBRARY		streamingcaf.lib
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
-LIBRARY		sdpcodec.lib
-#endif
+LIBRARY		localsdpcodec.lib
 LIBRARY		stashared.lib
 LIBRARY		srautils.lib
 

--- a/contentmgmt/cafstreamingsupport/group/tscaf_streamagent02.mmp	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/group/tscaf_streamagent02.mmp	Thu Jul 22 18:30:16 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of the License "Eclipse Public License v1.0"
@@ -34,15 +34,15 @@
 
 USERINCLUDE 	../test/streamingtestagent/inc
 USERINCLUDE 	../../referencedrmagent/RefTestAgent/streamingrefagent/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/inc
+USERINCLUDE 	../../referencedrmagent/RefTestAgent/localsdp/api
+
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY 	euser.lib
 LIBRARY		streamingcaf.lib
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
-LIBRARY		sdpcodec.lib
-#endif
+LIBRARY		localsdpcodec.lib
 LIBRARY		stashared.lib
 LIBRARY		srautils.lib
 

--- a/contentmgmt/cafstreamingsupport/test/streamingtestagent/inc/stacommon.h	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/test/streamingtestagent/inc/stacommon.h	Thu Jul 22 18:30:16 2010 +0530
@@ -31,14 +31,14 @@
 #include <e32uid.h>
 #include <s32mem.h>
 #include <stringpool.h>
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
-#include <sdpdocument.h>
-#include <sdpmediafield.h>
-#include <sdpattributefield.h>
-#include <sdpcodecstringpool.h>
-#include <sdpfmtattributefield.h>
-#include <sdpcodecstringconstants.h>
-#endif
+
+#include "sdpdocument.h"
+#include "sdpmediafield.h"
+#include "sdpattributefield.h"
+#include "sdpcodecstringpool.h"
+#include "sdpfmtattributefield.h"
+#include "sdpcodecstringconstants.h"
+
 #include <caf/streaming/streamcaftypes.h>
 #include <caf/streaming/keyassociation.h>
 #include <caf/streaming/keystreamsink.h>

--- a/contentmgmt/cafstreamingsupport/test/streamingtestagent/inc/staserver.h	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/test/streamingtestagent/inc/staserver.h	Thu Jul 22 18:30:16 2010 +0530
@@ -74,10 +74,8 @@
 	private:
 		HBufC8* iBuffer;
 		CKeyStreamSink* iKeyStreamSink;
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 		CSdpMediaField* iSdp;
 		CSdpDocument* iSdpDoc;
-#endif
 		CSraRightsObject* iRo;
 		};
 	

--- a/contentmgmt/cafstreamingsupport/test/streamingtestagent/source/client/staclient.cpp	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/test/streamingtestagent/source/client/staclient.cpp	Thu Jul 22 18:30:16 2010 +0530
@@ -151,15 +151,10 @@
  	@param aKey An SDP object data.
  */
 	{
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 	HBufC8* sdpBuf(0);
 	TPtr8 ptr(EncodeLC(aSdp, sdpBuf));
 	User::LeaveIfError(CallSessionFunction(ESetSdpKeyStream, TIpcArgs(&ptr)));
 	CleanupStack::PopAndDestroy(sdpBuf);
-#else
-	(void) aSdp;
-#endif
-
 	}
 
 EXPORT_C void RStaClient::SetSdpDocumentL(const CSdpDocument& aSdpDoc) const
@@ -168,15 +163,10 @@
  	@param aKey An SDP object data.
  */
 	{
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 	HBufC8* sdpDocBuf(0);
 	TPtr8 ptr(EncodeLC(aSdpDoc, sdpDocBuf));
 	User::LeaveIfError(CallSessionFunction(ESetSdpDocument, TIpcArgs(&ptr)));
 	CleanupStack::PopAndDestroy(sdpDocBuf);
-#else
-	(void) aSdpDoc;
-#endif
-
 	}
 
 EXPORT_C void RStaClient::SendIpSecAssociationL(TInt32 aSpi, HBufC8* aEncryptionKey, HBufC8* aAuthenticationKey) const

--- a/contentmgmt/cafstreamingsupport/test/streamingtestagent/source/server/staserver.cpp	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/test/streamingtestagent/source/server/staserver.cpp	Thu Jul 22 18:30:16 2010 +0530
@@ -66,9 +66,7 @@
  */
 	{
 	iFs.Close();
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 	SdpCodecStringPool::Close();
-#endif
 	}
 	
 	
@@ -96,9 +94,7 @@
 	User::LeaveIfError(iFs.Connect());
 	User::LeaveIfError(iFs.ShareProtected());
 	User::LeaveIfError(iFs.CreatePrivatePath(iFs.GetSystemDrive()));
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 	SdpCodecStringPool::OpenL();
-#endif
 	StartL(KStaName);
 	}
 

--- a/contentmgmt/cafstreamingsupport/test/streamingtestagent/source/server/stasession.cpp	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/test/streamingtestagent/source/server/stasession.cpp	Thu Jul 22 18:30:16 2010 +0530
@@ -39,10 +39,8 @@
 	delete iBuffer;	
 	delete iKeyStreamSink;
 	delete iRo;
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 	delete iSdp;
 	delete iSdpDoc;
-#endif
 	}
 
 	
@@ -347,7 +345,6 @@
  	@param	aMessage	Standard server-side handle to message.
   */
 	{
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 	TInt len = aMessage.GetDesMaxLengthL(0);
 	HBufC8* des = HBufC8::NewLC(len);
 	TPtr8 ptr(des->Des());
@@ -367,10 +364,6 @@
 		{
 		User::Leave(KErrCANoRights);
 		}
-#else
-	(void) aMessage;
-	User::Leave(KErrCANoRights);
-#endif
 	}
 
 void CStaSession::SetSdpDocumentL(const RMessage2& aMessage)
@@ -380,7 +373,6 @@
  	@param	aMessage	Standard server-side handle to message.
   */
 	{
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 	TInt len = aMessage.GetDesMaxLengthL(0);
 	HBufC8* des = HBufC8::NewLC(len);
 	TPtr8 ptr(des->Des());
@@ -393,9 +385,6 @@
 	// Decode the SDP document object from the encoded data
 	iSdpDoc = CSdpDocument::DecodeL(*des);
 	CleanupStack::PopAndDestroy(des);
-#else
-	(void) aMessage;
-#endif
 	}
 
 void CStaSession::VerifyRoL()

--- a/contentmgmt/cafstreamingsupport/test/streamingtestagent_singleprocess/source/shared/testsingleprocesskeystreamdecoder.cpp	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/test/streamingtestagent_singleprocess/source/shared/testsingleprocesskeystreamdecoder.cpp	Thu Jul 22 18:30:16 2010 +0530
@@ -41,10 +41,8 @@
 	iFs.Close();
 	
 	delete iKeyStreamSink;
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY	
 	delete iSdp;
 	delete iSdpDoc;
-#endif
 	delete iRo;
 	}
 
@@ -93,13 +91,8 @@
 	iKeyStreamSink->SetEncryptionAlgorithmL(EAES_128_CBC);
 	iKeyStreamSink->SetAuthenticationAlgorithmL(EHMAC_SHA1);
 
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY	
 	iSdp = aSdpKeyStream.CloneL();
 	iSdpDoc = aSdpDoc.CloneL();
-#else
-    (void) aSdpKeyStream;
-	(void) aSdpDoc;
-#endif
 	SetRoL();
 	}
 

--- a/contentmgmt/cafstreamingsupport/test/tscaf/inc/tscafstep.h	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/test/tscaf/inc/tscafstep.h	Thu Jul 22 18:30:16 2010 +0530
@@ -111,11 +111,9 @@
 	TVerdict doTestStepL();
 	TVerdict doTestStepPostambleL();
 	void CleanAgentsPrivateFolderL(const TDesC& aPrivatePath);
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 	CSdpDocument* CreateSdpDocumentLC();
 	CSdpMediaField* CreateSdpLC(TInt aSdpNum);
 	void AddMediaFieldL(CSdpDocument& aSdpDoc, const CSdpMediaField* aSdpKeyStream);
-#endif
 	CKeyStreamSink* CreateKeyStreamSinkLC(const TDesC& aFilePath, const TDesC& aPrivPath);
 	void CopyFile2AgentsPrivateFolderL(RFs& aFs, const TDesC& aFileName, const TDesC& aPrivPath);
 	HBufC* GetFullPathLC(const TDesC& aPath, const TDesC& aFileName);
@@ -139,9 +137,7 @@
 									const TDesC& aExpectedValue);
 	
 private:
-#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 	void AddAttributes2SdpL(CSdpMediaField& aSdp, TInt aSdpNum);
-#endif
 	void PrintErrorAndLeaveL(TDesC& aKey);
 	static void DeleteSdpDocAndCloseCodecPool(TAny* aSdpDoc);
 	

--- a/contentmgmt/cafstreamingsupport/test/tscaf/scripts/data/ropostacquisition.dr	Thu Jul 01 18:10:29 2010 +0530
+++ b/contentmgmt/cafstreamingsupport/test/tscaf/scripts/data/ropostacquisition.dr	Thu Jul 22 18:30:16 2010 +0530
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?> 
-<drmrights>
-	<rights cid="PostAcquisitionTest">
-		<Intent type="display">
-			<count>
-			33
-			</count>
-			<expiry>
-				<day>
-				11
-				</day>
-				<month>
-				11
-				</month>
-				<year>
-				2011
-				</year>
-			</expiry>				
-		</Intent>
-	</rights>
-</drmrights>
-
+<?xml version="1.0" encoding="ISO-8859-1" ?> 
+<drmrights>
+	<rights cid="PostAcquisitionTest">
+		<Intent type="display">
+			<count>
+			33
+			</count>
+			<expiry>
+				<day>
+				11
+				</day>
+				<month>
+				11
+				</month>
+				<year>
+				2011
+				</year>
+			</expiry>				
+		</Intent>
+	</rights>
+</drmrights>
+

--- a/contentmgmt/cafstreamingsupport/test/tscaf/scripts/tscaf_oom_without_upward_dependent.script	Thu Jul 01 18:10:29 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-//
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-// Streaming CAF "Out of Memory" Tests
-
-PRINT Run PREQ782 Streaming CAF OOM Tests
-
-// Load Suite
-LOAD_SUITE tscaf
-
-
-//! @SYMTestCaseID 		SEC-SCAF-OOM-0001
-//! @SYMTestCaseDesc 		StartupComms
-
-START_TESTCASE SEC-SCAF-OOM-0001
-RUN_TEST_STEP 100 tscaf StartupCommsStep
-END_TESTCASE SEC-SCAF-OOM-0001
-
-
-// Note: For test case descriptions, please refer to the corresponding tscaf.script file
-
-
-//********************** SEC-SCAF-A : CONSUMER INTERFACE  **********************
-
- 
-//! @SYMTestCaseID 		SEC-SCAF-OOM-A001
-//! @SYMTestCaseDesc 		(keystreamdecoder_positiveconstruct_OOM)
-
-START_TESTCASE SEC-SCAF-OOM-A001
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_Program
-RUN_TEST_STEP 100 tscaf SCAFKeyStreamDecoderConstruct z:\tcaf\tscaf\tscaf.ini keystreamdecoder_positiveconstruct_OOM
-END_TESTCASE SEC-SCAF-OOM-A001
-
-
-//! @SYMTestCaseID 		SEC-SCAF-OOM-A004
-//! @SYMTestCaseDesc 		(keystreamdecoder_positivequery_OOM)
-
-START_TESTCASE SEC-SCAF-OOM-A004
-
-// Copy the necessary 'Program' Protected rights objects into the stream agent's private directory
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_Program
-RUN_TEST_STEP tscaf SCAFKeyStreamDecoderAttributes z:\tcaf\tscaf\tscaf.ini keystreamdecoder_positivequery_programprotectedRO_OOM
-
-// Copy the necessary 'Service' Protected rights objects into the stream agent's private directory
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_Service
-RUN_TEST_STEP tscaf SCAFKeyStreamDecoderAttributes z:\tcaf\tscaf\tscaf.ini keystreamdecoder_positivequery_serviceprotectedRO_OOM
-
-END_TESTCASE SEC-SCAF-OOM-A004
-
-
-
-//! @SYMTestCaseID 		SEC-SCAF-OOM-A008
-//! @SYMTestCaseDesc 		(multikeystreamdecoders_OOM)
-
-START_TESTCASE SEC-SCAF-OOM-A008
-
-// Copy the necessary rights objects into the stream agent's private directory
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_ServiceProgram
-
-// 2 Key Stream Decoders, Invoking the same stream agent
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini multikeystreamdecoders_singlethread_singleagent_OOM
-
-// 2 Key Stream Decoders, Invoking different stream agents
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini multikeystreamdecoders_singlethread_multiagents_OOM
-
-END_TESTCASE SEC-SCAF-OOM-A008
-
-
-
-//************	SEC-SCAF-C : INTEROPERABILITY WITH DECODING STACK   ***********
-
-
-//! @SYMTestCaseID 		SEC-SCAF-OOM-C001
-//! @SYMTestCaseDesc 		(keystreamsinks_OOM)
-
-START_TESTCASE SEC-SCAF-OOM-C001
-RUN_TEST_STEP 100 tscaf SCAFKeyStreamSink z:\tcaf\tscaf\tscaf.ini sdp_service_protected_OOM
-END_TESTCASE SEC-SCAF-OOM-C001
-
-
-
-//! @SYMTestCaseID 		SEC-SCAF-OOM-C002
-//! @SYMTestCaseDesc 		(concurrent_keystreamsinks_OOM)
-
-START_TESTCASE SEC-SCAF-OOM-C002
-RUN_TEST_STEP 150 tscaf SCAFConcurrentKeyStreamSinks z:\tcaf\tscaf\tscaf.ini concurrent_keystreamsinks_OOM
-END_TESTCASE SEC-SCAF-OOM-C002
-
-
-
-//********************** SEC-SCAF-D : POST-ACQUISITION  **********************
-
-
-//! @SYMTestCaseID 		SEC-SCAF-OOM-D001
-//! @SYMTestCaseDesc 		(postacqusition_OOM)
-
-START_TESTCASE SEC-SCAF-OOM-D001
-
-RUN_TEST_STEP 100 tscaf SCAFPostAcquisition z:\tcaf\tscaf\tscaf.ini post_acquisition_OOM
-
-RUN_TEST_STEP 100 tscaf SCAFPostAcquisition z:\tcaf\tscaf\tscaf.ini post_acquisition_create_outputs_OOM
-
-END_TESTCASE SEC-SCAF-OOM-D001
-
-
-
-//********************** SEC-SCAF-E : INTEROPERABILITY WITH DECODING STACK - IPSEC    ***********
-
-RUN_SCRIPT z:\tcaf\tscaf\tscafipsec_oom.script
-
-
-
-//********************** SEC-SCAF-H : REFERENCE AGENT TEST  **********************
-
-//! @SYMTestCaseID 		SEC-SCAF-OOM-H001
-//! @SYMTestCaseDesc 		(referenceagent_OOM)
-
-START_TESTCASE SEC-SCAF-OOM-H001
-RUN_TEST_STEP 100 tscaf SCAFRefAgent z:\tcaf\tscaf\tscaf.ini reference_agent_OOM
-END_TESTCASE SEC-SCAF-OOM-H001
-
-

--- a/contentmgmt/cafstreamingsupport/test/tscaf/scripts/tscaf_without_upward_dependent.script	Thu Jul 01 18:10:29 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,566 +0,0 @@
-//
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-// Streaming CAF Integration Tests
-
-PRINT Run PREQ782 Streaming CAF Integration Tests
-
-// Load Suite
-LOAD_SUITE tscaf
-
-
-//! @SYMTestCaseID 		SEC-SCAF-MISC-0001
-//! @SYMTestCaseDesc 		StartupComms
-
-START_TESTCASE SEC-SCAF-MISC-0001
-RUN_TEST_STEP 100 tscaf StartupCommsStep
-END_TESTCASE SEC-SCAF-MISC-0001
-
-
-//********************** SEC-SCAF-A : CONSUMER INTERFACE  **********************
-
-//! @SYMTestCaseID 		SEC-SCAF-A001
-//! @SYMTestCaseDesc 		Key stream decoder construction with a supported protected key stream description
-//! 				(keystreamdecoder_positiveconstruct)
-//! @SYMPREQ 			PREQ782
-//! @SYMREQ 			REQ7772, REQ7776, REQ7781, REQ7784, REQ7954
-//! @SYMTestPriority 		Critical
-//! @SYMTestStatus   		Implemented
-//! @SYMTestActions 		Preconditions:
-//!				• There are the necessary ROM based test stream agent plug-ins present that support 
-//!				the SDP media description supplied during construction of the key stream decoder.
-//!
-//!				Test Actions:
-//!				• Generate a protected key stream description.
-//!				• Generate an SDP media description for the key stream.
-//!				• Construct the key stream decoder using the protected stream description and SDP
-//!				media description objects previously generated.
-//!				• Destroy the key stream decoder object.
-//!
-//! @SYMTestExpectedResults 	• The key stream decoder is successfully created and destroyed.
-//! @SYMTestType 		CIT
-
-START_TESTCASE SEC-SCAF-A001
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_Program
-RUN_TEST_STEP 100 tscaf SCAFKeyStreamDecoderConstruct z:\tcaf\tscaf\tscaf.ini keystreamdecoder_positiveconstruct
-END_TESTCASE SEC-SCAF-A001
-
-
-
-//! @SYMTestCaseID 		SEC-SCAF-A004
-//! @SYMTestCaseDesc 		Querying attributes related to a key stream decoder
-//! 				(keystreamdecoder_positivequery)
-//! @SYMPREQ 			PREQ782
-//! @SYMREQ 			REQ7772, REQ7776, REQ7784, REQ7954
-//! @SYMTestPriority 		Critical
-//! @SYMTestStatus   		Implemented
-//! @SYMTestActions  		Preconditions:
-//!				• The necessary ROM based test stream agent plug-in is present that supports the SDP
-//!				media description 	
-//!				supplied during construction of the key stream decoder.
-//!				• There are two Rights Objects files (serviceProtectedRO and programProtectedRO) in
-//!				the private folder of the supporting test stream agent.
-//!				• The Rights Issuer URI of the serviceProtectedRO is set to “IssuerUriServiceProtectedRO”
-//!				and programProtectedRO is set to “IssuerUriProgramProtectedRO”
-//!			
-//!				Test Actions:
-//!				• Generate a protected key stream description.
-//!				• Generate an SDP media description for the key stream with an attribute requiring 
-//!				programProtectedRO
-//!				• Construct the key stream decoder using the protected stream description and SDP media 
-//!				description objects previously generated.
-//!				• Query the stream agent to determine whether the program is protected.
-//!				• Query the stream agent to determine whether the whole service is protected.
-//!				• Query the stream agent to retrieve the Rights Issuer URI.
-//!				• Destroy the key stream decoder object.
-//!				
-//! @SYMTestExpectedResults 	• The key stream decoder is successfully created.
-//!				• The program is protected but the whole service is not.
-//!				• The Rights Issuer URI retrieved is “IssuerUriProgramProtectedRO”
-//!
-//! @SYMTestType 		CIT
-
-START_TESTCASE SEC-SCAF-A004
-
-// Copy the necessary 'Program' Protected rights objects into the stream agent's private directory
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_Program
-RUN_TEST_STEP tscaf SCAFKeyStreamDecoderAttributes z:\tcaf\tscaf\tscaf.ini keystreamdecoder_positivequery_programprotectedRO
-
-// Copy the necessary 'Service' Protected rights objects into the stream agent's private directory
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_Service
-RUN_TEST_STEP tscaf SCAFKeyStreamDecoderAttributes z:\tcaf\tscaf\tscaf.ini keystreamdecoder_positivequery_serviceprotectedRO
-
-END_TESTCASE SEC-SCAF-A004
-
-//! @SYMTestCaseID 		SEC-SCAF-A007
-//! @SYMTestCaseDesc 		Concurrent key stream decoder construction and querying
-//! 				(keystreamdecoder_concurrentquery)
-//! @SYMPREQ 			PREQ782
-//! @SYMREQ 			REQ7772, REQ7776, REQ7781, REQ7784, REQ7954
-//! @SYMTestPriority 		Critical
-//! @SYMTestStatus   		Implemented
-//! @SYMTestActions  		Preconditions:
-//!				The following test actions should be carried out concurrently in 3 separate threads:
-//!				• Generate a protected key stream description.
-//!				• Generate an SDP media description. Thread A should generate an SDP media description
-//!				supported by test stream agent plug-in A and Threads B & C should generate SDP media
-//!				description objects supported by test stream agent plug-in B.
-//!				• Construct a key stream decoder object using the generated protected key stream
-//!				description and SDP media description objects.
-//!				• When the key stream decoder has been constructed, query the attributes associated
-//!				with the stream agent.
-//!				• Destroy the key stream decoder object.
-//!
-//! @SYMTestExpectedResults 	• Each key stream decoder object should construct successfully.
-//!				• Checking the implementation attributes reveals that Thread A has invoked test stream
-//!				agent A and Thread B & C have invoked test stream agent B.
-//!
-//! @SYMTestType 		CIT
-
-START_TESTCASE SEC-SCAF-A007
-
-// Copy the necessary rights objects into the stream agent's private directory
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_ServiceProgram
-
-CONCURRENT
-RUN_TEST_STEP tscaf SCAFKeyStreamDecoderAttributes z:\tcaf\tscaf\tscaf.ini keystreamdecoder_concurrentquery_threadA
-RUN_TEST_STEP tscaf SCAFKeyStreamDecoderAttributes z:\tcaf\tscaf\tscaf.ini keystreamdecoder_concurrentquery_threadB
-RUN_TEST_STEP tscaf SCAFKeyStreamDecoderAttributes z:\tcaf\tscaf\tscaf.ini keystreamdecoder_concurrentquery_threadC
-CONSECUTIVE
-
-END_TESTCASE SEC-SCAF-A007
-
-
-
-//! @SYMTestCaseID 		SEC-SCAF-A008
-//! @SYMTestCaseDesc 		Concurrent multi-thread usage of multiple key stream decoders
-//! 				(multikeystreamdecoders)
-//! @SYMPREQ 			PREQ782
-//! @SYMREQ 			REQ7772, REQ7775, REQ7776, REQ7781, REQ7784, REQ7954
-//! @SYMTestPriority 		Critical
-//! @SYMTestStatus   		Implemented
-//! @SYMTestActions  		Preconditions:
-//!				The following test actions should be carried out concurrently in 3 separate threads:
-//!				• Generate a protected key stream description.
-//!				• Generate an SDP media description (SDPa) for the key stream with an attribute
-//!				requiring serviceProtectedRO.
-//!				• Construct a key stream decoder object using the generated protected key stream
-//!				description and SDP media description object SDPa – decoderA.
-//!				• Generate another SDP media description (SDPb) for the key stream with an attribute
-//!				requiring programProtectedRO.
-//!				• Construct another key stream decoder object using the generated protected key stream
-//!				description and SDP media description object SDPb – decoderB.
-//!				• Query decoderA to retrieve the ‘Rights Issuer URI’ attribute from the invoked 
-//!				stream agent.
-//!				• Query decoderB to retrieve the ‘Rights Issuer URI’ attribute from the invoked 
-//!				stream agent.
-//!				• Destroy both key stream decoder objects.			
-//!
-//! @SYMTestExpectedResults 	• Each key stream decoder object should construct successfully.
-//!				• The Rights Issuer URI  attribute value retrieved from decoderA is 
-//!				“IssuerUriServiceProtectedRO”
-//!				• The Rights Issuer URI  attribute value retrieved from decoderB is 
-//!				“IssuerUriProgramProtectedRO”
-//!
-//! @SYMTestType 		CIT
-
-START_TESTCASE SEC-SCAF-A008
-
-// Copy the necessary rights objects into the stream agent's private directory
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_ServiceProgram
-
-// 2 Key Stream Decoders, Invoking the same stream agent
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini multikeystreamdecoders_singlethread_singleagent
-
-// 2 Key Stream Decoders, Invoking different stream agents
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini multikeystreamdecoders_singlethread_multiagents
-
-// 3 concurrent threads, 2 key stream decoders per thread invoking the same agent
-CONCURRENT
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini multikeystreamdecoders_concurrent_singleagent_threadA
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini multikeystreamdecoders_concurrent_singleagent_threadB
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini multikeystreamdecoders_concurrent_singleagent_threadC
-CONSECUTIVE
-
-// 3 concurrent threads, 2 key stream decoders per thread invoking different agents 
-CONCURRENT
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini multikeystreamdecoders_concurrent_multiagents_threadA
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini multikeystreamdecoders_concurrent_multiagents_threadB
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini multikeystreamdecoders_concurrent_multiagents_threadC
-CONSECUTIVE
-
-END_TESTCASE SEC-SCAF-A008
-
-
-
-//******************	TEST STREAM AGENT UNIT TESTING	    *******************
-
-//! @SYMTestCaseID SEC-SCAF-S001
-//! @SYMTestCaseDesc A unit test step which tests the Test Streaming Agent
-//! 		     (StreamingTestAgent)
-//! @SYMREQ Req-b
-//! @SYMTestPriority Low
-//! @SYMTestActions A connection is established with the Test Agent Server via its client side and the closed.  
-//! @SYMTestExpectedResults Successful connection and disconnectiom to/from the Test Streaming Agent Server. 
-//! @SYMDevelopedForRelease Oghma
-
-START_TESTCASE SEC-SCAF-S001
-RUN_TEST_STEP 100 tscaf SCAFTestAgentServer
-END_TESTCASE SEC-SCAF-S001
-
-
-
-//************	SEC-SCAF-C : INTEROPERABILITY WITH DECODING STACK   ***********
-
-
-//! @SYMTestCaseID 		SEC-SCAF-C001
-//! @SYMTestCaseDesc 		Usage of key stream sink
-//! 				(keystreamsinks)
-//! @SYMPREQ 			PREQ782
-//! @SYMREQ 			REQ7774, REQ7778, REQ7786
-//! @SYMTestPriority 		Critical
-//! @SYMTestStatus   		Implemented
-//! @SYMTestActions  		Preconditions:
-//!				• There are the necessary ROM based test stream agent plug-ins present that support 
-//!				the SDP media description supplied during construction of each key stream decoder.
-//!				• There is a Right Object file in the private folder of the supporting test stream agent.
-//!
-//!				Test Actions:
-//!				• Create a key stream sink
-//!				• Create a plain key and encrypt it with the key extracted from the RO
-//!				• Connect to the Test Agent
-//!				• Send the key stream sink
-//!				• Send the encrypted string (a simple key stream)
-//!				• The test agent server decrypts the key stream by using the key from the RO.
-//!				• The test agent server processes the decrypted key (the key is written into a file 
-//!				defined in the key stream sink)
-//!				• Check whether the right plain key is written down 
-//!				• Destroy the key stream decoder object.				
-//!
-//! @SYMTestExpectedResults 	• The plain string is found in the predefined location.
-//!
-//! @SYMTestType 		CIT
-
-START_TESTCASE SEC-SCAF-C001
-RUN_TEST_STEP 100 tscaf SCAFKeyStreamSink z:\tcaf\tscaf\tscaf.ini sdp_service_protected
-END_TESTCASE SEC-SCAF-C001
-
-
-
-//! @SYMTestCaseID 		SEC-SCAF-C002
-//! @SYMTestCaseDesc 		Usage of key stream sinks in concurrent sessions
-//! 				(concurrent_keystreamsinks)
-//! @SYMPREQ 			PREQ782
-//! @SYMREQ 			REQ7774, REQ7778, REQ7786
-//! @SYMTestPriority 		Critical
-//! @SYMTestStatus   		Preconditions:
-//!				• There are the necessary ROM based test stream agent plug-ins present that support
-//!				the SDP media description supplied during construction of each key stream decoder.
-//!				• There are two Rights Object files (serviceProtectedRO and programProtectedRO) in the
-//!				private folder of each test stream agent.
-//!
-//!				Test Actions:
-//!				• Generate a protected key stream description.
-//!				• Generate an SDP media description (SDPa) for the key stream with an attribute requiring
-//!				serviceProtectedRO.
-//!				• Construct a key stream decoder object using the generated protected key stream 
-//!				description and SDP media description object SDPa – decoderA.
-//!				• Generate another SDP media description (SDPb) for the key stream with an attribute requiring 
-//!				programProtectedRO.
-//!				• Construct another key stream decoder object using the generated protected key stream 
-//!				description and SDP media description object SDPb – decoderB.
-//!				• Create plain_keyA
-//!				• Encrypt plain_keyA with encryption_keyA extracted from serviceProtectedRO
-//!				• Send the encrypted plain_keyA using decoderA
-//!				• Create plain_keyB
-//!				• Encrypt plain_keyB with encryption_keyB extracted from programProtectedRO
-//!				• Send the encrypted plain_keyB using decoderB
-//!				• Check whether stringA is in pathA and stringB is in pathB
-//!				• Destroy both key stream decoder objects.				
-//!
-//! @SYMTestExpectedResults 	• The plain strings are found in the predefined locations.
-//!
-//! @SYMTestType 		CIT
-
-START_TESTCASE SEC-SCAF-C002
-RUN_TEST_STEP 100 tscaf SCAFConcurrentKeyStreamSinks z:\tcaf\tscaf\tscaf.ini concurrent_keystreamsinks
-END_TESTCASE SEC-SCAF-C002
-
-
-
-//********************** SEC-SCAF-D : POST-ACQUISITION  **********************
-
-
-//! @SYMTestCaseID 		SEC-SCAF-D001
-//! @SYMTestCaseDesc 		Post-acquisition content protection
-//! 				(postacqusition)
-//! @SYMPREQ 			PREQ782
-//! @SYMREQ 			REQ7788
-//! @SYMTestPriority 		Critical
-//! @SYMTestStatus   		Implemented
-//! @SYMTestActions  		Preconditions:
-//!				The following test actions should be carried out:
-//!				• Copy  rorecordable.dr (a rights object where ECanExport and EMustProtectIfRecording
-//!				flags shall be set) and its post-acquistion rights object (ropostacquisition.dr) into
-//!				the private directory of the test agent server.
-//!			      	• Generate a test key stream description
-//!				• Generate an SDP media description for the key stream with an attribute requiring 
-//!				rorecordable.dr
-//!				• Construct the key stream decoder using the protected key stream description and SDP
-//!				media description objects previously generated.
-//!				• Query the stream agent to determine whether it is allowed to export and record the 
-//!				content.
-//!				• Request and gets a handle to the postacqusition rights object file
-//!				• Import the postacqusition rights object file to the post-acquisition caf agent
-//!                     	• Open a session to import the content
-//!				• Import the content to the post-acquisition caf agent	
-//!
-//! @SYMTestExpectedResults 	
-//!				• The protected stream is allowed to be recorded
-//!				• The test streaming agent returns a handle of the post-acquistion RO successfully
-//!				• The post-acquistion RO is successfully imported to the post-acquisition caf agent
-//!
-//! @SYMTestType 		CIT
-
-START_TESTCASE SEC-SCAF-D001
-
-RUN_TEST_STEP 100 tscaf SCAFPostAcquisition z:\tcaf\tscaf\tscaf.ini post_acquisition
-
-RUN_TEST_STEP 100 tscaf SCAFPostAcquisition z:\tcaf\tscaf\tscaf.ini post_acquisition_create_outputs
-
-END_TESTCASE SEC-SCAF-D001
-
-
-
-//********************** SEC-SCAF-E : INTEROPERABILITY WITH DECODING STACK - IPSEC    ***********
-
-RUN_SCRIPT z:\tcaf\tscaf\tscafipsec.script
-
-
-
-//********************** SEC-SCAF-G : SINGLE PROCESS STREAM AGENT TESTING  **********************
-
-//! @SYMTestCaseID 		SEC-SCAF-G001
-//! @SYMTestCaseDesc 		SPSA - Key stream decoder construction with a supported protected key stream description
-//! 				(spsa_keystreamdecoder_positiveconstruct)
-//! @SYMPREQ 			PREQ782
-//! @SYMREQ 			
-//! @SYMTestPriority 		High
-//! @SYMTestStatus   		Implemented
-//! @SYMTestActions  		Preconditions:
-//!				• The necessary ROM based ‘single process’ stream agent plug-in is present that supports
-//!				the SDP media description supplied during construction of the key stream decoder.
-//!
-//!				Test Actions:
-//!				• Run the test step actions as described in test case SEC-SCAF-A001.
-//!
-//! @SYMTestExpectedResults 	• The key stream decoder constructed by the single process stream agent is successfully 
-//!				created and destroyed.
-//!
-//! @SYMTestType 		CIT
-
-START_TESTCASE SEC-SCAF-G001
-RUN_TEST_STEP 100 tscaf SCAFKeyStreamDecoderConstruct z:\tcaf\tscaf\tscaf.ini spsa_keystreamdecoder_positiveconstruct
-END_TESTCASE SEC-SCAF-G001
-
-
-
-//! @SYMTestCaseID 		SEC-SCAF-G002
-//! @SYMTestCaseDesc 		SPSA - Querying attributes related to a key stream decoder
-//! 				(spsa_keystreamdecoder_positivequery)
-//! @SYMPREQ 			PREQ782
-//! @SYMREQ 			
-//! @SYMTestPriority 		High
-//! @SYMTestStatus   		Implemented
-//! @SYMTestActions  		Preconditions:
-//!				• The necessary ROM based ‘single process’ stream agent plug-in is present that supports
-//!				the SDP media description supplied during construction of the key stream decoder.
-//!				• The required Rights Object file is present in the private folder for the supporting 
-//!				single process stream agent.
-//!
-//!				Test Actions:
-//!				• Run the test step actions as described in test case SEC-SCAF-A004.				
-//!
-//! @SYMTestExpectedResults 	• The key stream decoder constructed by the single process stream agent is successfully
-//!				created.
-//!				• All of the expected attribute values match their corresponding values retrieved from
-//!				the key stream decoder.
-//!
-//! @SYMTestType 		CIT
-
-START_TESTCASE SEC-SCAF-G002
-
-// Copy the necessary 'Program' Protected rights objects into the single process stream agent's private directory
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_Program_SingleProcessAgent
-RUN_TEST_STEP tscaf SCAFKeyStreamDecoderAttributes z:\tcaf\tscaf\tscaf.ini spsa_keystreamdecoder_positivequery_programprotectedRO
-
-// Copy the necessary 'Service' Protected rights objects into the single process stream agent's private directory
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_Service_SingleProcessAgent
-RUN_TEST_STEP tscaf SCAFKeyStreamDecoderAttributes z:\tcaf\tscaf\tscaf.ini spsa_keystreamdecoder_positivequery_serviceprotectedRO
-
-END_TESTCASE SEC-SCAF-G002
-
-
-
-//! @SYMTestCaseID 		SEC-SCAF-G003
-//! @SYMTestCaseDesc 		SPSA - Concurrent multi-thread usage of multiple key stream decoders
-//! 				(spsa_multikeystreamdecoders)
-//! @SYMPREQ 			PREQ782
-//! @SYMREQ 			
-//! @SYMTestPriority 		High
-//! @SYMTestStatus   		Implemented
-//! @SYMTestActions  		Preconditions:
-//!				• The necessary ROM based ‘single process’ and ‘client-server’ stream agent plug-in
-//!				implementations are present that support the SDP media descriptions supplied during 
-//!				construction of the key stream decoders.
-//!				• The required Rights Object files are present in the private folder of the supporting
-//!				stream agents.
-//!
-//!				Test Actions:
-//!				The following test actions should be carried out concurrently in 3 separate threads 
-//!				(1 of the threads should instantiate a ‘single process’ stream agent, whereas the others
-//!				should instantiate ‘client-server’ based stream agents) :
-//!				
-//!				• Run the test step actions as described in test case SEC-SCAF-A008 				
-//!
-//! @SYMTestExpectedResults 	• Each of the key stream decoder objects that have been constructed by either a 
-//!				client-server or single process stream agent plug-in are created successfully.
-//!				• All of the expected attribute values match their corresponding values retrieved from
-//!				the associated key stream decoder.
-//!
-//! @SYMTestType 		CIT
-
-START_TESTCASE SEC-SCAF-G003
-
-// Copy the necessary rights objects into the stream agent's private directory (Client/Server Architecture)
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_ServiceProgram
-
-// Copy the necessary rights objects into the stream agent's private directory (Single Process Stream Agent)
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_ServiceProgram_SingleProcessAgent
-
-// 2 Key Stream Decoders, Invoking the same single process stream agent
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini spsa_multikeystreamdecoders_singlethread_singleagent
-
-// 2 Key Stream Decoders, Invoking different stream agents (1 Single Process & 1 Client/Server)
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini spsa_multikeystreamdecoders_singlethread_multiagents
-
-// 3 concurrent threads, 2 key stream decoders per thread invoking the same agent
-CONCURRENT
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini spsa_multikeystreamdecoders_concurrent_singleagent_threadA
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini multikeystreamdecoders_concurrent_singleagent_threadB
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini multikeystreamdecoders_concurrent_singleagent_threadC
-CONSECUTIVE
-
-// 3 concurrent threads, 2 key stream decoders per thread invoking different agents (1 Single Process & 1 Client/Server)
-CONCURRENT
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini spsa_multikeystreamdecoders_concurrent_multiagents_threadA
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini spsa_multikeystreamdecoders_concurrent_multiagents_threadB
-RUN_TEST_STEP tscaf SCAFMultiKeyStreamDecoders z:\tcaf\tscaf\tscaf.ini spsa_multikeystreamdecoders_concurrent_multiagents_threadC
-CONSECUTIVE
-
-END_TESTCASE SEC-SCAF-G003
-
-
-
-//! @SYMTestCaseID 		SEC-SCAF-G004
-//! @SYMTestCaseDesc 		SPSA - Usage of key stream sink
-//! 				(spsa_keystreamsinks)
-//! @SYMPREQ 			PREQ782
-//! @SYMREQ 			
-//! @SYMTestPriority 		High
-//! @SYMTestStatus   		Implemented
-//! @SYMTestActions  		Preconditions:
-//!				• The necessary ROM based ‘single process’ stream agent plug-in is present that supports
-//!				the SDP media description supplied during construction of the key stream decoder.
-//!				• The required Rights Object file is present in the private folder for the supporting single
-//!				process stream agent.
-//!
-//!				Test Actions:
-//!				• Run the test step actions as described in test case SEC-SCAF-C001.				
-//!
-//! @SYMTestExpectedResults 	• The expected plain text string is found in the predefined location.
-//!
-//! @SYMTestType 		CIT
-
-START_TESTCASE SEC-SCAF-G004
-
-// Single Process Stream Agent Invoked
-RUN_TEST_STEP 100 tscaf SCAFKeyStreamSink z:\tcaf\tscaf\tscaf.ini spsa_keystreamink
-
-// 2 Single Process Stream Agents Invoked
-RUN_TEST_STEP 100 tscaf SCAFConcurrentKeyStreamSinks z:\tcaf\tscaf\tscaf.ini spsa_concurrent_keystreamsinks
-
-// 1 Single Process Stream Agent and 1 Client/Server Stream Agent Invoked
-RUN_TEST_STEP 100 tscaf SCAFConcurrentKeyStreamSinks z:\tcaf\tscaf\tscaf.ini spsa_cssa_concurrent_keystreamsinks
-
-END_TESTCASE SEC-SCAF-G004
-
-
-
-//! @SYMTestCaseID 		SEC-SCAF-G006
-//! @SYMTestCaseDesc 		SPSA - Testing IPSec integration with key stream decoder
-//! 				(spsa_ipsec_integration_decoder_automatic)
-//! @SYMPREQ 			PREQ782
-//! @SYMREQ 			
-//! @SYMTestPriority 		High
-//! @SYMTestStatus   		Implemented
-//! @SYMTestActions 		Preconditions:
-//!				• The necessary ROM based ‘single process’ stream agent plug-in is present that supports the
-//!				SDP media description supplied during construction of the key stream decoder.
-//!
-//!				Test Actions:
-//!				• Run the test step actions as described in test case SEC-SCAF-E015.
-//!
-//! @SYMTestExpectedResults 	• Associations was added 
-//!
-//! @SYMTestType 		CIT
-
-START_TESTCASE SEC-SCAF-G006
-
-RUN_TEST_STEP tscaf SCAFSetupRightsObjects z:\tcaf\tscaf\tscaf.ini Rights_Program_SingleProcessAgent
-
-//The time limit is disabled since this test is manual
-RUN_TEST_STEP -1 tscaf SCAFIpSecDecoderIntegration z:\tcaf\tscaf\tscaf.ini spsa_ipsec_integration_decoder_automatic
-
-END_TESTCASE SEC-SCAF-G006
-
-
-
-//********************** SEC-SCAF-H : REFERENCE AGENT TEST  **********************
-
-
-//! @SYMTestCaseID 		SEC-SCAF-H001
-//! @SYMTestCaseDesc 		Smoke testing for the Reference Agent
-//! 				(referenceagent)
-//! @SYMPREQ 			PREQ782
-//! @SYMREQ 			-------
-//! @SYMTestPriority 		Critical
-//! @SYMTestStatus   		Implemented
-//! @SYMTestActions  		
-//!				•	Generate a IPSec protected key stream description. 
-//!				•	Create a key stream sink from the protected key stream description.
-//!				•	Create a key stream decoder from an SDP message requiring the reference agent 
-//!					and the key stream sink.
-//!				•	Create a short term key message and write it to a predefined socket.
-//! @SYMTestExpectedResults 	
-//!				• Interfaces are invoked without leaves and panics.
-//!
-//! @SYMTestType 		CIT
-
-START_TESTCASE SEC-SCAF-H001
-
-RUN_TEST_STEP 100 tscaf SCAFRefAgent z:\tcaf\tscaf\tscaf.ini reference_agent
-
-END_TESTCASE SEC-SCAF-H001