--- a/mpengine/tsrc/unittest_mpmpxcollectionframeworkwrapper/stub/src/mpxcollectionutility.cpp	Fri Aug 06 16:51:36 2010 -0500
+++ b/mpengine/tsrc/unittest_mpmpxcollectionframeworkwrapper/stub/src/mpxcollectionutility.cpp	Tue Aug 24 03:36:14 2010 -0500
@@ -30,7 +30,6 @@
 #include <e32debug.h>
 
 #include "stub/inc/mpxcollectionutility.h"
-const TInt KMPXAllSongsViewIndex = 0;
 const TInt KMPXPlaylistViewIndex = 1;
 
 /*!
@@ -39,14 +38,13 @@
 MMPXCollectionUtility::MMPXCollectionUtility():iBack(EFalse),
                                                iOpen(EFalse),
                                                iMedia(EFalse),
-                                               iIndex(0),
                                                iOpenCount(0),
                                                iCountPath(0),
+                                               iIndex(0),
                                                iPlaylists(0),
                                                iAlbumSongs(0),
                                                iAsynchFindResult(0)
 {
-    
 }
 
 /*!
@@ -114,7 +112,8 @@
        aCriteria.IsSupported(KMPXMediaGeneralCategory) && EMPXSong == aCriteria.ValueTObjectL<TMPXGeneralCategory>(KMPXMediaGeneralCategory) &&
        aCriteria.IsSupported(KMPXMediaGeneralId) && iAlbumSongs &&
        //it is assumed that album ID matches index on the media array, just to make test logic more simple.
-       TUint32(aCriteria.ValueTObjectL<TMPXItemId>(KMPXMediaGeneralId)) >= 0 && TUint32(aCriteria.ValueTObjectL<TMPXItemId>(KMPXMediaGeneralId)) < iAlbumSongs->Count())
+       aCriteria.ValueTObjectL<TMPXItemId>(KMPXMediaGeneralId).iId2 &&
+       (aCriteria.ValueTObjectL<TMPXItemId>(KMPXMediaGeneralId).iId2 < iAlbumSongs->Count()) )
         {
         return CMPXMedia::NewL(*iAlbumSongs->AtL(aCriteria.ValueTObjectL<TMPXItemId>(KMPXMediaGeneralId)));
         }