Cleanup work to match Qt habits.

Change-Id: I6f177c05ac464e13096ed9d517736e0b06773f66
Reviewed-on: http://codereview.qt.nokia.com/4340
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>

1 files changed, 26 insertions, 0 deletions

diff --git a/unittests/declarative/tst_declarative_mimetypes.qml b/unittests/declarative/tst_declarative_mimetypes.qml
index 81d1654..a3c0e5a 100644
--- a/unittests/declarative/tst_declarative_mimetypes.qml
+++ b/unittests/declarative/tst_declarative_mimetypes.qml
@@ -460,5 +460,31 @@ TestCase {
 
         compare(resultOfFindApplications2.length, 1)
         compare(resultOfFindApplications2[0], gwenviewApplicationId)
+
+        // ----------------------------------------------------------------------------------------
+
+        mimeTypeRegistry.setUserAlwaysSelectsApplication(editServiceActionName(), pngMimeTypeName(), false)
+
+        mimeTypeRegistry.unregisterApplication(showimgApplicationId)
+
+        compare(mimeTypeRegistry.userAlwaysSelectsApplication(editServiceActionName(), pngMimeTypeName()), true)
+
+        resultOfFindApplications1 = mimeTypeRegistry.findApplications(pngMimeTypeName())
+
+        compare(resultOfFindApplications1.length, 2)
+        compare(resultOfFindApplications1[0][0], gwenviewApplicationId)
+        compare(resultOfFindApplications1[0][1], editServiceActionName())   // edit is before share
+        compare(resultOfFindApplications1[1][0], gwenviewApplicationId)
+        compare(resultOfFindApplications1[1][1], shareOnPicasaWebAlbumsName())
+
+        resultOfFindApplications2 = mimeTypeRegistry.findApplications(editServiceActionName(), pngMimeTypeName())
+
+        compare(resultOfFindApplications2.length, 1)
+        compare(resultOfFindApplications2[0], gwenviewApplicationId)
+
+        resultOfFindApplications2 = mimeTypeRegistry.findApplications(shareOnPicasaWebAlbumsName(), pngMimeTypeName())
+
+        compare(resultOfFindApplications2.length, 1)
+        compare(resultOfFindApplications2[0], gwenviewApplicationId)
     }
 }