RIO-8673: Added the test cases in PVME and FMU for Protected test content

Change-Id: I0797d1110bd8201ea6c66241b51e6f0ccd56e8c1

20 files changed, 121 insertions, 36 deletions

diff --git a/build_config/common/rules.cml b/build_config/common/rules.cml
index 49a591d82..4f980aefb 100644
--- a/build_config/common/rules.cml
+++ b/build_config/common/rules.cml
@@ -427,7 +427,7 @@ derive MODS_pvdivxdrm from "-lopencore_common"
 derive pvplayready_so_name from playready_support==y ? "pvplayready" : ""
 derive pvplayready_aggregate_libtype from playready_support==y ? "shared":"static"
 derive pvplayready_link_type from "loaded"
-derive AGGREGATE_LIBDIRS_pvplayready from pvplayreadyplugin_m_mk.pvplayreadyplugininterface_m_mk
+derive AGGREGATE_LIBDIRS_pvplayready from pvplayreadyplugin_m_mk.pvplayreadyplugininterface_m_mk.pvplayreadyutility_m_mk
 derive MODS_pvplayready from "-lopencore_common -lpvwmdrmmd" 
 
 derive pvsqlite_so_name from mtp_db_support==y ? "pvsqlite" : ""
diff --git a/build_config/opencore_dynamic/pv_config.h b/build_config/opencore_dynamic/pv_config.h
index f0d338806..544b3c54a 100644
--- a/build_config/opencore_dynamic/pv_config.h
+++ b/build_config/opencore_dynamic/pv_config.h
@@ -1601,7 +1601,7 @@
 #define pvbroadcastwithpvrfsp_m_mk ""
 #define pvrmff_recognizer_link_type "loaded"
 #define REGISTER_OMX_M4VENC_COMPONENT 1
-#define AGGREGATE_LIBDIRS_pvplayready " "
+#define AGGREGATE_LIBDIRS_pvplayready "  "
 #define pvpvrff_y_mk ""
 #define pvpvrnode_y_mk ""
 #define omx_baseclass_y_mk ""
diff --git a/build_config/opencore_dynamic/pv_config_derived.mk b/build_config/opencore_dynamic/pv_config_derived.mk
index 2a672c371..36df34e89 100644
--- a/build_config/opencore_dynamic/pv_config_derived.mk
+++ b/build_config/opencore_dynamic/pv_config_derived.mk
@@ -1112,7 +1112,7 @@ pvbroadcastwithpvrfsp_y_lib=""
 pvbroadcastwithpvrfsp_m_mk=""
 pvrmff_recognizer_link_type="loaded"
 REGISTER_OMX_M4VENC_COMPONENT=1
-AGGREGATE_LIBDIRS_pvplayready=" "
+AGGREGATE_LIBDIRS_pvplayready="  "
 pvpvrff_y_mk=""
 pvpvrnode_y_mk=""
 omx_baseclass_y_mk=""
diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index b55081c15..d81ef1ae5 100644
--- a/engines/2way/src/pv_2way_sdkinfo.h
+++ b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PV2WAY_ENGINE_SDKINFO_LABEL "1490783"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1490863"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100610
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED
diff --git a/engines/adapters/player/framemetadatautility/test/build/make/local.mk b/engines/adapters/player/framemetadatautility/test/build/make/local.mk
index e1c0f74b2..10d42c1ac 100644
--- a/engines/adapters/player/framemetadatautility/test/build/make/local.mk
+++ b/engines/adapters/player/framemetadatautility/test/build/make/local.mk
@@ -13,16 +13,18 @@ TARGET := pv_frame_metadata_utility_test
 
 XCPPFLAGS := -DBUILD_OMX_DEC_NODE
 
-XINCDIRS := ../../config/common ../../../../../../../extern_libs_v2/khronos/openmax/include
+XINCDIRS := ../../../../../../../extern_libs_v2/khronos/openmax/include ../../../../../../../extern_libs_v2/wmdrm/common/include ../../../../../../../extern_libs_v2/wmdrm/playready/include ../../../../../../../pvmi/content_policy_manager/plugins/common/include  ../../../../../../playready_utility/include
+
+XINCDIRS += ../../config/common
 
 SRCDIR := ../../src
 INCSRCDIR := ../../src
 
 SRCS := test_pv_frame_metadata_utility.cpp \
         test_pv_frame_metadata_utility_testset1.cpp \
-        test_pv_frame_metadata_utility_testset_januscpm.cpp
-
-LIBS :=  pvframemetadatautility \
+        test_pv_frame_metadata_utility_testset_wmdrmcpm.cpp
+        
+LIBS := pvframemetadatautility \
         colorconvert \
         pvplayer_engine \
         pvfileoutputnode \
@@ -181,6 +183,6 @@ TEST_ARGS := -all
 
 SOURCE_ARGS := -source ../../../../../../../extern_libs_v2/wmdrmmd/samples/MD220x176_96_384s_clear_wmv.asf 
 
-
+include $(LOCAL_PATH)/playready.mk
 include $(MK)/prog.mk
 
diff --git a/engines/adapters/player/framemetadatautility/test/build/make/playready.mk b/engines/adapters/player/framemetadatautility/test/build/make/playready.mk
new file mode 100644
index 000000000..d063b6546
--- /dev/null
+++ b/engines/adapters/player/framemetadatautility/test/build/make/playready.mk
@@ -0,0 +1,8 @@
+ifneq ($(pvplayreadyutility_lib),n)
+XINCDIRS := ../../../../../../../extern_libs_v2/khronos/openmax/include ../../../../../../../extern_libs_v2/wmdrm/common/include ../../../../../../../extern_libs_v2/wmdrm/playready/include ../../../../../../../pvmi/content_policy_manager/plugins/common/include  ../../../../../../playready_utility/include
+
+XINCDIRS += ../../config/playready
+
+LIBS += \
+   pvplayreadyutility
+endif
\ No newline at end of file
diff --git a/engines/adapters/player/framemetadatautility/test/config/common/test_pv_frame_metadata_utility_config.h b/engines/adapters/player/framemetadatautility/test/config/common/test_pv_frame_metadata_utility_config.h
index dfbdae4fe..d84b4c97b 100644
--- a/engines/adapters/player/framemetadatautility/test/config/common/test_pv_frame_metadata_utility_config.h
+++ b/engines/adapters/player/framemetadatautility/test/config/common/test_pv_frame_metadata_utility_config.h
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,11 @@
 #define RUN_RGB24_TESTCASES 0
 
 // Set to 1 to enable test cases that uses Janus CPM, 0 to disable
-#define RUN_JANUSCPM_TESTCASES 1
+#define RUN_JANUS_TESTCASES_FMU 1
+
+// Set to 1 to enable test cases that uses PlayReady CPM, 0 to disable
+#define RUN_PLAYREADY_TESTCASES_FMU 0
+
 
 // The source test file without video track
 //#define NOVIDEOSOURCEFILENAME "test_amr.mp4"
diff --git a/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility.cpp b/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility.cpp
index 2d006ed79..7ffc826d4 100644
--- a/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility.cpp
+++ b/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility.cpp
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -981,6 +981,14 @@ void pvframemetadata_utility_test::test()
             case ProtectedMetadataTest:
                 fprintf(file, "Janus CPM test cases disabled\n");
                 break;
+            case ProtectedMetadataWithPlayReadyContentTest:
+#if RUN_PLAYREADY_TESTCASES_FMU
+                iCurrentTest = new pvframemetadata_async_test_protectedmetadata(testparam, true);
+#else
+                fprintf(file, "Playready CPM test cases disabled\n");
+#endif
+                break;
+
             case ProtectedThumbnailTest_WithThumbnailIntent:
                 fprintf(file, "Janus CPM test cases disabled\n");
                 break;
diff --git a/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility.h b/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility.h
index ef17b7c8f..eb32be12b 100644
--- a/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility.h
+++ b/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility.h
@@ -237,7 +237,8 @@ class pvframemetadata_utility_test : public test_case,
             InvalidSourceFileTest,
             NoGetFrameTest, //20
             NoVideoTrackTest,
-            ProtectedMetadataTest, //Hardcoded test content -- jazz1.wma
+            ProtectedMetadataTest, //Hardcoded test content -- Janus_playcount_3.wma
+            ProtectedMetadataWithPlayReadyContentTest, //Hardcoded PlayReady test content -- ExpireImmediately.pya
             ProtectedThumbnailTest_WithThumbnailIntent, //Hardcoded test content -- stc10v.wmv
             ProtectedThumbnailTest_WithPlayIntent, //Hardcoded test content -- stc10v.wmv
             ProtectedThumbnailTest_WithMetadataIntent, //Hardcoded test content -- stc10v.wmv
diff --git a/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility_testset1.cpp b/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility_testset1.cpp
index 69fbfe5b0..6ef0c5ce0 100644
--- a/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility_testset1.cpp
+++ b/engines/adapters/player/framemetadatautility/test/src/test_pv_frame_metadata_utility_testset1.cpp
@@ -3222,7 +3222,8 @@ void pvframemetadata_async_test_settimeout_getframe::Run()
         case STATE_QUERYINTERFACE:
         {
             PVUuid capconfigifuuid = PVMI_CAPABILITY_AND_CONFIG_PVUUID;
-            OSCL_TRY(error, iCurrentCmdId = iFrameMetadataUtil->QueryInterface(capconfigifuuid, (PVInterface*&)iFMUCapConfigIF, (OsclAny*) & iContextObject));
+            PVInterface* temp = NULL;
+            OSCL_TRY(error, iCurrentCmdId = iFrameMetadataUtil->QueryInterface(capconfigifuuid, temp, (OsclAny*) & iContextObject); iFMUCapConfigIF = OSCL_STATIC_CAST(PvmiCapabilityAndConfig*, temp));
             OSCL_FIRST_CATCH_ANY(error, PVFMUATB_TEST_IS_TRUE(false); iState = STATE_CLEANUPANDCOMPLETE; RunIfNotReady());
         }
         break;
@@ -3532,7 +3533,8 @@ void pvframemetadata_async_test_set_player_key::Run()
         case STATE_QUERYINTERFACE:
         {
             PVUuid capconfigifuuid = PVMI_CAPABILITY_AND_CONFIG_PVUUID;
-            OSCL_TRY(error, iCurrentCmdId = iFrameMetadataUtil->QueryInterface(capconfigifuuid, (PVInterface*&)iFMUCapConfigIF, (OsclAny*) & iContextObject));
+            PVInterface* temp = NULL;
+            OSCL_TRY(error, iCurrentCmdId = iFrameMetadataUtil->QueryInterface(capconfigifuuid, temp, (OsclAny*) & iContextObject); iFMUCapConfigIF = OSCL_STATIC_CAST(PvmiCapabilityAndConfig*, temp));
             OSCL_FIRST_CATCH_ANY(error, PVFMUATB_TEST_IS_TRUE(false); iState = STATE_CLEANUPANDCOMPLETE; RunIfNotReady());
         }
         break;
diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
index 7707328a4..52a80d2f9 100644
--- a/engines/author/src/pv_author_sdkinfo.h
+++ b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1490783"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1490863"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100610
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED
diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
index 93e6a12b1..96cf314fa 100644
--- a/engines/player/src/pv_player_sdkinfo.h
+++ b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1490783"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1490863"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100610
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED
diff --git a/engines/player/test/config/android/test_pv_player_engine_config_ext.h b/engines/player/test/config/android/test_pv_player_engine_config_ext.h
index a5b01357f..959a3e4ff 100644
--- a/engines/player/test/config/android/test_pv_player_engine_config_ext.h
+++ b/engines/player/test/config/android/test_pv_player_engine_config_ext.h
@@ -55,7 +55,7 @@
 # define RUN_APP_TRACK_SELECTION_TESTCASES 0
 # define RUN_ASFFILE_TESTCASES 0
 # define RUN_CPMDIVX_TESTCASES 0
-# define RUN_CPMJANUS_TESTCASES 0
+# define RUN_JANUS_TESTCASES_PLAYER 0
 # define RUN_FASTTRACK_TESTCASES 0
 # define RUN_MS_HTTP_STREAMING_TESTCASES 0
 # define RUN_REALAUDIO_FILE_TESTCASES 0
@@ -68,7 +68,7 @@
 # define RUN_APP_TRACK_SELECTION_TESTCASES 1
 # define RUN_ASFFILE_TESTCASES 1
 # define RUN_CPMDIVX_TESTCASES 1
-# define RUN_CPMJANUS_TESTCASES 1
+# define RUN_JANUS_TESTCASES_PLAYER 1
 # define RUN_FASTTRACK_TESTCASES 1
 # define RUN_MS_HTTP_STREAMING_TESTCASES 1
 # define RUN_REALAUDIO_FILE_TESTCASES 0 // not supported yet
diff --git a/engines/pvme/test/Android.mk b/engines/pvme/test/Android.mk
index 0f0cf6c1c..7e3385fc5 100644
--- a/engines/pvme/test/Android.mk
+++ b/engines/pvme/test/Android.mk
@@ -11,15 +11,20 @@ LOCAL_MODULE := pvme_test
 LOCAL_CFLAGS :=   $(PV_CFLAGS)
 
 
-LOCAL_STATIC_LIBRARIES := libunit_test   
+LOCAL_STATIC_LIBRARIES := libunit_test      
 
-LOCAL_SHARED_LIBRARIES :=  libopencore_player libopencore_common libopencore_pvme
+LOCAL_SHARED_LIBRARIES :=  libopencore_player libopencore_common libopencore_pvme   
 
 LOCAL_C_INCLUDES := \
 	$(PV_TOP)/engines/pvme/test/src \
  	$(PV_TOP)/engines/pvme/test/src \
- 	$(PV_TOP)/engines/pvme/test/config/default \
  	$(PV_TOP)/engines/player/include \
+ 	$(PV_TOP)/extern_libs_v2/wmdrm/common/include \
+ 	$(PV_TOP)/extern_libs_v2/wmdrm/playready/include \
+ 	$(PV_TOP)/pvmi/content_policy_manager/plugins/common/include \
+ 	$(PV_TOP)/engines/playready_utility/include \
+ 	$(PV_TOP)/pvmi/content_policy_manager/plugins/playready/include \
+ 	$(PV_TOP)/engines/pvme/test/config/android \
  	$(PV_INCLUDES)
 
 LOCAL_COPY_HEADERS_TO := $(PV_COPY_HEADERS_TO)
diff --git a/engines/pvme/test/build/make/local.mk b/engines/pvme/test/build/make/local.mk
index 5cb01f9c7..eb88ea8b4 100644
--- a/engines/pvme/test/build/make/local.mk
+++ b/engines/pvme/test/build/make/local.mk
@@ -4,19 +4,27 @@ include $(MK)/clear.mk
 
 TARGET := pvme_test
 
-
-XINCDIRS := ../../config/default ../../../../player/include
+XINCDIRS := ../../../../player/include ../../../../../extern_libs_v2/wmdrm/common/include ../../../../../extern_libs_v2/wmdrm/playready/include ../../../../../pvmi/content_policy_manager/plugins/common/include  ../../../../playready_utility/include ../../../../../pvmi/content_policy_manager/plugins/playready/include
 
 SRCDIR := ../../src
 INCSRCDIR := ../../src
 
 SRCS :=	test_pvme.cpp \
-        test_pvme_testset1.cpp
+        test_pvme_testset1.cpp \
+        test_pvme_testset_wmdrmcpm.cpp
         
 ifeq ($(pvmetadata_engine_lib),m)
-    LIBS := unit_test opencore_player opencore_common opencore_pvme
+    XINCDIRS += ../../config/android
+    
+#   test_pvme_testset_wmdrmcpm.cpp has bee included in include_paths_extended 
+    SRCS := test_pvme.cpp \
+            test_pvme_testset1.cpp 
+
+    LIBS := unit_test opencore_player opencore_common opencore_pvme pvwmdrmmd pvwmdrmoemsettings pvplayready
 else
-    LIBS := \
+    XINCDIRS += ../../config/default
+    
+    LIBS_SET1 := \
         pvmetadata_engine \
 	pvmp3ffparsernode \
         pvmp4ffparsernode \
@@ -41,15 +49,17 @@ else
         pvgsmamrparser \
         pvasfffparsernode \
         pvasfff \
-        pvmfrecognizer \
+        pvplayreadyplugin
+
+    LIBS_SET2 := pvmfrecognizer \
         pvasfffrecognizer \
         pvmp4ffrecognizer \
         mp4recognizer_utility \
         pvmp3ffrecognizer \
         pvrmffrecognizer \
         pvoma1ffrecognizer \
-		pvaacffrecognizer \
-		pvwavffrecognizer \
+	pvaacffrecognizer \
+	pvwavffrecognizer \
         pvfileparserutils \
         pvrmffparsernode \
         pvrmffparser \
@@ -57,6 +67,10 @@ else
         pvrmffrecognizer_utility \
         pvid3parcom \
         pvgendatastruct \
+        pvwmdrmmdlib \
+        csprng \
+        pvcrypto \
+        pventropysrc \
         pvlogger \
         osclregcli \
         osclregserv \
@@ -77,9 +91,12 @@ else
         pvaacffrecognizer \
         divxrecognizer_utility \
         pvplsffrecognizer
+# playreadyutility will be linked between these two sets of libs in case it is selected
+    LIBS := $(LIBS_SET1) $(LIBS_SET2)
 endif
 	
 SYSLIBS += $(SYS_THREAD_LIB)
 SYSLIBS += $(SYS_SOCKET_LIB)
 
+include $(LOCAL_PATH)/playready.mk
 include $(MK)/prog.mk
diff --git a/engines/pvme/test/build/make/playready.mk b/engines/pvme/test/build/make/playready.mk
new file mode 100644
index 000000000..9016a7a85
--- /dev/null
+++ b/engines/pvme/test/build/make/playready.mk
@@ -0,0 +1,13 @@
+ifneq ($(pvplayreadyutility_lib),n)
+XINCDIRS := ../../../../player/include ../../../../../extern_libs_v2/wmdrm/common/include ../../../../../extern_libs_v2/wmdrm/playready/include ../../../../../pvmi/content_policy_manager/plugins/common/include  ../../../../playready_utility/include ../../../../../pvmi/content_policy_manager/plugins/playready/include
+
+ifeq ($(pvmetadata_engine_lib),m)
+    XINCDIRS += ../../config/android
+
+    LIBS := unit_test opencore_player opencore_common opencore_pvme pvwmdrmmd pvwmdrmoemsettings pvplayready
+else
+    XINCDIRS += ../../config/playready
+    
+    LIBS := $(LIBS_SET1) pvplayreadyutility $(LIBS_SET2)
+endif
+endif
diff --git a/engines/pvme/test/config/default/test_pvme_config.h b/engines/pvme/test/config/android/test_pvme_config.h
index fa1e80e99..3b6776668 100644
--- a/engines/pvme/test/config/default/test_pvme_config.h
+++ b/engines/pvme/test/config/android/test_pvme_config.h
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/engines/pvme/test/src/test_pvme.cpp b/engines/pvme/test/src/test_pvme.cpp
index 7505e3192..aff53e881 100644
--- a/engines/pvme/test/src/test_pvme.cpp
+++ b/engines/pvme/test/src/test_pvme.cpp
@@ -24,6 +24,7 @@
 
 #include "test_pvme_testset1.h"
 
+
 FILE* file;
 
 #define MAX_LEN 100
@@ -670,6 +671,22 @@ void pvmetadataengine_test::test()
                 iCurrentTest = new pv_metadata_engine_test(testparam, PV_METADATA_ENGINE_THREADED_MODE, at, vectorLogNodeCfg);
                 break;
 
+            case ProtectedMetadataNonThreadedModeTest:
+                fprintf(file, "Janus CPM test cases disabled\n");
+                break;
+
+            case ProtectedMetadataWithPlayReadyContentNonThreadedModeTest:
+                fprintf(file, "Playready CPM test cases disabled\n");
+                break;
+
+            case ProtectedMetadataThreadedModeTest:
+                fprintf(file, "Janus CPM test cases disabled\n");
+                break;
+
+            case ProtectedMetadataWithPlayReadyContentThreadedModeTest:
+                fprintf(file, "Playready CPM test cases disabled\n");
+                break;
+
             case BeyondLastTest:
             default:
                 iCurrentTestNumber = BeyondLastTest;
diff --git a/engines/pvme/test/src/test_pvme.h b/engines/pvme/test/src/test_pvme.h
index 1ed6e7209..d8b5e4543 100644
--- a/engines/pvme/test/src/test_pvme.h
+++ b/engines/pvme/test/src/test_pvme.h
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -117,7 +117,15 @@ class pvmetadataengine_test : public test_case,
 
             GetSourceMetadataThreadedModeTest = GetSourceMetadataNonThreadedModeTest + 1,
 
-            LastTest = GetSourceMetadataThreadedModeTest + 1,//placeholder
+            ProtectedMetadataNonThreadedModeTest = GetSourceMetadataThreadedModeTest + 1, //Hardcoded test content -- Janus_playcount_3.wma
+
+            ProtectedMetadataWithPlayReadyContentNonThreadedModeTest = ProtectedMetadataNonThreadedModeTest + 1, //Hardcoded PlayReady test content -- ExpireImmediately.pya
+
+            ProtectedMetadataThreadedModeTest = ProtectedMetadataWithPlayReadyContentNonThreadedModeTest + 1, //Hardcoded test content -- Janus_playcount_3.wma
+
+            ProtectedMetadataWithPlayReadyContentThreadedModeTest = ProtectedMetadataThreadedModeTest + 1, //Hardcoded PlayReady test content -- ExpireImmediately.pya
+
+            LastTest = ProtectedMetadataWithPlayReadyContentThreadedModeTest + 1,//placeholder
 
             BeyondLastTest = 999 //placeholder
 
diff --git a/engines/pvme/test/src/test_pvme_testset1.h b/engines/pvme/test/src/test_pvme_testset1.h
index 4ee394fe0..f56df18ce 100644
--- a/engines/pvme/test/src/test_pvme_testset1.h
+++ b/engines/pvme/test/src/test_pvme_testset1.h
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 1998-2009 PacketVideo
+ * Copyright (C) 1998-2010 PacketVideo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -132,6 +132,7 @@ class pv_metadata_engine_test
                 , iObserver(a_testParam.iObserver)
                 , iTestCase(a_testParam.iTestCase)
                 , iTestMsgOutputFile(a_testParam.iTestMsgOutputFile)
+
         {
             OSCL_ASSERT(0 != iObserver);
             OSCL_ASSERT(0 != iTestCase);
@@ -220,7 +221,7 @@ class pv_metadata_engine_test
         Oscl_Vector<PvmiKvp, OsclMemAllocator>  iMetadataValueList;
         OSCL_HeapString<OsclMemAllocator>       iTestCaseName;
 
-    private:
+    protected:
 
         void ReadMetadataFile();
         void ReadClipsFile();
@@ -261,7 +262,6 @@ class pv_metadata_engine_test
         char* iFileName;
         oscl_wchar iTempWCharBuf[512];
         PVMFFormatType iFileType;
-
         ThreadSafeQueue iThreadSafeCommandQueue;
         ThreadSafeQueue iThreadSafeErrorQueue;
         ThreadSafeQueue iThreadSafeInfoQueue;