summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolf-Michael Bolle <wolf-michael.bolle@nokia.com>2011-09-15 17:50:06 +0200
committerWolf-Michael Bolle <wolf-michael.bolle@nokia.com>2011-09-15 17:51:26 +0200
commitfe6ae1932a2510ee748659901c2ed8565225e698 (patch)
tree87307a0239871fb8f5f8532675bbc168fbea2575
parentaf4dda7541b61a1f3ce4a94e8647051214c9ada4 (diff)
Removed all mutable methods from QMimeTypeRegistry.
Change-Id: I40877b9263a6774030f40932479d2ba1e21de42b Reviewed-on: http://codereview.qt-project.org/5020 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>
-rw-r--r--src/imports/mimetypes/qdeclarativemimetyperegistry.cpp67
-rw-r--r--src/imports/mimetypes/qdeclarativemimetyperegistry_p.h32
-rw-r--r--src/mimetypes/qmimetyperegistry.h32
-rw-r--r--src/mimetypes/qmimetyperegistry_empty.cpp58
-rw-r--r--unittests/declarative/tst_declarative_mimetypes.qml293
-rw-r--r--unittests/tst_mimetypes-empty.cpp359
6 files changed, 26 insertions, 815 deletions
diff --git a/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp b/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp
index 10e390c..5794c0f 100644
--- a/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp
+++ b/src/imports/mimetypes/qdeclarativemimetyperegistry.cpp
@@ -69,20 +69,6 @@ QMimeTypeRegistry &QDeclarativeMimeTypeRegistry::mimeTypeRegistry()
// ------------------------------------------------------------------------------------------------
-void QDeclarativeMimeTypeRegistry::insertMimeType (
- QDeclarativeMimeType *mimeType
- )
-{
- if (mimeType == 0) {
- qWarning() << Q_FUNC_INFO << "mimeType:" << mimeType;
- return;
- }
-
- m_MimeTypeRegistry.insertMimeType(mimeType->mimeType());
-}
-
-// ------------------------------------------------------------------------------------------------
-
QVariantList QDeclarativeMimeTypeRegistry::mimeTypes() const
{
QVariantList result;
@@ -109,15 +95,6 @@ QDeclarativeMimeType *QDeclarativeMimeTypeRegistry::findMimeType (
// ------------------------------------------------------------------------------------------------
-void QDeclarativeMimeTypeRegistry::removeMimeType (
- const QMimeTypeName &mimeTypeName
- )
-{
- m_MimeTypeRegistry.removeMimeType(mimeTypeName);
-}
-
-// ------------------------------------------------------------------------------------------------
-
QVariantList QDeclarativeMimeTypeRegistry::fileExtentions() const
{
QVariantList result;
@@ -164,20 +141,6 @@ QMimeTypeName QDeclarativeMimeTypeRegistry::determineMimeType (
// ------------------------------------------------------------------------------------------------
-void QDeclarativeMimeTypeRegistry::insertServiceAction (
- QDeclarativeServiceAction *serviceAction
- )
-{
- if (serviceAction == 0) {
- qWarning() << Q_FUNC_INFO << "serviceAction:" << serviceAction;
- return;
- }
-
- m_MimeTypeRegistry.insertServiceAction(serviceAction->serviceAction());
-}
-
-// ------------------------------------------------------------------------------------------------
-
QVariantList QDeclarativeMimeTypeRegistry::serviceActions() const
{
QVariantList result;
@@ -205,15 +168,6 @@ QDeclarativeServiceAction *
// ------------------------------------------------------------------------------------------------
-void QDeclarativeMimeTypeRegistry::removeServiceAction (
- const QServiceActionName &serviceActionName
- )
-{
- return m_MimeTypeRegistry.removeServiceAction(serviceActionName);
-}
-
-// ------------------------------------------------------------------------------------------------
-
bool QDeclarativeMimeTypeRegistry::userAlwaysSelectsApplication (
const QServiceActionName &serviceActionName,
const QMimeTypeName &mimeTypeName
@@ -235,17 +189,6 @@ void QDeclarativeMimeTypeRegistry::setUserAlwaysSelectsApplication (
// ------------------------------------------------------------------------------------------------
-void QDeclarativeMimeTypeRegistry::registerApplication (
- const QApplicationId &applicationId,
- const QServiceActionName &serviceActionName,
- const QMimeTypeName &mimeTypeName
- )
-{
- return m_MimeTypeRegistry.registerApplication(applicationId, serviceActionName, mimeTypeName);
-}
-
-// ------------------------------------------------------------------------------------------------
-
void QDeclarativeMimeTypeRegistry::increaseApplicationPreference (
const QApplicationId &applicationId,
const QServiceActionName &serviceActionName,
@@ -268,16 +211,6 @@ void QDeclarativeMimeTypeRegistry::decreaseApplicationPreference (
// ------------------------------------------------------------------------------------------------
-void QDeclarativeMimeTypeRegistry::unregisterApplication (
- const QApplicationId &applicationId
- )
-{
- return m_MimeTypeRegistry.unregisterApplication(applicationId);
-}
-
-// ------------------------------------------------------------------------------------------------
-
-
QVariantList QDeclarativeMimeTypeRegistry::findApplications (
const QMimeTypeName &mimeTypeName
) const
diff --git a/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h b/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h
index addd615..58c0bea 100644
--- a/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h
+++ b/src/imports/mimetypes/qdeclarativemimetyperegistry_p.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef DECLARATIVE_MIME_TYPE_REGISTRY_P_H_INCLUDED
-#define DECLARATIVE_MIME_TYPE_REGISTRY_P_H_INCLUDED
+#ifndef QT_DECLARATIVE_MIME_TYPE_REGISTRY_P_H_INCLUDED
+#define QT_DECLARATIVE_MIME_TYPE_REGISTRY_P_H_INCLUDED
#include "qmimetyperegistry.h"
@@ -81,20 +81,12 @@ public:
// --------------------------------------------------------------------------------------------
- Q_INVOKABLE void insertMimeType (
- QDeclarativeMimeType *mimeType
- );
-
QVariantList mimeTypes() const;
Q_INVOKABLE QDeclarativeMimeType *findMimeType (
const QString &mimeTypeName
);
- Q_INVOKABLE void removeMimeType (
- const QString &mimeTypeName
- );
-
// --------------------------------------------------------------------------------------------
QVariantList fileExtentions() const;
@@ -115,20 +107,12 @@ public:
// --------------------------------------------------------------------------------------------
- Q_INVOKABLE void insertServiceAction (
- QDeclarativeServiceAction *serviceAction
- );
-
QVariantList serviceActions() const;
Q_INVOKABLE QDeclarativeServiceAction *findServiceAction (
const QString &serviceActionName
);
- Q_INVOKABLE void removeServiceAction (
- const QString &serviceActionName
- );
-
// --------------------------------------------------------------------------------------------
Q_INVOKABLE bool userAlwaysSelectsApplication (
@@ -144,12 +128,6 @@ public:
// --------------------------------------------------------------------------------------------
- Q_INVOKABLE void registerApplication (
- const QString &applicationId,
- const QString &serviceActionName,
- const QString &mimeTypeName
- );
-
Q_INVOKABLE void increaseApplicationPreference (
const QString &applicationId,
const QString &serviceActionName,
@@ -162,10 +140,6 @@ public:
const QString &mimeTypeName
);
- Q_INVOKABLE void unregisterApplication (
- const QString &applicationId
- );
-
Q_INVOKABLE QVariantList findApplications (
const QString &mimeTypeName
) const;
@@ -183,4 +157,4 @@ private:
QML_DECLARE_TYPE(QDeclarativeMimeTypeRegistry)
-#endif
+#endif // QT_DECLARATIVE_MIME_TYPE_REGISTRY_P_H_INCLUDED
diff --git a/src/mimetypes/qmimetyperegistry.h b/src/mimetypes/qmimetyperegistry.h
index f0bc963..8291ab5 100644
--- a/src/mimetypes/qmimetyperegistry.h
+++ b/src/mimetypes/qmimetyperegistry.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef MIMETYPES_H_INCLUDED
-#define MIMETYPES_H_INCLUDED
+#ifndef QT_MIMETYPES_H_INCLUDED
+#define QT_MIMETYPES_H_INCLUDED
#include "qmimetype.h"
#include "qmimetypesfwd.h"
@@ -64,20 +64,12 @@ public:
// --------------------------------------------------------------------------------------------
- void insertMimeType (
- const QMimeType &mimeType
- );
-
QList<QMimeTypeName> mimeTypes() const;
QMimeType findMimeType (
const QMimeTypeName &mimeTypeName
) const;
- void removeMimeType (
- const QMimeTypeName &mimeTypeName
- );
-
// --------------------------------------------------------------------------------------------
QList<QString> fileExtentions() const;
@@ -98,20 +90,12 @@ public:
// --------------------------------------------------------------------------------------------
- void insertServiceAction (
- const QServiceAction &serviceAction
- );
-
QList<QServiceActionName> serviceActions() const;
QServiceAction findServiceAction (
const QServiceActionName &serviceActionName
);
- void removeServiceAction (
- const QServiceActionName &serviceActionName
- );
-
// --------------------------------------------------------------------------------------------
bool userAlwaysSelectsApplication (
@@ -127,12 +111,6 @@ public:
// --------------------------------------------------------------------------------------------
- void registerApplication (
- const QApplicationId &applicationId,
- const QServiceActionName &serviceActionName,
- const QMimeTypeName &mimeTypeName
- );
-
void increaseApplicationPreference (
const QApplicationId &applicationId,
const QServiceActionName &serviceActionName,
@@ -145,10 +123,6 @@ public:
const QMimeTypeName &mimeTypeName
);
- void unregisterApplication (
- const QApplicationId &applicationId
- );
-
QList<QPair<QApplicationId, QServiceActionName> > findApplications (
const QMimeTypeName &mimeTypeName
) const;
@@ -164,4 +138,4 @@ private:
QMimeTypeRegistryPrivate *d_ptr;
};
-#endif
+#endif // QT_MIMETYPES_H_INCLUDED
diff --git a/src/mimetypes/qmimetyperegistry_empty.cpp b/src/mimetypes/qmimetyperegistry_empty.cpp
index 705a288..85b0438 100644
--- a/src/mimetypes/qmimetyperegistry_empty.cpp
+++ b/src/mimetypes/qmimetyperegistry_empty.cpp
@@ -61,15 +61,6 @@ QMimeTypeRegistry::~QMimeTypeRegistry()
// ------------------------------------------------------------------------------------------------
-void QMimeTypeRegistry::insertMimeType (
- const QMimeType &mimeType
- )
-{
- Q_UNUSED(mimeType)
-}
-
-// ------------------------------------------------------------------------------------------------
-
QList<QMimeTypeName> QMimeTypeRegistry::mimeTypes() const
{
typedef QList<QMimeTypeName> Result;
@@ -92,15 +83,6 @@ QMimeType QMimeTypeRegistry::findMimeType (
// ------------------------------------------------------------------------------------------------
-void QMimeTypeRegistry::removeMimeType (
- const QMimeTypeName &mimeTypeName
- )
-{
- Q_UNUSED(mimeTypeName)
-}
-
-// ------------------------------------------------------------------------------------------------
-
QList<QString> QMimeTypeRegistry::fileExtentions() const
{
typedef QList<QString> Result;
@@ -156,15 +138,6 @@ QMimeTypeName QMimeTypeRegistry::determineMimeType (
// ------------------------------------------------------------------------------------------------
-void QMimeTypeRegistry::insertServiceAction (
- const QServiceAction &serviceAction
- )
-{
- Q_UNUSED(serviceAction)
-}
-
-// ------------------------------------------------------------------------------------------------
-
QList<QServiceActionName> QMimeTypeRegistry::serviceActions() const
{
typedef QList<QServiceActionName> Result;
@@ -187,15 +160,6 @@ QServiceAction QMimeTypeRegistry::findServiceAction (
// ------------------------------------------------------------------------------------------------
-void QMimeTypeRegistry::removeServiceAction (
- const QServiceActionName &serviceActionName
- )
-{
- Q_UNUSED(serviceActionName)
-}
-
-// ------------------------------------------------------------------------------------------------
-
bool QMimeTypeRegistry::userAlwaysSelectsApplication (
const QServiceActionName &serviceActionName,
const QMimeTypeName &mimeTypeName
@@ -224,19 +188,6 @@ void QMimeTypeRegistry::setUserAlwaysSelectsApplication (
// ------------------------------------------------------------------------------------------------
-void QMimeTypeRegistry::registerApplication (
- const QApplicationId &applicationId,
- const QServiceActionName &serviceActionName,
- const QMimeTypeName &mimeTypeName
- )
-{
- Q_UNUSED(applicationId)
- Q_UNUSED(serviceActionName)
- Q_UNUSED(mimeTypeName)
-}
-
-// ------------------------------------------------------------------------------------------------
-
void QMimeTypeRegistry::increaseApplicationPreference (
const QApplicationId &applicationId,
const QServiceActionName &serviceActionName,
@@ -263,15 +214,6 @@ void QMimeTypeRegistry::decreaseApplicationPreference (
// ------------------------------------------------------------------------------------------------
-void QMimeTypeRegistry::unregisterApplication (
- const QApplicationId &applicationId
- )
-{
- Q_UNUSED(applicationId)
-}
-
-// ------------------------------------------------------------------------------------------------
-
QList<QPair<QApplicationId, QServiceActionName> >
QMimeTypeRegistry::findApplications (
const QMimeTypeName &mimeTypeName
diff --git a/unittests/declarative/tst_declarative_mimetypes.qml b/unittests/declarative/tst_declarative_mimetypes.qml
index b352333..c15357a 100644
--- a/unittests/declarative/tst_declarative_mimetypes.qml
+++ b/unittests/declarative/tst_declarative_mimetypes.qml
@@ -206,156 +206,39 @@ TestCase {
}
function test_MimeTypeRegistry_mimeTypes() {
- {
- var resultOfMimeTypes = mimeTypeRegistry.mimeTypes
-
- for (var mimeTypeNameIx = 0; mimeTypeNameIx < resultOfMimeTypes.length; ++mimeTypeNameIx) {
- //print(mimeTypeNameIx + ": " + resultOfMimeTypes[mimeTypeNameIx])
- mimeTypeRegistry.removeMimeType(resultOfMimeTypes[mimeTypeNameIx])
- }
-
- resultOfMimeTypes = mimeTypeRegistry.mimeTypes
- compare(resultOfMimeTypes.length, 0)
- }
-
- {
- // create
- mimeTypeRegistry.insertMimeType(instantiatedPngMimeType)
-
- var resultOfMimeTypes = mimeTypeRegistry.mimeTypes
-
- compare(resultOfMimeTypes.length, 1)
- compare(resultOfMimeTypes[0], pngMimeTypeName())
- }
-
- {
- // update
- mimeTypeRegistry.insertMimeType(instantiatedPngMimeType)
-
- var resultOfMimeTypes = mimeTypeRegistry.mimeTypes
-
- compare(resultOfMimeTypes.length, 1)
- compare(resultOfMimeTypes[0], pngMimeTypeName())
- }
-
- {
- mimeTypeRegistry.removeMimeType(pngMimeTypeName())
-
- var resultOfMimeTypes = mimeTypeRegistry.mimeTypes
-
- compare(resultOfMimeTypes.length, 0)
- }
+ compare(1, 0)
}
function test_MimeTypeRegistry_findMimeType() {
- mimeTypeRegistry.insertMimeType(instantiatedPngMimeType)
-
- var resultOfFindMimeType = mimeTypeRegistry.findMimeType(pngMimeTypeName())
-
- compare(resultOfFindMimeType.isValid, true)
- compare(resultOfFindMimeType.equals(instantiatedPngMimeType), true)
+ compare(1, 0)
}
function test_MimeTypeRegistry_fileExtentions() {
- mimeTypeRegistry.insertMimeType(instantiatedPngMimeType)
-
- var resultOfFileExtentions = mimeTypeRegistry.fileExtentions
-
- compare(resultOfFileExtentions.length, 1)
- compare(resultOfFileExtentions[0], firstPngMimeTypeFileExtention())
+ compare(1, 0)
}
function test_MimeTypeRegistry_extractFileExtention() {
- mimeTypeRegistry.insertMimeType(instantiatedPngMimeType)
-
- var pngFileName = 'image' + firstPngMimeTypeFileExtention()
-
- var resultOfExtractFileExtention = mimeTypeRegistry.extractFileExtention(pngFileName)
-
- compare(resultOfExtractFileExtention, firstPngMimeTypeFileExtention())
+ compare(1, 0)
}
function test_MimeTypeRegistry_findMimeTypes() {
- mimeTypeRegistry.insertMimeType(instantiatedPngMimeType)
-
- var resultOfFindMimeTypes = mimeTypeRegistry.findMimeTypes(firstPngMimeTypeFileExtention())
-
- compare(resultOfFindMimeTypes.length, 1)
- compare(resultOfFindMimeTypes[0], pngMimeTypeName())
+ compare(1, 0)
}
function test_MimeTypeRegistry_determineMimeType() {
- mimeTypeRegistry.insertMimeType(instantiatedPngMimeType)
-
- // TODO Implement test_MimeTypeRegistry_determineMimeType()
- compare('Not implemented!', '')
+ compare(1, 0)
}
function test_MimeTypeRegistry_serviceActions() {
- {
- var resultOfServiceActions = mimeTypeRegistry.serviceActions;
-
- for (var serviceActionNameIx = 0; serviceActionNameIx < resultOfServiceActions.length; ++serviceActionNameIx) {
- //print(serviceActionNameIx + ": " + resultOfServiceActions[serviceActionNameIx])
- mimeTypeRegistry.removeServiceAction(resultOfServiceActions[serviceActionNameIx])
- }
-
- resultOfServiceActions = mimeTypeRegistry.serviceActions
- compare(resultOfServiceActions.length, 0)
- }
-
- {
- // create
- mimeTypeRegistry.insertServiceAction(instantiatedEditServiceAction)
-
- var resultOfServiceActions = mimeTypeRegistry.serviceActions
-
- compare(resultOfServiceActions.length, 1)
- compare(resultOfServiceActions[0], editServiceActionName())
- }
-
- {
- // update
- mimeTypeRegistry.insertServiceAction(instantiatedEditServiceAction)
-
- var resultOfServiceActions = mimeTypeRegistry.serviceActions
-
- compare(resultOfServiceActions.length, 1)
- compare(resultOfServiceActions[0], editServiceActionName())
- }
-
- {
- mimeTypeRegistry.removeServiceAction(editServiceActionName())
-
- var resultOfServiceActions = mimeTypeRegistry.serviceActions
-
- compare(resultOfServiceActions.length, 0)
- }
+ compare(1, 0)
}
function test_MimeTypeRegistry_findServiceAction() {
- mimeTypeRegistry.insertServiceAction(instantiatedEditServiceAction)
-
- var resultOfFindServiceAction = mimeTypeRegistry.findServiceAction(editServiceActionName())
-
- compare(resultOfFindServiceAction.isValid, true)
- compare(resultOfFindServiceAction.equals(instantiatedEditServiceAction), true)
+ compare(1, 0)
}
function test_MimeTypeRegistry_setUserAlwaysSelectsApplication() {
- mimeTypeRegistry.insertServiceAction(instantiatedEditServiceAction)
-
- mimeTypeRegistry.setUserAlwaysSelectsApplication (
- editServiceActionName(), pngMimeTypeName(), true
- )
-
- compare(mimeTypeRegistry.userAlwaysSelectsApplication(editServiceActionName(), pngMimeTypeName()), true)
-
- mimeTypeRegistry.setUserAlwaysSelectsApplication (
- editServiceActionName(), pngMimeTypeName(), false
- )
-
- compare(!mimeTypeRegistry.userAlwaysSelectsApplication(editServiceActionName(), pngMimeTypeName()), true)
+ compare(1, 0)
}
function shareOnPicasaWebAlbumsName() { return 'shareOnPicasaWebAlbums' }
@@ -370,162 +253,6 @@ TestCase {
}
function test_MimeTypeRegistry_findApplications() {
- mimeTypeRegistry.insertServiceAction(instantiatedEditServiceAction)
- mimeTypeRegistry.insertServiceAction(shareOnPicasaWebAlbumsServiceAction)
- mimeTypeRegistry.insertMimeType(instantiatedPngMimeType)
-
- var gwenviewApplicationId = 'gwenview'
- var showimgApplicationId = 'showimg'
-
- {
- var resultOfFindApplications = mimeTypeRegistry.findApplications(pngMimeTypeName())
- for (var ix = 0; ix < resultOfFindApplications.length; ++ix) {
- if (resultOfFindApplications[ix].length != 2) {
- print("Error: resultOfFindApplications[" + ix + "].length: " + resultOfFindApplications[ix].length)
- continue
- }
-
- //print("application: " + resultOfFindApplications[ix][0] + ", action: " + resultOfFindApplications[ix][1])
- mimeTypeRegistry.unregisterApplication(resultOfFindApplications[ix][0])
- }
- resultOfFindApplications = mimeTypeRegistry.findApplications(pngMimeTypeName())
- compare(resultOfFindApplications.length, 0)
- }
-
- mimeTypeRegistry.registerApplication(gwenviewApplicationId, editServiceActionName(), pngMimeTypeName())
-
- var resultOfFindApplications1 = mimeTypeRegistry.findApplications(pngMimeTypeName())
-
- compare(resultOfFindApplications1.length, 1)
- compare(resultOfFindApplications1[0][0], gwenviewApplicationId)
- compare(resultOfFindApplications1[0][1], editServiceActionName())
-
- var resultOfFindApplications2 = mimeTypeRegistry.findApplications(editServiceActionName(), pngMimeTypeName())
-
- compare(resultOfFindApplications2.length, 1)
- compare(resultOfFindApplications2[0], gwenviewApplicationId)
-
- // ----------------------------------------------------------------------------------------
-
- mimeTypeRegistry.registerApplication(gwenviewApplicationId, shareOnPicasaWebAlbumsName(), pngMimeTypeName())
-
- resultOfFindApplications1 = mimeTypeRegistry.findApplications(pngMimeTypeName())
-
- compare(resultOfFindApplications1.length, 2)
- compare(resultOfFindApplications1[0][0], gwenviewApplicationId)
- compare(resultOfFindApplications1[0][1], editServiceActionName())
- 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)
-
- // ----------------------------------------------------------------------------------------
-
- mimeTypeRegistry.registerApplication(showimgApplicationId, editServiceActionName(), pngMimeTypeName())
-
- resultOfFindApplications1 = mimeTypeRegistry.findApplications(pngMimeTypeName())
-
- compare(resultOfFindApplications1.length, 3)
- compare(resultOfFindApplications1[0][0], showimgApplicationId)
- compare(resultOfFindApplications1[0][1], editServiceActionName()) // edit is before share
- compare(resultOfFindApplications1[1][0], gwenviewApplicationId)
- compare(resultOfFindApplications1[1][1], shareOnPicasaWebAlbumsName())
- compare(resultOfFindApplications1[2][0], gwenviewApplicationId) // priority #2
- compare(resultOfFindApplications1[2][1], editServiceActionName())
-
- resultOfFindApplications2 = mimeTypeRegistry.findApplications(editServiceActionName(), pngMimeTypeName())
-
- compare(resultOfFindApplications2.length, 2)
- compare(resultOfFindApplications2[0], showimgApplicationId)
- compare(resultOfFindApplications2[1], gwenviewApplicationId)
-
- resultOfFindApplications2 = mimeTypeRegistry.findApplications(shareOnPicasaWebAlbumsName(), pngMimeTypeName())
-
- compare(resultOfFindApplications2.length, 1)
- compare(resultOfFindApplications2[0], gwenviewApplicationId)
-
- // ----------------------------------------------------------------------------------------
-
- mimeTypeRegistry.increaseApplicationPreference(gwenviewApplicationId, editServiceActionName(), pngMimeTypeName())
-
- resultOfFindApplications1 = mimeTypeRegistry.findApplications(pngMimeTypeName())
-
- compare(resultOfFindApplications1.length, 3)
- compare(resultOfFindApplications1[0][0], gwenviewApplicationId)
- compare(resultOfFindApplications1[0][1], editServiceActionName())
- compare(resultOfFindApplications1[1][0], gwenviewApplicationId)
- compare(resultOfFindApplications1[1][1], shareOnPicasaWebAlbumsName())
- compare(resultOfFindApplications1[2][0], showimgApplicationId)
- compare(resultOfFindApplications1[2][1], editServiceActionName())
-
- resultOfFindApplications2 = mimeTypeRegistry.findApplications(editServiceActionName(), pngMimeTypeName())
-
- compare(resultOfFindApplications2.length, 2)
- compare(resultOfFindApplications2[0], gwenviewApplicationId)
- compare(resultOfFindApplications2[1], showimgApplicationId)
-
- resultOfFindApplications2 = mimeTypeRegistry.findApplications(shareOnPicasaWebAlbumsName(), pngMimeTypeName())
-
- compare(resultOfFindApplications2.length, 1)
- compare(resultOfFindApplications2[0], gwenviewApplicationId)
-
- // ----------------------------------------------------------------------------------------
-
- mimeTypeRegistry.decreaseApplicationPreference(gwenviewApplicationId, editServiceActionName(), pngMimeTypeName())
-
- resultOfFindApplications1 = mimeTypeRegistry.findApplications(pngMimeTypeName())
-
- compare(resultOfFindApplications1.length, 3)
- compare(resultOfFindApplications1[0][0], showimgApplicationId)
- compare(resultOfFindApplications1[0][1], editServiceActionName()) // edit is before share
- compare(resultOfFindApplications1[1][0], gwenviewApplicationId)
- compare(resultOfFindApplications1[1][1], shareOnPicasaWebAlbumsName())
- compare(resultOfFindApplications1[2][0], gwenviewApplicationId) // priority #2
- compare(resultOfFindApplications1[2][1], editServiceActionName())
-
- resultOfFindApplications2 = mimeTypeRegistry.findApplications(editServiceActionName(), pngMimeTypeName())
-
- compare(resultOfFindApplications2.length, 2)
- compare(resultOfFindApplications2[0], showimgApplicationId)
- compare(resultOfFindApplications2[1], gwenviewApplicationId)
-
- resultOfFindApplications2 = mimeTypeRegistry.findApplications(shareOnPicasaWebAlbumsName(), pngMimeTypeName())
-
- 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)
+ compare(1, 0)
}
}
diff --git a/unittests/tst_mimetypes-empty.cpp b/unittests/tst_mimetypes-empty.cpp
index 3c14f8d..3e8c7b2 100644
--- a/unittests/tst_mimetypes-empty.cpp
+++ b/unittests/tst_mimetypes-empty.cpp
@@ -297,123 +297,42 @@ const QMimeType &pngMimeType()
void tst_mimetypes::test_QMimeTypeRegistry_mimeTypes()
{
- QScopedPointer<QMimeTypeRegistry> mimeTypeRegistry (new QMimeTypeRegistry());
-
- {
- QList<QMimeTypeName> resultOfMimeTypes (mimeTypeRegistry->mimeTypes());
-
- foreach (const QMimeTypeName &mimeTypeName, resultOfMimeTypes) {
- mimeTypeRegistry->removeMimeType(mimeTypeName);
- }
-
- resultOfMimeTypes = mimeTypeRegistry->mimeTypes();
- QCOMPARE(resultOfMimeTypes.length(), 0);
- }
-
- {
- // create
- mimeTypeRegistry->insertMimeType(pngMimeType());
-
- QList<QMimeTypeName> resultOfMimeTypes (mimeTypeRegistry->mimeTypes());
-
- QCOMPARE(resultOfMimeTypes.length(), 1);
- QCOMPARE(resultOfMimeTypes.front(), pngMimeTypeName());
- }
-
- {
- // update
- mimeTypeRegistry->insertMimeType(pngMimeType());
-
- QList<QMimeTypeName> resultOfMimeTypes (mimeTypeRegistry->mimeTypes());
-
- QCOMPARE(resultOfMimeTypes.length(), 1);
- QCOMPARE(resultOfMimeTypes.front(), pngMimeTypeName());
- }
-
- {
- mimeTypeRegistry->removeMimeType(pngMimeTypeName());
-
- QList<QMimeTypeName> resultOfMimeTypes (mimeTypeRegistry->mimeTypes());
-
- QCOMPARE(resultOfMimeTypes.length(), 0);
- }
+ QVERIFY(false);
}
// ------------------------------------------------------------------------------------------------
void tst_mimetypes::test_QMimeTypeRegistry_findMimeType()
{
- QScopedPointer<QMimeTypeRegistry> mimeTypeRegistry (new QMimeTypeRegistry());
-
- mimeTypeRegistry->insertMimeType(pngMimeType());
-
- QMimeType resultOfFindMimeType (
- mimeTypeRegistry->findMimeType(pngMimeTypeName())
- );
-
- QVERIFY(resultOfFindMimeType.isValid());
- QCOMPARE(resultOfFindMimeType, pngMimeType());
+ QVERIFY(false);
}
// ------------------------------------------------------------------------------------------------
void tst_mimetypes::test_QMimeTypeRegistry_fileExtentions()
{
- QScopedPointer<QMimeTypeRegistry> mimeTypeRegistry (new QMimeTypeRegistry());
-
- mimeTypeRegistry->insertMimeType(pngMimeType());
-
- const QList<QString> resultOfFileExtentions (mimeTypeRegistry->fileExtentions());
-
- QCOMPARE(resultOfFileExtentions.length(), pngMimeTypeFileExtentions().length());
- QCOMPARE(resultOfFileExtentions.front(), pngMimeTypeFileExtentions().front());
+ QVERIFY(false);
}
// ------------------------------------------------------------------------------------------------
void tst_mimetypes::test_QMimeTypeRegistry_extractFileExtention()
{
- QScopedPointer<QMimeTypeRegistry> mimeTypeRegistry (new QMimeTypeRegistry());
-
- mimeTypeRegistry->insertMimeType(pngMimeType());
-
- QVERIFY(!pngMimeTypeFileExtentions().isEmpty());
- const QString pngFileName ("image" + pngMimeTypeFileExtentions().front());
-
- const QString resultOfExtractFileExtention (
- mimeTypeRegistry->extractFileExtention(pngFileName)
- );
-
- QCOMPARE(resultOfExtractFileExtention, pngMimeTypeFileExtentions().front());
+ QVERIFY(false);
}
// ------------------------------------------------------------------------------------------------
void tst_mimetypes::test_QMimeTypeRegistry_findMimeTypes()
{
- QScopedPointer<QMimeTypeRegistry> mimeTypeRegistry (new QMimeTypeRegistry());
-
- mimeTypeRegistry->insertMimeType(pngMimeType());
-
- QVERIFY(!pngMimeTypeFileExtentions().isEmpty());
- QList<QMimeTypeName> resultOfFindMimeTypes (
- mimeTypeRegistry->findMimeTypes(pngMimeTypeFileExtentions().front())
- );
-
- QCOMPARE(resultOfFindMimeTypes.length(), 1);
- QCOMPARE(resultOfFindMimeTypes.front(), pngMimeTypeName());
+ QVERIFY(false);
}
// ------------------------------------------------------------------------------------------------
void tst_mimetypes::test_QMimeTypeRegistry_determineMimeType()
{
- QScopedPointer<QMimeTypeRegistry> mimeTypeRegistry (new QMimeTypeRegistry());
-
- mimeTypeRegistry->insertMimeType(pngMimeType());
-
- /// @todo Implement test_QMimeTypeRegistry_determineMimeType()
- QCOMPARE("Not implemented!", "");
+ QVERIFY(false);
}
// ------------------------------------------------------------------------------------------------
@@ -432,286 +351,28 @@ const QServiceAction &editServiceAction()
void tst_mimetypes::test_QMimeTypeRegistry_serviceActions()
{
- QScopedPointer<QMimeTypeRegistry> mimeTypeRegistry (new QMimeTypeRegistry());
-
- {
- QList<QServiceActionName> resultOfServiceActions (mimeTypeRegistry->serviceActions());
-
- foreach (const QServiceActionName &serviceActionName, resultOfServiceActions) {
- mimeTypeRegistry->removeServiceAction(serviceActionName);
- }
-
- resultOfServiceActions = mimeTypeRegistry->serviceActions();
- QCOMPARE(resultOfServiceActions.length(), 0);
- }
-
- {
- // create
- mimeTypeRegistry->insertServiceAction(editServiceAction());
-
- QList<QServiceActionName> resultOfServiceActions (mimeTypeRegistry->serviceActions());
-
- QCOMPARE(resultOfServiceActions.length(), 1);
- QCOMPARE(resultOfServiceActions.front(), editServiceActionName());
- }
-
- {
- // update
- mimeTypeRegistry->insertServiceAction(editServiceAction());
-
- QList<QServiceActionName> resultOfServiceActions (mimeTypeRegistry->serviceActions());
-
- QCOMPARE(resultOfServiceActions.length(), 1);
- QCOMPARE(resultOfServiceActions.front(), editServiceActionName());
- }
-
- {
- mimeTypeRegistry->removeServiceAction(editServiceActionName());
-
- QList<QServiceActionName> resultOfServiceActions (mimeTypeRegistry->serviceActions());
-
- QCOMPARE(resultOfServiceActions.length(), 0);
- }
+ QVERIFY(false);
}
// ------------------------------------------------------------------------------------------------
void tst_mimetypes::test_QMimeTypeRegistry_findServiceAction()
{
- QScopedPointer<QMimeTypeRegistry> mimeTypeRegistry (new QMimeTypeRegistry());
-
- mimeTypeRegistry->insertServiceAction(editServiceAction());
-
- QServiceAction resultOfFindServiceAction (
- mimeTypeRegistry->findServiceAction(editServiceActionName())
- );
-
- QVERIFY(resultOfFindServiceAction.isValid());
- QCOMPARE(resultOfFindServiceAction, editServiceAction());
+ QVERIFY(false);
}
// ------------------------------------------------------------------------------------------------
void tst_mimetypes::test_QMimeTypeRegistry_setUserAlwaysSelectsApplication()
{
- QScopedPointer<QMimeTypeRegistry> mimeTypeRegistry (new QMimeTypeRegistry());
-
- mimeTypeRegistry->insertServiceAction(editServiceAction());
-
- mimeTypeRegistry->setUserAlwaysSelectsApplication (
- editServiceActionName(), pngMimeTypeName(), true
- );
-
- QVERIFY (
- mimeTypeRegistry->userAlwaysSelectsApplication(editServiceActionName(), pngMimeTypeName())
- );
-
- mimeTypeRegistry->setUserAlwaysSelectsApplication (
- editServiceActionName(), pngMimeTypeName(), false
- );
-
- QVERIFY (
- !mimeTypeRegistry->userAlwaysSelectsApplication(editServiceActionName(), pngMimeTypeName())
- );
+ QVERIFY(false);
}
// ------------------------------------------------------------------------------------------------
void tst_mimetypes::test_QMimeTypeRegistry_findApplications()
{
- QScopedPointer<QMimeTypeRegistry> mimeTypeRegistry (new QMimeTypeRegistry());
-
- mimeTypeRegistry->insertServiceAction(editServiceAction());
-
- const QServiceActionName shareOnPicasaWebAlbumsName ("shareOnPicasaWebAlbums");
- const QString shareOnPicasaWebAlbumsDisplayName ("Share on Picasa Web Albums");
- const QString shareOnPicasaWebAlbumsIconUrl ("/dev/null");
-
- mimeTypeRegistry->insertServiceAction (
- QServiceAction (
- shareOnPicasaWebAlbumsName,
- shareOnPicasaWebAlbumsDisplayName,
- shareOnPicasaWebAlbumsIconUrl
- )
- );
-
- mimeTypeRegistry->insertMimeType(pngMimeType());
-
- const QApplicationId gwenviewApplicationId ("gwenview");
- const QApplicationId showimgApplicationId ("showimg");
-
- // --------------------------------------------------------------------------------------------
-
- {
- QList<QPair<QApplicationId, QServiceActionName> >
- resultOfFindApplications (mimeTypeRegistry->findApplications(pngMimeTypeName()));
- typedef QPair<QApplicationId, QServiceActionName> Pair;
- foreach (const Pair &pair, resultOfFindApplications) {
- mimeTypeRegistry->unregisterApplication(pair.first);
- }
- resultOfFindApplications = mimeTypeRegistry->findApplications(pngMimeTypeName());
- QCOMPARE(resultOfFindApplications.length(), 0);
- }
-
- mimeTypeRegistry->registerApplication (
- gwenviewApplicationId, editServiceActionName(), pngMimeTypeName()
- );
-
- QList<QPair<QApplicationId, QServiceActionName> >
- resultOfFindApplications1 (mimeTypeRegistry->findApplications(pngMimeTypeName()));
-
- QCOMPARE(resultOfFindApplications1.length(), 1);
- QCOMPARE(resultOfFindApplications1[0].first, gwenviewApplicationId);
- QCOMPARE(resultOfFindApplications1[0].second, editServiceActionName());
-
- QList<QApplicationId>
- resultOfFindApplications2 (
- mimeTypeRegistry->findApplications(editServiceActionName(), pngMimeTypeName())
- );
-
- QCOMPARE(resultOfFindApplications2.length(), 1);
- QCOMPARE(resultOfFindApplications2[0], gwenviewApplicationId);
-
- // --------------------------------------------------------------------------------------------
-
- mimeTypeRegistry->registerApplication (
- gwenviewApplicationId, shareOnPicasaWebAlbumsName, pngMimeTypeName()
- );
-
- resultOfFindApplications1 = mimeTypeRegistry->findApplications(pngMimeTypeName());
-
- QCOMPARE(resultOfFindApplications1.length(), 2);
- QCOMPARE(resultOfFindApplications1[0].first, gwenviewApplicationId);
- QCOMPARE(resultOfFindApplications1[0].second, editServiceActionName());
- 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);
-
- // --------------------------------------------------------------------------------------------
-
- mimeTypeRegistry->registerApplication (
- showimgApplicationId, editServiceActionName(), pngMimeTypeName()
- );
-
- resultOfFindApplications1 = mimeTypeRegistry->findApplications(pngMimeTypeName());
-
- QCOMPARE(resultOfFindApplications1.length(), 3);
- QCOMPARE(resultOfFindApplications1[0].first, showimgApplicationId);
- QCOMPARE(resultOfFindApplications1[0].second, editServiceActionName()); // edit is before share
- QCOMPARE(resultOfFindApplications1[1].first, gwenviewApplicationId);
- QCOMPARE(resultOfFindApplications1[1].second, shareOnPicasaWebAlbumsName);
- QCOMPARE(resultOfFindApplications1[2].first, gwenviewApplicationId); // priority #2
- QCOMPARE(resultOfFindApplications1[2].second, editServiceActionName());
-
- resultOfFindApplications2 =
- mimeTypeRegistry->findApplications(editServiceActionName(), pngMimeTypeName());
-
- QCOMPARE(resultOfFindApplications2.length(), 2);
- QCOMPARE(resultOfFindApplications2[0], showimgApplicationId);
- QCOMPARE(resultOfFindApplications2[1], gwenviewApplicationId);
-
- resultOfFindApplications2 =
- mimeTypeRegistry->findApplications(shareOnPicasaWebAlbumsName, pngMimeTypeName());
-
- QCOMPARE(resultOfFindApplications2.length(), 1);
- QCOMPARE(resultOfFindApplications2[0], gwenviewApplicationId);
-
- // --------------------------------------------------------------------------------------------
-
- mimeTypeRegistry->increaseApplicationPreference (
- gwenviewApplicationId, editServiceActionName(), pngMimeTypeName()
- );
-
- resultOfFindApplications1 = mimeTypeRegistry->findApplications(pngMimeTypeName());
-
- QCOMPARE(resultOfFindApplications1.length(), 3);
- QCOMPARE(resultOfFindApplications1[0].first, gwenviewApplicationId);
- QCOMPARE(resultOfFindApplications1[0].second, editServiceActionName());
- QCOMPARE(resultOfFindApplications1[1].first, gwenviewApplicationId);
- QCOMPARE(resultOfFindApplications1[1].second, shareOnPicasaWebAlbumsName);
- QCOMPARE(resultOfFindApplications1[2].first, showimgApplicationId);
- QCOMPARE(resultOfFindApplications1[2].second, editServiceActionName());
-
- resultOfFindApplications2 =
- mimeTypeRegistry->findApplications(editServiceActionName(), pngMimeTypeName());
-
- QCOMPARE(resultOfFindApplications2.length(), 2);
- QCOMPARE(resultOfFindApplications2[0], gwenviewApplicationId);
- QCOMPARE(resultOfFindApplications2[1], showimgApplicationId);
-
- resultOfFindApplications2 =
- mimeTypeRegistry->findApplications(shareOnPicasaWebAlbumsName, pngMimeTypeName());
-
- QCOMPARE(resultOfFindApplications2.length(), 1);
- QCOMPARE(resultOfFindApplications2[0], gwenviewApplicationId);
-
- // --------------------------------------------------------------------------------------------
-
- mimeTypeRegistry->decreaseApplicationPreference (
- gwenviewApplicationId, editServiceActionName(), pngMimeTypeName()
- );
-
- resultOfFindApplications1 = mimeTypeRegistry->findApplications(pngMimeTypeName());
-
- QCOMPARE(resultOfFindApplications1.length(), 3);
- QCOMPARE(resultOfFindApplications1[0].first, showimgApplicationId);
- QCOMPARE(resultOfFindApplications1[0].second, editServiceActionName()); // edit is before share
- QCOMPARE(resultOfFindApplications1[1].first, gwenviewApplicationId);
- QCOMPARE(resultOfFindApplications1[1].second, shareOnPicasaWebAlbumsName);
- QCOMPARE(resultOfFindApplications1[2].first, gwenviewApplicationId); // priority #2
- QCOMPARE(resultOfFindApplications1[2].second, editServiceActionName());
-
- resultOfFindApplications2 =
- mimeTypeRegistry->findApplications(editServiceActionName(), pngMimeTypeName());
-
- QCOMPARE(resultOfFindApplications2.length(), 2);
- QCOMPARE(resultOfFindApplications2[0], showimgApplicationId);
- QCOMPARE(resultOfFindApplications2[1], gwenviewApplicationId);
-
- resultOfFindApplications2 =
- mimeTypeRegistry->findApplications(shareOnPicasaWebAlbumsName, pngMimeTypeName());
-
- 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);
+ QVERIFY(false);
}
// ------------------------------------------------------------------------------------------------