diff options
| author | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2011-09-07 12:46:14 +0200 |
|---|---|---|
| committer | Wolf-Michael Bolle <wolf-michael.bolle@nokia.com> | 2011-09-07 12:47:37 +0200 |
| commit | 1eb97c5c4a225eab9762d2e8a805c90464279805 (patch) | |
| tree | b6d812e8805e764b678c4176311adf45b35e20e2 /unittests | |
| parent | 301082a6a04b661f552d8337ed2e9c16a2665894 (diff) | |
Do not test the same thing twice.
Change-Id: Ibbdd508a935c17689f6f259959bebae6565c6b75
Reviewed-on: http://codereview.qt.nokia.com/4346
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>
Diffstat (limited to 'unittests')
| -rw-r--r-- | unittests/declarative/tst_declarative_mimetypes.qml | 26 | ||||
| -rw-r--r-- | unittests/tst_mimetypes-empty.cpp | 28 |
2 files changed, 0 insertions, 54 deletions
diff --git a/unittests/declarative/tst_declarative_mimetypes.qml b/unittests/declarative/tst_declarative_mimetypes.qml index d2e10cf..a3c0e5a 100644 --- a/unittests/declarative/tst_declarative_mimetypes.qml +++ b/unittests/declarative/tst_declarative_mimetypes.qml @@ -486,31 +486,5 @@ 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) } } diff --git a/unittests/tst_mimetypes-empty.cpp b/unittests/tst_mimetypes-empty.cpp index ab07a78..c9066bc 100644 --- a/unittests/tst_mimetypes-empty.cpp +++ b/unittests/tst_mimetypes-empty.cpp @@ -671,34 +671,6 @@ void tst_mimetypes::test_QMimeTypeRegistry_findApplications() QCOMPARE(resultOfFindApplications2.length(), 1); QCOMPARE(resultOfFindApplications2[0], gwenviewApplicationId); - - // -------------------------------------------------------------------------------------------- - - mimeTypeRegistry->setUserAlwaysSelectsApplication(editServiceActionName(), pngMimeTypeName(), false); - - mimeTypeRegistry->unregisterApplication(showimgApplicationId); - - QVERIFY(mimeTypeRegistry->userAlwaysSelectsApplication(editServiceActionName(), pngMimeTypeName())); - - resultOfFindApplications1 = mimeTypeRegistry->findApplications(pngMimeTypeName()); - - QCOMPARE(resultOfFindApplications1.length(), 2); - QCOMPARE(resultOfFindApplications1[0].first, gwenviewApplicationId); - QCOMPARE(resultOfFindApplications1[0].second, editServiceActionName()); // edit is before share - QCOMPARE(resultOfFindApplications1[1].first, gwenviewApplicationId); - QCOMPARE(resultOfFindApplications1[1].second, shareOnPicasaWebAlbumsName); - - resultOfFindApplications2 = - mimeTypeRegistry->findApplications(editServiceActionName(), pngMimeTypeName()); - - QCOMPARE(resultOfFindApplications2.length(), 1); - QCOMPARE(resultOfFindApplications2[0], gwenviewApplicationId); - - resultOfFindApplications2 = - mimeTypeRegistry->findApplications(shareOnPicasaWebAlbumsName, pngMimeTypeName()); - - QCOMPARE(resultOfFindApplications2.length(), 1); - QCOMPARE(resultOfFindApplications2[0], gwenviewApplicationId); } // ------------------------------------------------------------------------------------------------ |