diff --git a/src/plugins/android/CMakeLists.txt b/src/plugins/android/CMakeLists.txt index 6048a5ecd76..e51a840e632 100644 --- a/src/plugins/android/CMakeLists.txt +++ b/src/plugins/android/CMakeLists.txt @@ -23,7 +23,7 @@ add_qtc_plugin(Android androidmanifesteditoriconwidget.cpp androidmanifesteditoriconwidget.h androidmanifesteditoriconcontainerwidget.cpp androidmanifesteditoriconcontainerwidget.h androidpackageinstallationstep.cpp androidpackageinstallationstep.h - androidplugin.cpp androidplugin.h + androidplugin.cpp androidpotentialkit.cpp androidpotentialkit.h androidqmlpreviewworker.cpp androidqmlpreviewworker.h androidqmltoolingsupport.cpp androidqmltoolingsupport.h diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs index 81fd94bca76..e1bcc9e0ce2 100644 --- a/src/plugins/android/android.qbs +++ b/src/plugins/android/android.qbs @@ -53,7 +53,6 @@ QtcPlugin { "androidpackageinstallationstep.cpp", "androidpackageinstallationstep.h", "androidplugin.cpp", - "androidplugin.h", "androidpotentialkit.cpp", "androidpotentialkit.h", "androidqmlpreviewworker.h", diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 83076139b3e..92eb11076a6 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -58,7 +58,6 @@ #ifdef WITH_TESTS # include -# include "androidplugin.h" #endif // WITH_TESTS using namespace QtSupport; @@ -1563,7 +1562,17 @@ void AndroidConfigurations::updateAndroidDevice() } #ifdef WITH_TESTS -void AndroidTests::testAndroidConfigAvailableNdkPlatforms_data() + +class AndroidConfigurationsTest final : public QObject +{ + Q_OBJECT + +private slots: + void testAndroidConfigAvailableNdkPlatforms_data(); + void testAndroidConfigAvailableNdkPlatforms(); +}; + +void AndroidConfigurationsTest::testAndroidConfigAvailableNdkPlatforms_data() { QTest::addColumn("ndkPath"); QTest::addColumn("abis"); @@ -1608,7 +1617,7 @@ void AndroidTests::testAndroidConfigAvailableNdkPlatforms_data() << abis64Bit; } -void AndroidTests::testAndroidConfigAvailableNdkPlatforms() +void AndroidConfigurationsTest::testAndroidConfigAvailableNdkPlatforms() { QFETCH(FilePath, ndkPath); QFETCH(Abis, abis); @@ -1619,6 +1628,11 @@ void AndroidTests::testAndroidConfigAvailableNdkPlatforms() QCOMPARE(foundPlatforms, expectedPlatforms); } +QObject *createAndroidConfigurationsTest() +{ + return new AndroidConfigurationsTest; +} + #endif // WITH_TESTS void setupAndroidConfigurations() @@ -1627,3 +1641,5 @@ void setupAndroidConfigurations() } } // namespace Android + +#include "androidconfigurations.moc" diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 4cdf6521031..f0149b22992 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -208,6 +208,10 @@ private: std::unique_ptr m_sdkManager; }; +#ifdef WITH_TESTS +QObject *createAndroidConfigurationsTest(); +#endif + void setupAndroidConfigurations(); } // namespace Android diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index e062bf1ccbf..1daf1bb7f6e 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -1,8 +1,6 @@ // Copyright (C) 2016 BogDan Vatra // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "androidplugin.h" - #include "androidconfigurations.h" #include "androidbuildapkstep.h" #include "androidconstants.h" @@ -123,9 +121,10 @@ class AndroidPlugin final : public ExtensionSystem::IPlugin [] { return new JLSSettings; }}); #ifdef WITH_TESTS - addTest(); - addTest(); - addTest(); + addTestCreator(createAndroidSdkManagerTest); + addTestCreator(createAndroidSdkManagerOutputParserTest); + addTestCreator(createAndroidQtVersionTest); + addTestCreator(createAndroidConfigurationsTest); #endif } diff --git a/src/plugins/android/androidplugin.h b/src/plugins/android/androidplugin.h deleted file mode 100644 index 0f1c118a97b..00000000000 --- a/src/plugins/android/androidplugin.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (C) 2016 BogDan Vatra -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include - -namespace Android::Internal { - -class AndroidTests final : public QObject -{ -#ifdef WITH_TESTS - - Q_OBJECT - -private slots: - void testAndroidConfigAvailableNdkPlatforms_data(); - void testAndroidConfigAvailableNdkPlatforms(); - void testAndroidQtVersionParseBuiltWith_data(); - void testAndroidQtVersionParseBuiltWith(); -#endif // WITH_TESTS -}; - -} // Android::Internal diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index 5872246621e..ac7bfc92d90 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -33,7 +33,6 @@ #ifdef WITH_TESTS # include -# include "androidplugin.h" #endif // WITH_TESTS using namespace ProjectExplorer; @@ -286,7 +285,17 @@ void setupAndroidQtVersion() } #ifdef WITH_TESTS -void AndroidTests::testAndroidQtVersionParseBuiltWith_data() + +class AndroidQtVersionTest final : public QObject +{ + Q_OBJECT + +private slots: + void testAndroidQtVersionParseBuiltWith_data(); + void testAndroidQtVersionParseBuiltWith(); +}; + +void AndroidQtVersionTest::testAndroidQtVersionParseBuiltWith_data() { QTest::addColumn("modulesCoreJson"); QTest::addColumn("hasInfo"); @@ -332,7 +341,7 @@ void AndroidTests::testAndroidQtVersionParseBuiltWith_data() << 31; } -void AndroidTests::testAndroidQtVersionParseBuiltWith() +void AndroidQtVersionTest::testAndroidQtVersionParseBuiltWith() { QFETCH(QString, modulesCoreJson); QFETCH(bool, hasInfo); @@ -346,6 +355,14 @@ void AndroidTests::testAndroidQtVersionParseBuiltWith() QCOMPARE(bw.apiVersion, apiVersion); QCOMPARE(bw.ndkVersion, ndkVersion); } + +QObject *createAndroidQtVersionTest() +{ + return new AndroidQtVersionTest; +} + #endif // WITH_TESTS } // Android::Internal + +#include "androidqtversion.moc" diff --git a/src/plugins/android/androidqtversion.h b/src/plugins/android/androidqtversion.h index 80005a0315c..cf52b63000b 100644 --- a/src/plugins/android/androidqtversion.h +++ b/src/plugins/android/androidqtversion.h @@ -51,4 +51,8 @@ private: void setupAndroidQtVersion(); +#ifdef WITH_TESTS +QObject *createAndroidQtVersionTest(); +#endif + } // Android::Internal diff --git a/src/plugins/android/androidsdkmanager_test.cpp b/src/plugins/android/androidsdkmanager_test.cpp index de97bbc85e1..abe6aa229c1 100644 --- a/src/plugins/android/androidsdkmanager_test.cpp +++ b/src/plugins/android/androidsdkmanager_test.cpp @@ -8,11 +8,14 @@ namespace Android::Internal { -AndroidSdkManagerTest::AndroidSdkManagerTest(QObject *parent) - : QObject(parent) -{} +class AndroidSdkManagerTest final : public QObject +{ + Q_OBJECT -AndroidSdkManagerTest::~AndroidSdkManagerTest() = default; +private slots: + void testAndroidSdkManagerProgressParser_data(); + void testAndroidSdkManagerProgressParser(); +}; void AndroidSdkManagerTest::testAndroidSdkManagerProgressParser_data() { @@ -61,5 +64,11 @@ void AndroidSdkManagerTest::testAndroidSdkManagerProgressParser() QCOMPARE(foundAssertion, actualFoundAssertion); } - +QObject *createAndroidSdkManagerTest() +{ + return new AndroidSdkManagerTest; } + +} // Android::Internal + +#include "androidsdkmanager_test.moc" diff --git a/src/plugins/android/androidsdkmanager_test.h b/src/plugins/android/androidsdkmanager_test.h index d48d0b1fde7..fe940abe67b 100644 --- a/src/plugins/android/androidsdkmanager_test.h +++ b/src/plugins/android/androidsdkmanager_test.h @@ -5,23 +5,8 @@ #include -QT_BEGIN_NAMESPACE -class QString; -QT_END_NAMESPACE +namespace Android::Internal { -namespace Android { -namespace Internal { +QObject *createAndroidSdkManagerTest(); -class AndroidSdkManagerTest : public QObject -{ - Q_OBJECT -public: - AndroidSdkManagerTest(QObject *parent = nullptr); - ~AndroidSdkManagerTest(); - -private slots: - void testAndroidSdkManagerProgressParser_data(); - void testAndroidSdkManagerProgressParser(); -}; -} // namespace Internal -} // namespace Android +} // Android::Internal diff --git a/src/plugins/android/sdkmanageroutputparser_test.cpp b/src/plugins/android/sdkmanageroutputparser_test.cpp index 067b2f53056..6a5915ce723 100644 --- a/src/plugins/android/sdkmanageroutputparser_test.cpp +++ b/src/plugins/android/sdkmanageroutputparser_test.cpp @@ -10,18 +10,65 @@ #include #include #include -#include -#include #include namespace Android::Internal { -SdkManagerOutputParserTest::SdkManagerOutputParserTest(QObject *parent) - : QObject(parent) - , m_parser(std::make_unique(m_packages)) -{} +class SdkManagerOutputParserTest : public QObject +{ + Q_OBJECT +public: + SdkManagerOutputParserTest() + : m_parser(std::make_unique(m_packages)) + {} -SdkManagerOutputParserTest::~SdkManagerOutputParserTest() = default; +private: + AndroidSdkPackageList m_packages; + std::unique_ptr m_parser; + +private slots: + void testParsePackageListing_data(); + void testParsePackageListing(); + + void testParseMarkers_data(); + void testParseMarkers(); + + void testParseBuildToolsPackage_data(); + void testParseBuildToolsPackage(); + void testParseBuildToolsPackageEmpty(); + + void testParseSdkToolsPackage_data(); + void testParseSdkToolsPackage(); + void testParseSdkToolsPackageEmpty(); + + void testParsePlatformToolsPackage_data(); + void testParsePlatformToolsPackage(); + void testParsePlatformToolsPackageEmpty(); + + void testParseEmulatorToolsPackage_data(); + void testParseEmulatorToolsPackage(); + void testParseEmulatorToolsPackageEmpty(); + + void testParseNdkPackage_data(); + void testParseNdkPackage(); + void testParseNdkPackageEmpty(); + + void testParseExtraToolsPackage_data(); + void testParseExtraToolsPackage(); + void testParseExtraToolsPackageEmpty(); + + void testParseGenericToolsPackage_data(); + void testParseGenericToolsPackage(); + void testParseGenericToolsPackageEmpty(); + + void testParsePlatformPackage_data(); + void testParsePlatformPackage(); + void testParsePlatformPackageEmpty(); + + void testParseSystemImagePackage_data(); + void testParseSystemImagePackage(); + void testParseSystemImagePackageEmpty(); +}; void SdkManagerOutputParserTest::testParseMarkers_data() { @@ -789,5 +836,11 @@ cmdline-tools;latest } +QObject *createAndroidSdkManagerOutputParserTest() +{ + return new SdkManagerOutputParserTest; +} + } // namespace Android::Internal +#include "sdkmanageroutputparser_test.moc" diff --git a/src/plugins/android/sdkmanageroutputparser_test.h b/src/plugins/android/sdkmanageroutputparser_test.h index c2094e532a4..de005151c30 100644 --- a/src/plugins/android/sdkmanageroutputparser_test.h +++ b/src/plugins/android/sdkmanageroutputparser_test.h @@ -5,70 +5,8 @@ #include -#include "androidsdkpackage.h" +namespace Android::Internal { -QT_BEGIN_NAMESPACE -class QString; -QT_END_NAMESPACE +QObject *createAndroidSdkManagerOutputParserTest(); -namespace Android { -namespace Internal { - -class SdkManagerOutputParser; - -class SdkManagerOutputParserTest : public QObject -{ - Q_OBJECT -public: - SdkManagerOutputParserTest(QObject *parent = nullptr); - ~SdkManagerOutputParserTest(); - -private: - AndroidSdkPackageList m_packages; - std::unique_ptr m_parser; - -private slots: - void testParsePackageListing_data(); - void testParsePackageListing(); - - void testParseMarkers_data(); - void testParseMarkers(); - - void testParseBuildToolsPackage_data(); - void testParseBuildToolsPackage(); - void testParseBuildToolsPackageEmpty(); - - void testParseSdkToolsPackage_data(); - void testParseSdkToolsPackage(); - void testParseSdkToolsPackageEmpty(); - - void testParsePlatformToolsPackage_data(); - void testParsePlatformToolsPackage(); - void testParsePlatformToolsPackageEmpty(); - - void testParseEmulatorToolsPackage_data(); - void testParseEmulatorToolsPackage(); - void testParseEmulatorToolsPackageEmpty(); - - void testParseNdkPackage_data(); - void testParseNdkPackage(); - void testParseNdkPackageEmpty(); - - void testParseExtraToolsPackage_data(); - void testParseExtraToolsPackage(); - void testParseExtraToolsPackageEmpty(); - - void testParseGenericToolsPackage_data(); - void testParseGenericToolsPackage(); - void testParseGenericToolsPackageEmpty(); - - void testParsePlatformPackage_data(); - void testParsePlatformPackage(); - void testParsePlatformPackageEmpty(); - - void testParseSystemImagePackage_data(); - void testParseSystemImagePackage(); - void testParseSystemImagePackageEmpty(); -}; -} // namespace Internal -} // namespace Android +} // Android::Internal