mmappfw_plat/collection_helper_api/tsrc/CollectionHelperTestClass/src/CollectionHelperTestClassBlocks.cpp
--- a/mmappfw_plat/collection_helper_api/tsrc/CollectionHelperTestClass/src/CollectionHelperTestClassBlocks.cpp Wed Jun 09 10:13:45 2010 +0300
+++ b/mmappfw_plat/collection_helper_api/tsrc/CollectionHelperTestClass/src/CollectionHelperTestClassBlocks.cpp Mon Jun 21 16:13:35 2010 +0300
@@ -788,16 +788,17 @@
FTRACE(FPrint(_L("CCollectionHelperTest::GetSongAlbumArtistL")));
TMPXGeneralCategory category = EMPXSong;
// CMPXMedia* foundMedia= NULL;
-
+ TInt result(KErrNotFound);
const CMPXMedia& foundMedia = iCachedHelper->GetL( KFileWmaSong(), category );
if (foundMedia.IsSupported(KMPXMediaMusicAlbumArtist))
{
const TDesC& albumartist = foundMedia.ValueText( KMPXMediaMusicAlbumArtist );
+ result = KErrNone;
}
iLog->Log(_L("CCollectionHelperTestClass::GetSongAlbumArtistL done "));
- return 1;
+ return result;
}
@@ -848,7 +849,7 @@
FTRACE(FPrint(_L("CCollectionHelperTest::GetAbstractAlbumArtistL")));
TMPXGeneralCategory category = EMPXAbstractAlbum;
const CMPXMedia& foundMedia = iCachedHelper->GetL( KAbstractalbum1(), category ); //wma test file
-
+ TInt result(0);
//print out foundMedia attributes
if (foundMedia.IsSupported(KMPXMediaMusicAlbumArtist))
@@ -859,7 +860,7 @@
const TDesC& albumartist = foundMedia.ValueText( KMPXMediaMusicAlbumArtist );
-
+ result++;
}
if (foundMedia.IsSupported(KMPXMediaGeneralTitle))
@@ -871,7 +872,7 @@
const TDesC& name = foundMedia.ValueText( KMPXMediaGeneralTitle );
iLog->Log(_L("CCollectionHelperTestClass::GetAbstractAlbumArtistL, ABSTRACTALBUM.name retrived"));
-
+ result++;
}
if (foundMedia.IsSupported(KMPXMediaGeneralUri))
@@ -882,10 +883,13 @@
// albumartist = foundMedia.ValueText( KMPXMediaMusicAlbumArtist ).AllocLC(); // + data
const TDesC& uri = foundMedia.ValueText( KMPXMediaGeneralUri );
iLog->Log(_L("CCollectionHelperTestClass::GetAbstractAlbumArtistL, ABSTRACTALBUM.uri retrived"));
-
+ result++;
}
iLog->Log(_L("CCollectionHelperTestClass::GetAbstractAlbumArtistL done"));
- return 1;
+ if(result == 3)
+ return KErrNone;
+ else
+ return KErrNotFound;
}
@@ -990,7 +994,7 @@
CMPXMediaArray* foundArray =
foundMedia->Value<CMPXMediaArray>(KMPXMediaArrayContents);
- CleanupStack::PopAndDestroy(foundMedia);
+
for (TInt j = 0; j < foundItemCount; ++j)
{
@@ -1001,7 +1005,7 @@
if (abstractalbumMedia->IsSupported(KMPXMediaGeneralTitle))
{
const TDesC& name = abstractalbumMedia->ValueText( KMPXMediaGeneralTitle );
- iLog->Log(_L("CCollectionHelperTestClass::GetAlbumAndSongsL, found abstractalbumName = [%s]"), name );
+ // iLog->Log(_L("CCollectionHelperTestClass::GetAlbumAndSongsL, found abstractalbumName = [%s]"), name );
}
if (abstractalbumMedia->IsSupported(KMPXMediaGeneralId))
@@ -1036,6 +1040,7 @@
CleanupStack::PopAndDestroy(&songAttributes);
CleanupStack::PopAndDestroy(searchMediaSong);
CleanupStack::PopAndDestroy(abstractalbumMedia);
+ CleanupStack::PopAndDestroy(foundMedia);
CleanupStack::PushL( foundSongs ); // + foundSongs
if ( err != KErrNone )
@@ -1056,7 +1061,7 @@
iLog->Log(_L("CCollectionHelperTestClass::GetAlbumAndSongsL, numOfSongsRefs=%d"), numOfSongsRefs );
CleanupStack::PopAndDestroy( foundSongs ); // - foundSong
}
- return 1;
+ return err;
}