RIO-8742: Fix PEUT TC 400-455 playlist input file path

2 files changed, 35 insertions, 21 deletions

diff --git a/engines/player/test/src/test_pv_player_engine_testset_playlist.cpp b/engines/player/test/src/test_pv_player_engine_testset_playlist.cpp
index b68428024..3f88d36c8 100644
--- a/engines/player/test/src/test_pv_player_engine_testset_playlist.cpp
+++ b/engines/player/test/src/test_pv_player_engine_testset_playlist.cpp
@@ -86,6 +86,9 @@ int32 ReadPlaylistFromFile(const char* aFileName, char**& aPlaylist, FILE* aTest
         return 0;
     }
 
+    OSCL_StackString<64> prependStr = SOURCENAME_PREPEND_STRING;
+    uint32 prependLen = prependStr.get_size();
+
     int32 clipCount = -1;
     char** playlistPtr = NULL;
     int32 clipsInPlaylist = 0;
@@ -218,7 +221,7 @@ int32 ReadPlaylistFromFile(const char* aFileName, char**& aPlaylist, FILE* aTest
                 else
                 {
                     // add 1 for NULL char
-                    char* clipNamePtr = (char *)oscl_malloc(nameLen + 1 * sizeof(char));
+                    char* clipNamePtr = (char *)oscl_malloc(prependLen + nameLen + 1 * sizeof(char));
                     if (NULL == clipNamePtr)
                     {
                         fprintf(aTestMsgOutputFile, "ReadPlaylistFromFile(): ERROR - oscl_malloc failed for clipNamePtr size %d\n", nameLen + 1 * sizeof(char));
@@ -248,6 +251,16 @@ int32 ReadPlaylistFromFile(const char* aFileName, char**& aPlaylist, FILE* aTest
                         // add terminating '\0' and
                         // store pointer in playlist
                         char* nameStrPtr = clipNamePtr;
+                        // add the SOURCENAME_PREPEND_STRING
+                        if (prependLen != 0)
+                        {
+                            char* prependPtr = prependStr.get_str();
+                            for (i = 0; i < (int32)prependLen; i++)
+                            {
+                                *nameStrPtr++ = *prependPtr++;
+                            }
+                        }
+
                         int32 k = startBracketIndex + 1;
                         for (i = 0; i < nameLen; i++)
                         {
@@ -306,8 +319,8 @@ int32 ReadPlaylistFromFile(const char* aFileName, char**& aPlaylist, FILE* aTest
 int32 CreatePlaylist(const char* aFileName, PVMFFormatType& aFileType, char**& aPlaylist, int32 aNumInvalidClips, int32 aInvalidClipAtIndex,
                      FILE* aTestMsgOutputFile, bool& aStaticPlaylist)
 {
-    const char *validFileName = NULL;
-    const char *invalidFileName = NULL;
+    OSCL_StackString<256> validFileName = SOURCENAME_PREPEND_STRING;
+    OSCL_StackString<256> invalidFileName = SOURCENAME_PREPEND_STRING;
     bool defaultPlaylist = false;
     char** validPlaylistPtr = NULL;
     char** invalidPlaylistPtr = NULL;
@@ -317,20 +330,20 @@ int32 CreatePlaylist(const char* aFileName, PVMFFormatType& aFileType, char**& a
     // generate the playlist with default clips
     if (oscl_strstr(aFileName, ".mp3") != NULL || oscl_strstr(aFileName, ".MP3") != NULL)
     {
-        validFileName = DEFAULT_VALID_MP3_PLAYLIST;
-        invalidFileName = DEFAULT_INVALID_MP3_PLAYLIST;
+        validFileName += DEFAULT_VALID_MP3_PLAYLIST;
+        invalidFileName += DEFAULT_INVALID_MP3_PLAYLIST;
         defaultPlaylist = true;
     }
     else if (oscl_strstr(aFileName, ".mp4") != NULL || oscl_strstr(aFileName, ".MP4") != NULL)
     {
-        validFileName = DEFAULT_VALID_MP4_PLAYLIST;
-        invalidFileName = DEFAULT_INVALID_MP4_PLAYLIST;
+        validFileName += DEFAULT_VALID_MP4_PLAYLIST;
+        invalidFileName += DEFAULT_INVALID_MP4_PLAYLIST;
         defaultPlaylist = true;
     }
     else if (oscl_strstr(aFileName, ".txt") != NULL || oscl_strstr(aFileName, ".TXT") != NULL)
     {
         // using input text file from command line
-        validFileName = aFileName;
+        validFileName += aFileName;
         aFileType = PVMF_MIME_FORMAT_UNKNOWN;
     }
     else
@@ -341,16 +354,16 @@ int32 CreatePlaylist(const char* aFileName, PVMFFormatType& aFileType, char**& a
         return 0;
     }
 
-    int32 clipsInPlaylist = ReadPlaylistFromFile(validFileName, validPlaylistPtr, aTestMsgOutputFile);
+    int32 clipsInPlaylist = ReadPlaylistFromFile(validFileName.get_str(), validPlaylistPtr, aTestMsgOutputFile);
 
     // see if we need to replace some valid clips with invalid clips
     if (aNumInvalidClips > 0 && aInvalidClipAtIndex >= 0)
     {
-        int32 invalidClipCount = ReadPlaylistFromFile(invalidFileName, invalidPlaylistPtr, aTestMsgOutputFile);
+        int32 invalidClipCount = ReadPlaylistFromFile(invalidFileName.get_str(), invalidPlaylistPtr, aTestMsgOutputFile);
         if (invalidClipCount < clipsInPlaylist)
         {
             fprintf(aTestMsgOutputFile, "CreatePlaylist(): ERROR - invalid clip count %d in %s < valid clip count %d in %s\n",
-                    invalidClipCount, invalidFileName, clipsInPlaylist, validFileName);
+                    invalidClipCount, invalidFileName.get_str(), clipsInPlaylist, validFileName.get_str());
         }
 
         // we don't want to keep around the entire invalid playlist,
@@ -379,7 +392,6 @@ int32 CreatePlaylist(const char* aFileName, PVMFFormatType& aFileType, char**& a
 }
 
 
-
 void DestroyPlaylist(char** aPlaylist, int32 aNumClipsInPlaylist)
 {
     // free memory
diff --git a/engines/player/test/src/test_pv_player_engine_testset_playlist.h b/engines/player/test/src/test_pv_player_engine_testset_playlist.h
index 585796430..38e684cef 100644
--- a/engines/player/test/src/test_pv_player_engine_testset_playlist.h
+++ b/engines/player/test/src/test_pv_player_engine_testset_playlist.h
@@ -241,12 +241,10 @@ class pvplayer_async_test_playlist_playback : public pvplayer_async_test_base
                 , iReferencePCMFileSize(0)
                 , iGaplessFormat(aGaplessFormat)
         {
-            iSinkFileNameSubString = OUTPUTNAME_PREPEND_WSTRING;
-
             if (aGaplessFormat != GAPLESS_FORMAT_UNKNOWN)
             {
                 // this is PCM validation with default playlist
-                iSinkFileNameSubString += _STRLIT_WCHAR("gapless_validate_");
+                iSinkFileNameSubString = _STRLIT_WCHAR("gapless_validate_");
                 switch (iGaplessFormat)
                 {
                     case GAPLESS_FORMAT_LAME_MP3:
@@ -277,7 +275,7 @@ class pvplayer_async_test_playlist_playback : public pvplayer_async_test_base
             else
             {
                 // this is playback test
-                iSinkFileNameSubString += _STRLIT_WCHAR("playback_");
+                iSinkFileNameSubString = _STRLIT_WCHAR("playback_");
 
                 if (aInvalidClipTest)
                 {
@@ -622,8 +620,7 @@ class pvplayer_async_test_playlist_seek_skip : public pvplayer_async_test_base
                 , iUpdateDataSource(false)
                 , iSeekInCurrentTrack(false)
         {
-            iSinkFileNameSubString = OUTPUTNAME_PREPEND_WSTRING;
-            iSinkFileNameSubString += _STRLIT_WCHAR("_");
+            iSinkFileNameSubString = _STRLIT_WCHAR("_");
 
             iNumClipsInPlaylist = CreatePlaylist(iFileName, iFileType, iPlaylist, 0, -1, iTestMsgOutputFile, iStaticPlaylist);
 
@@ -1131,11 +1128,13 @@ class pvplayer_async_test_validate_gapless : public pvplayer_async_test_base
                 , iNewFileName(NULL)
         {
             iGaplessFormat = aGaplessFormat;
+            iTempFileName = SOURCENAME_PREPEND_STRING;
+
             switch (iGaplessFormat)
             {
                 case GAPLESS_FORMAT_LAME_MP3:
                     iTestCaseName = _STRLIT_CHAR("Validate Gapless LAME MP3");
-                    iFileName = DEFAULT_GAPLESS_LAME_MP3_CLIP;
+                    iTempFileName += DEFAULT_GAPLESS_LAME_MP3_CLIP;
                     iFileType = PVMF_MIME_MP3FF;
                     iReferencePCMFileSize = DEFAULT_GAPLESS_LAME_MP3_PCM_OUTPUT_SIZE;
                     iSinkFileNameSubString += _STRLIT_WCHAR("LAME_mp3");
@@ -1143,7 +1142,7 @@ class pvplayer_async_test_validate_gapless : public pvplayer_async_test_base
 
                 case GAPLESS_FORMAT_ITUNES_AAC:
                     iTestCaseName = _STRLIT_CHAR("Validate Gapless iTunes AAC");
-                    iFileName = DEFAULT_GAPLESS_ITUNES_AAC_CLIP;
+                    iTempFileName += DEFAULT_GAPLESS_ITUNES_AAC_CLIP;
                     iFileType = PVMF_MIME_MPEG4FF;
                     iReferencePCMFileSize = DEFAULT_GAPLESS_ITUNES_AAC_PCM_OUTPUT_SIZE;
                     iSinkFileNameSubString += _STRLIT_WCHAR("iTunes_aac");
@@ -1154,12 +1153,14 @@ class pvplayer_async_test_validate_gapless : public pvplayer_async_test_base
                     // falling through
                 case GAPLESS_FORMAT_ITUNES_MP3:
                     iTestCaseName = _STRLIT_CHAR("Validate Gapless iTunes MP3");
-                    iFileName = DEFAULT_GAPLESS_ITUNES_MP3_CLIP;
+                    iTempFileName += DEFAULT_GAPLESS_ITUNES_MP3_CLIP;
                     iFileType = PVMF_MIME_MP3FF;
                     iReferencePCMFileSize = DEFAULT_GAPLESS_ITUNES_MP3_PCM_OUTPUT_SIZE;
                     iSinkFileNameSubString += _STRLIT_WCHAR("iTunes_mp3");
                     break;
             }
+            iFileName = iTempFileName.get_str();
+
             // if there is a path delimiter,
             // need to replace with OSCL_FILE_CHAR_PATH_DELIMITER
             iNewFileName = (char *)oscl_malloc(oscl_strlen(iFileName) + 1);
@@ -1237,6 +1238,7 @@ class pvplayer_async_test_validate_gapless : public pvplayer_async_test_base
         uint32 iReferencePCMFileSize;
         char* iNewFileName;
         OSCL_wHeapString<OsclMemAllocator> iSinkFileNameSubString;
+        OSCL_HeapString<OsclMemAllocator> iTempFileName;
 };