diff options
Diffstat (limited to 'tests/auto/corelib/mimetypes')
6 files changed, 193 insertions, 77 deletions
diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt index 99709d7731..9dc2ea18bf 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt @@ -1,11 +1,14 @@ # Generated from qmimedatabase-cache.pro. +if(NOT QT_FEATURE_private_tests) + return() +endif() + ##################################################################### ## tst_qmimedatabase-cache Test: ##################################################################### add_qt_test(tst_qmimedatabase-cache - GUI SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-cache.cpp @@ -14,55 +17,81 @@ add_qt_test(tst_qmimedatabase-cache ) # Resources: -set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" - PROPERTIES alias "freedesktop.org.xml" +set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" + PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml" +) +set(mimetypes_resource_files + "mime/packages/freedesktop.org.xml" ) + add_qt_resource(tst_qmimedatabase-cache "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE - "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes" + "/devel/work/qt-cmake/qtbase/src/corelib/mimetypes" FILES - mime/packages/freedesktop.org.xml + ${mimetypes_resource_files} +) +set_source_files_properties("../invalid-magic1.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml" +) +set_source_files_properties("../invalid-magic2.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml" +) +set_source_files_properties("../invalid-magic3.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml" +) +set_source_files_properties("../magic-and-hierarchy.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo" +) +set_source_files_properties("../magic-and-hierarchy.xml" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml" +) +set_source_files_properties("../magic-and-hierarchy2.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo" ) set_source_files_properties("../qml-again.xml" - PROPERTIES alias "qml-again.xml" + PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml" ) set_source_files_properties("../test.qml" - PROPERTIES alias "test.qml" + PROPERTIES QT_RESOURCE_ALIAS "test.qml" ) set_source_files_properties("../text-x-objcsrc.xml" - PROPERTIES alias "text-x-objcsrc.xml" + PROPERTIES QT_RESOURCE_ALIAS "text-x-objcsrc.xml" ) set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml" - PROPERTIES alias "yast2-metapackage-handler-mimetypes.xml" + PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml" ) +set(testdata_resource_files + "invalid-magic1.xml" + "invalid-magic2.xml" + "invalid-magic3.xml" + "magic-and-hierarchy.foo" + "magic-and-hierarchy.xml" + "magic-and-hierarchy2.foo" + "qml-again.xml" + "test.qml" + "text-x-objcsrc.xml" + "yast2-metapackage-handler-mimetypes.xml" +) + add_qt_resource(tst_qmimedatabase-cache "testdata" PREFIX "/qt-project.org/qmime" BASE ".." FILES - invalid-magic1.xml - invalid-magic2.xml - invalid-magic3.xml - magic-and-hierarchy.foo - magic-and-hierarchy.xml - magic-and-hierarchy2.foo - qml-again.xml - test.qml - text-x-objcsrc.xml - yast2-metapackage-handler-mimetypes.xml + ${testdata_resource_files} ) #### Keys ignored in scope 1:.:.:qmimedatabase-cache.pro:<TRUE>: -# CONFIG = "testcase" +# _REQUIREMENTS = "qtConfig(private_tests)" ## Scopes: ##################################################################### -extend_target(tst_qmimedatabase-cache CONDITION 2*_x_ - g +extend_target(tst_qmimedatabase-cache CONDITION GCC COMPILE_OPTIONS -W -Wall diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt index 6bd76e0b9e..7720e4d18e 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/CMakeLists.txt @@ -1,11 +1,14 @@ # Generated from qmimedatabase-cache.pro. +if(NOT QT_FEATURE_private_tests) + return() +endif() + ##################################################################### ## tst_qmimedatabase-cache Test: ##################################################################### add_qt_test(tst_qmimedatabase-cache - GUI SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-cache.cpp @@ -14,6 +17,30 @@ add_qt_test(tst_qmimedatabase-cache ) # Resources: +# special case begin +# the freedesktop resources are handled manually below via mimetypes_resources.cmake +#set(mimetypes_resource_files + #"mime/packages/freedesktop.org.xml" +#) +# special case end +set_source_files_properties("../invalid-magic1.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml" +) +set_source_files_properties("../invalid-magic2.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml" +) +set_source_files_properties("../invalid-magic3.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml" +) +set_source_files_properties("../magic-and-hierarchy.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo" +) +set_source_files_properties("../magic-and-hierarchy.xml" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml" +) +set_source_files_properties("../magic-and-hierarchy2.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo" +) set_source_files_properties("../qml-again.xml" PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml" ) @@ -26,22 +53,26 @@ set_source_files_properties("../text-x-objcsrc.xml" set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml" PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml" ) +set(testdata_resource_files + "invalid-magic1.xml" + "invalid-magic2.xml" + "invalid-magic3.xml" + "magic-and-hierarchy.foo" + "magic-and-hierarchy.xml" + "magic-and-hierarchy2.foo" + "qml-again.xml" + "test.qml" + "text-x-objcsrc.xml" + "yast2-metapackage-handler-mimetypes.xml" +) + add_qt_resource(tst_qmimedatabase-cache "testdata" PREFIX "/qt-project.org/qmime" BASE ".." FILES - invalid-magic1.xml - invalid-magic2.xml - invalid-magic3.xml - magic-and-hierarchy.foo - magic-and-hierarchy.xml - magic-and-hierarchy2.foo - qml-again.xml - test.qml - text-x-objcsrc.xml - yast2-metapackage-handler-mimetypes.xml + ${testdata_resource_files} ) # special case begin @@ -51,13 +82,12 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-cache) # special case end #### Keys ignored in scope 1:.:.:qmimedatabase-cache.pro:<TRUE>: -# CONFIG = "testcase" +# _REQUIREMENTS = "qtConfig(private_tests)" ## Scopes: ##################################################################### -extend_target(tst_qmimedatabase-cache CONDITION CMAKE_COMPILER_IS_GNUCXX - +extend_target(tst_qmimedatabase-cache CONDITION GCC COMPILE_OPTIONS -W -Wall diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt index a33b6c4dcf..1672255d29 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt @@ -1,11 +1,14 @@ # Generated from qmimedatabase-xml.pro. +if(NOT QT_FEATURE_private_tests) + return() +endif() + ##################################################################### ## tst_qmimedatabase-xml Test: ##################################################################### add_qt_test(tst_qmimedatabase-xml - GUI SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-xml.cpp @@ -14,55 +17,81 @@ add_qt_test(tst_qmimedatabase-xml ) # Resources: -set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" - PROPERTIES alias "freedesktop.org.xml" +set_source_files_properties("/devel/work/qt-cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml" + PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml" +) +set(mimetypes_resource_files + "mime/packages/freedesktop.org.xml" ) + add_qt_resource(tst_qmimedatabase-xml "mimetypes" PREFIX "/qt-project.org/qmime/packages" BASE - "/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes" + "/devel/work/qt-cmake/qtbase/src/corelib/mimetypes" FILES - mime/packages/freedesktop.org.xml + ${mimetypes_resource_files} +) +set_source_files_properties("../invalid-magic1.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml" +) +set_source_files_properties("../invalid-magic2.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml" +) +set_source_files_properties("../invalid-magic3.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml" +) +set_source_files_properties("../magic-and-hierarchy.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo" +) +set_source_files_properties("../magic-and-hierarchy.xml" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml" +) +set_source_files_properties("../magic-and-hierarchy2.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo" ) set_source_files_properties("../qml-again.xml" - PROPERTIES alias "qml-again.xml" + PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml" ) set_source_files_properties("../test.qml" - PROPERTIES alias "test.qml" + PROPERTIES QT_RESOURCE_ALIAS "test.qml" ) set_source_files_properties("../text-x-objcsrc.xml" - PROPERTIES alias "text-x-objcsrc.xml" + PROPERTIES QT_RESOURCE_ALIAS "text-x-objcsrc.xml" ) set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml" - PROPERTIES alias "yast2-metapackage-handler-mimetypes.xml" + PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml" ) +set(testdata_resource_files + "invalid-magic1.xml" + "invalid-magic2.xml" + "invalid-magic3.xml" + "magic-and-hierarchy.foo" + "magic-and-hierarchy.xml" + "magic-and-hierarchy2.foo" + "qml-again.xml" + "test.qml" + "text-x-objcsrc.xml" + "yast2-metapackage-handler-mimetypes.xml" +) + add_qt_resource(tst_qmimedatabase-xml "testdata" PREFIX "/qt-project.org/qmime" BASE ".." FILES - invalid-magic1.xml - invalid-magic2.xml - invalid-magic3.xml - magic-and-hierarchy.foo - magic-and-hierarchy.xml - magic-and-hierarchy2.foo - qml-again.xml - test.qml - text-x-objcsrc.xml - yast2-metapackage-handler-mimetypes.xml + ${testdata_resource_files} ) #### Keys ignored in scope 1:.:.:qmimedatabase-xml.pro:<TRUE>: -# CONFIG = "testcase" +# _REQUIREMENTS = "qtConfig(private_tests)" ## Scopes: ##################################################################### -extend_target(tst_qmimedatabase-xml CONDITION 2*_x_ - g +extend_target(tst_qmimedatabase-xml CONDITION GCC COMPILE_OPTIONS -W -Wall diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt index d9491fd34b..cf8e349226 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/CMakeLists.txt @@ -1,11 +1,14 @@ # Generated from qmimedatabase-xml.pro. +if(NOT QT_FEATURE_private_tests) + return() +endif() + ##################################################################### ## tst_qmimedatabase-xml Test: ##################################################################### add_qt_test(tst_qmimedatabase-xml - GUI SOURCES ../tst_qmimedatabase.h tst_qmimedatabase-xml.cpp @@ -14,6 +17,30 @@ add_qt_test(tst_qmimedatabase-xml ) # Resources: +# special case begin +# the freedesktop resources are handled manually below via mimetypes_resources.cmake +#set(mimetypes_resource_files + #"mime/packages/freedesktop.org.xml" +#) +# special case end +set_source_files_properties("../invalid-magic1.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic1.xml" +) +set_source_files_properties("../invalid-magic2.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic2.xml" +) +set_source_files_properties("../invalid-magic3.xml" + PROPERTIES QT_RESOURCE_ALIAS "invalid-magic3.xml" +) +set_source_files_properties("../magic-and-hierarchy.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.foo" +) +set_source_files_properties("../magic-and-hierarchy.xml" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy.xml" +) +set_source_files_properties("../magic-and-hierarchy2.foo" + PROPERTIES QT_RESOURCE_ALIAS "magic-and-hierarchy2.foo" +) set_source_files_properties("../qml-again.xml" PROPERTIES QT_RESOURCE_ALIAS "qml-again.xml" ) @@ -26,22 +53,26 @@ set_source_files_properties("../text-x-objcsrc.xml" set_source_files_properties("../yast2-metapackage-handler-mimetypes.xml" PROPERTIES QT_RESOURCE_ALIAS "yast2-metapackage-handler-mimetypes.xml" ) +set(testdata_resource_files + "invalid-magic1.xml" + "invalid-magic2.xml" + "invalid-magic3.xml" + "magic-and-hierarchy.foo" + "magic-and-hierarchy.xml" + "magic-and-hierarchy2.foo" + "qml-again.xml" + "test.qml" + "text-x-objcsrc.xml" + "yast2-metapackage-handler-mimetypes.xml" +) + add_qt_resource(tst_qmimedatabase-xml "testdata" PREFIX "/qt-project.org/qmime" BASE ".." FILES - invalid-magic1.xml - invalid-magic2.xml - invalid-magic3.xml - magic-and-hierarchy.foo - magic-and-hierarchy.xml - magic-and-hierarchy2.foo - qml-again.xml - test.qml - text-x-objcsrc.xml - yast2-metapackage-handler-mimetypes.xml + ${testdata_resource_files} ) # special case begin @@ -51,12 +82,12 @@ corelib_add_mimetypes_resources(tst_qmimedatabase-xml) # special case end #### Keys ignored in scope 1:.:.:qmimedatabase-xml.pro:<TRUE>: -# CONFIG = "testcase" +# _REQUIREMENTS = "qtConfig(private_tests)" ## Scopes: ##################################################################### -extend_target(tst_qmimedatabase-xml CONDITION CMAKE_COMPILER_IS_GNUCXX # special case +extend_target(tst_qmimedatabase-xml CONDITION GCC COMPILE_OPTIONS -W -Wall diff --git a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp index fd3cc18af5..60017d53fa 100644 --- a/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp +++ b/tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp @@ -73,12 +73,12 @@ static inline QString testSuiteWarning() str << "\nCannot find the shared-mime-info test suite\nstarting from: " << QDir::toNativeSeparators(QDir::currentPath()) << "\n" "cd " << QDir::toNativeSeparators(QStringLiteral("tests/auto/corelib/mimetypes/qmimedatabase")) << "\n" - "wget http://cgit.freedesktop.org/xdg/shared-mime-info/snapshot/Release-1-10.zip\n" - "unzip Release-1-10.zip\n"; + "wget https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/Release-1-10/shared-mime-info-Release-1-10.zip\n" + "unzip shared-mime-info-Release-1-10.zip\n"; #ifdef Q_OS_WIN - str << "mkdir testfiles\nxcopy /s Release-1-10 s-m-i\n"; + str << "mkdir testfiles\nxcopy /s shared-mime-info-Release-1-10 s-m-i\n"; #else - str << "ln -s Release-1-10 s-m-i\n"; + str << "ln -s shared-mime-info-Release-1-10 s-m-i\n"; #endif return result; } diff --git a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt index adfcefb917..990835c86a 100644 --- a/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt +++ b/tests/auto/corelib/mimetypes/qmimetype/CMakeLists.txt @@ -7,9 +7,6 @@ add_qt_test(tst_qmimetype SOURCES tst_qmimetype.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) - -#### Keys ignored in scope 1:.:.:qmimetype.pro:<TRUE>: -# CONFIG = "testcase" |