feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SdkManagerOutputParser: Hide subclasses for package parsers

Browse Source 
Change-Id: I05543aeb8b5f039cad349dad6fc3af557e487dfc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2024-01-31 21:30:41 +01:00
parent 5bddae2b62
commit e2e0a9a718
3 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/sdkmanageroutputparser.cpp
View File

@@ -328,7 +328,7 @@ QPair<SystemImage *, int> SdkManagerOutputParser::parseSystemImage(const QString
return result; return result;
} }
BuildTools *SdkManagerOutputParser::parseBuildToolsPackage(const QStringList &data) const AndroidSdkPackage *SdkManagerOutputParser::parseBuildToolsPackage(const QStringList &data) const
{ {
BuildTools *buildTools = nullptr; BuildTools *buildTools = nullptr;
GenericPackageData packageData; GenericPackageData packageData;
@@ -344,7 +344,7 @@ BuildTools *SdkManagerOutputParser::parseBuildToolsPackage(const QStringList &da
return buildTools; return buildTools;
} }
SdkTools *SdkManagerOutputParser::parseSdkToolsPackage(const QStringList &data) const AndroidSdkPackage *SdkManagerOutputParser::parseSdkToolsPackage(const QStringList &data) const
{ {
SdkTools *sdkTools = nullptr; SdkTools *sdkTools = nullptr;
GenericPackageData packageData; GenericPackageData packageData;
@@ -360,7 +360,7 @@ SdkTools *SdkManagerOutputParser::parseSdkToolsPackage(const QStringList &data)
return sdkTools; return sdkTools;
} }
PlatformTools *SdkManagerOutputParser::parsePlatformToolsPackage(const QStringList &data) const AndroidSdkPackage *SdkManagerOutputParser::parsePlatformToolsPackage(const QStringList &data) const
{ {
PlatformTools *platformTools = nullptr; PlatformTools *platformTools = nullptr;
GenericPackageData packageData; GenericPackageData packageData;
@@ -376,7 +376,7 @@ PlatformTools *SdkManagerOutputParser::parsePlatformToolsPackage(const QStringLi
return platformTools; return platformTools;
} }
EmulatorTools *SdkManagerOutputParser::parseEmulatorToolsPackage(const QStringList &data) const AndroidSdkPackage *SdkManagerOutputParser::parseEmulatorToolsPackage(const QStringList &data) const
{ {
EmulatorTools *emulatorTools = nullptr; EmulatorTools *emulatorTools = nullptr;
GenericPackageData packageData; GenericPackageData packageData;
@@ -392,7 +392,7 @@ EmulatorTools *SdkManagerOutputParser::parseEmulatorToolsPackage(const QStringLi
return emulatorTools; return emulatorTools;
} }
Ndk *SdkManagerOutputParser::parseNdkPackage(const QStringList &data) const AndroidSdkPackage *SdkManagerOutputParser::parseNdkPackage(const QStringList &data) const
{ {
Ndk *ndk = nullptr; Ndk *ndk = nullptr;
GenericPackageData packageData; GenericPackageData packageData;
@@ -408,7 +408,7 @@ Ndk *SdkManagerOutputParser::parseNdkPackage(const QStringList &data) const
return ndk; return ndk;
} }
ExtraTools *SdkManagerOutputParser::parseExtraToolsPackage(const QStringList &data) const AndroidSdkPackage *SdkManagerOutputParser::parseExtraToolsPackage(const QStringList &data) const
{ {
ExtraTools *extraTools = nullptr; ExtraTools *extraTools = nullptr;
GenericPackageData packageData; GenericPackageData packageData;
@@ -424,7 +424,7 @@ ExtraTools *SdkManagerOutputParser::parseExtraToolsPackage(const QStringList &da
return extraTools; return extraTools;
} }
GenericSdkPackage *SdkManagerOutputParser::parseGenericTools(const QStringList &data) const AndroidSdkPackage *SdkManagerOutputParser::parseGenericTools(const QStringList &data) const
{ {
GenericSdkPackage *sdkPackage = nullptr; GenericSdkPackage *sdkPackage = nullptr;
GenericPackageData packageData; GenericPackageData packageData;

14
src/plugins/android/sdkmanageroutputparser.h
View File

@@ -43,13 +43,13 @@ private:
void parsePackageData(MarkerTag packageMarker, const QStringList &data); void parsePackageData(MarkerTag packageMarker, const QStringList &data);
AndroidSdkPackage *parsePlatform(const QStringList &data) const; AndroidSdkPackage *parsePlatform(const QStringList &data) const;
QPair<SystemImage *, int> parseSystemImage(const QStringList &data) const; QPair<SystemImage *, int> parseSystemImage(const QStringList &data) const;
BuildTools *parseBuildToolsPackage(const QStringList &data) const; AndroidSdkPackage *parseBuildToolsPackage(const QStringList &data) const;
SdkTools *parseSdkToolsPackage(const QStringList &data) const; AndroidSdkPackage *parseSdkToolsPackage(const QStringList &data) const;
PlatformTools *parsePlatformToolsPackage(const QStringList &data) const; AndroidSdkPackage *parsePlatformToolsPackage(const QStringList &data) const;
EmulatorTools *parseEmulatorToolsPackage(const QStringList &data) const; AndroidSdkPackage *parseEmulatorToolsPackage(const QStringList &data) const;
Ndk *parseNdkPackage(const QStringList &data) const; AndroidSdkPackage *parseNdkPackage(const QStringList &data) const;
ExtraTools *parseExtraToolsPackage(const QStringList &data) const; AndroidSdkPackage *parseExtraToolsPackage(const QStringList &data) const;
GenericSdkPackage *parseGenericTools(const QStringList &data) const; AndroidSdkPackage *parseGenericTools(const QStringList &data) const;
MarkerTag parseMarkers(const QString &line); MarkerTag parseMarkers(const QString &line);
MarkerTag m_currentSection = MarkerTag::None; MarkerTag m_currentSection = MarkerTag::None;

33
src/plugins/android/sdkmanageroutputparser_test.cpp
View File

@@ -132,7 +132,7 @@ void SdkManagerOutputParserTest::testParseBuildToolsPackage()
QFETCH(QString, displayText); QFETCH(QString, displayText);
QFETCH(QVersionNumber, revision); QFETCH(QVersionNumber, revision);
BuildTools *actualBuildTools = m_parser.parseBuildToolsPackage(output); AndroidSdkPackage *actualBuildTools = m_parser.parseBuildToolsPackage(output);
QVERIFY(actualBuildTools != nullptr); QVERIFY(actualBuildTools != nullptr);
QCOMPARE(actualBuildTools->descriptionText(), description); QCOMPARE(actualBuildTools->descriptionText(), description);
@@ -142,7 +142,7 @@ void SdkManagerOutputParserTest::testParseBuildToolsPackage()
void SdkManagerOutputParserTest::testParseBuildToolsPackageEmpty() void SdkManagerOutputParserTest::testParseBuildToolsPackageEmpty()
{ {
BuildTools *actualBuildTools = m_parser.parseBuildToolsPackage({""}); AndroidSdkPackage *actualBuildTools = m_parser.parseBuildToolsPackage({""});
QVERIFY(actualBuildTools == nullptr); QVERIFY(actualBuildTools == nullptr);
} }
@@ -178,7 +178,7 @@ void SdkManagerOutputParserTest::testParseSdkToolsPackage()
QFETCH(QString, displayText); QFETCH(QString, displayText);
QFETCH(QVersionNumber, revision); QFETCH(QVersionNumber, revision);
std::unique_ptr<SdkTools> actualSdkTool(m_parser.parseSdkToolsPackage(output)); std::unique_ptr<AndroidSdkPackage> actualSdkTool(m_parser.parseSdkToolsPackage(output));
QVERIFY(actualSdkTool != nullptr); QVERIFY(actualSdkTool != nullptr);
QCOMPARE(actualSdkTool->descriptionText(), description); QCOMPARE(actualSdkTool->descriptionText(), description);
@@ -188,7 +188,7 @@ void SdkManagerOutputParserTest::testParseSdkToolsPackage()
void SdkManagerOutputParserTest::testParseSdkToolsPackageEmpty() void SdkManagerOutputParserTest::testParseSdkToolsPackageEmpty()
{ {
std::unique_ptr<SdkTools> actualSdkTool(m_parser.parseSdkToolsPackage({""})); std::unique_ptr<AndroidSdkPackage> actualSdkTool(m_parser.parseSdkToolsPackage({""}));
QVERIFY(actualSdkTool == nullptr); QVERIFY(actualSdkTool == nullptr);
} }
@@ -217,7 +217,7 @@ void SdkManagerOutputParserTest::testParsePlatformToolsPackage()
QFETCH(QString, displayText); QFETCH(QString, displayText);
QFETCH(QVersionNumber, revision); QFETCH(QVersionNumber, revision);
std::unique_ptr<PlatformTools> actualPlatformTool( std::unique_ptr<AndroidSdkPackage> actualPlatformTool(
m_parser.parsePlatformToolsPackage(output)); m_parser.parsePlatformToolsPackage(output));
QVERIFY(actualPlatformTool != nullptr); QVERIFY(actualPlatformTool != nullptr);
@@ -228,8 +228,7 @@ void SdkManagerOutputParserTest::testParsePlatformToolsPackage()
void SdkManagerOutputParserTest::testParsePlatformToolsPackageEmpty() void SdkManagerOutputParserTest::testParsePlatformToolsPackageEmpty()
{ {
std::unique_ptr<PlatformTools> actualPlatformTool( std::unique_ptr<AndroidSdkPackage> actualPlatformTool(m_parser.parsePlatformToolsPackage({""}));
m_parser.parsePlatformToolsPackage({""}));
QVERIFY(actualPlatformTool == nullptr); QVERIFY(actualPlatformTool == nullptr);
} }
@@ -256,7 +255,7 @@ void SdkManagerOutputParserTest::testParseEmulatorToolsPackage()
QFETCH(QString, displayText); QFETCH(QString, displayText);
QFETCH(QVersionNumber, revision); QFETCH(QVersionNumber, revision);
std::unique_ptr<EmulatorTools> actualEmulatorTools( std::unique_ptr<AndroidSdkPackage> actualEmulatorTools(
m_parser.parseEmulatorToolsPackage(output)); m_parser.parseEmulatorToolsPackage(output));
QVERIFY(actualEmulatorTools != nullptr); QVERIFY(actualEmulatorTools != nullptr);
@@ -267,7 +266,7 @@ void SdkManagerOutputParserTest::testParseEmulatorToolsPackage()
void SdkManagerOutputParserTest::testParseEmulatorToolsPackageEmpty() void SdkManagerOutputParserTest::testParseEmulatorToolsPackageEmpty()
{ {
std::unique_ptr<EmulatorTools> actualEmulatorTools( std::unique_ptr<AndroidSdkPackage> actualEmulatorTools(
m_parser.parseEmulatorToolsPackage({""})); m_parser.parseEmulatorToolsPackage({""}));
QVERIFY(actualEmulatorTools == nullptr); QVERIFY(actualEmulatorTools == nullptr);
@@ -296,7 +295,7 @@ void SdkManagerOutputParserTest::testParseNdkPackage()
QFETCH(QString, displayText); QFETCH(QString, displayText);
QFETCH(QVersionNumber, revision); QFETCH(QVersionNumber, revision);
std::unique_ptr<Ndk> actualNdkPackage(m_parser.parseNdkPackage(output)); std::unique_ptr<AndroidSdkPackage> actualNdkPackage(m_parser.parseNdkPackage(output));
QVERIFY(actualNdkPackage != nullptr); QVERIFY(actualNdkPackage != nullptr);
QCOMPARE(actualNdkPackage->descriptionText(), description); QCOMPARE(actualNdkPackage->descriptionText(), description);
@@ -306,7 +305,7 @@ void SdkManagerOutputParserTest::testParseNdkPackage()
void SdkManagerOutputParserTest::testParseNdkPackageEmpty() void SdkManagerOutputParserTest::testParseNdkPackageEmpty()
{ {
std::unique_ptr<Ndk> actualNdkPackage(m_parser.parseNdkPackage({""})); std::unique_ptr<AndroidSdkPackage> actualNdkPackage(m_parser.parseNdkPackage({""}));
QVERIFY(actualNdkPackage == nullptr); QVERIFY(actualNdkPackage == nullptr);
} }
@@ -338,8 +337,7 @@ void SdkManagerOutputParserTest::testParseExtraToolsPackage()
QFETCH(QString, displayText); QFETCH(QString, displayText);
QFETCH(QVersionNumber, revision); QFETCH(QVersionNumber, revision);
std::unique_ptr<ExtraTools> actualExtraTools( std::unique_ptr<AndroidSdkPackage> actualExtraTools(m_parser.parseExtraToolsPackage(output));
m_parser.parseExtraToolsPackage(output));
QVERIFY(actualExtraTools != nullptr); QVERIFY(actualExtraTools != nullptr);
QCOMPARE(actualExtraTools->descriptionText(), description); QCOMPARE(actualExtraTools->descriptionText(), description);
@@ -349,8 +347,7 @@ void SdkManagerOutputParserTest::testParseExtraToolsPackage()
void SdkManagerOutputParserTest::testParseExtraToolsPackageEmpty() void SdkManagerOutputParserTest::testParseExtraToolsPackageEmpty()
{ {
std::unique_ptr<ExtraTools> actualExtraTools( std::unique_ptr<AndroidSdkPackage> actualExtraTools(m_parser.parseExtraToolsPackage({""}));
m_parser.parseExtraToolsPackage({""}));
QVERIFY(actualExtraTools == nullptr); QVERIFY(actualExtraTools == nullptr);
} }
@@ -379,8 +376,7 @@ void SdkManagerOutputParserTest::testParseGenericToolsPackage()
QFETCH(QString, displayText); QFETCH(QString, displayText);
QFETCH(QVersionNumber, revision); QFETCH(QVersionNumber, revision);
std::unique_ptr<GenericSdkPackage> actualGenericTools( std::unique_ptr<AndroidSdkPackage> actualGenericTools(m_parser.parseGenericTools(output));
m_parser.parseGenericTools(output));
QVERIFY(actualGenericTools != nullptr); QVERIFY(actualGenericTools != nullptr);
QCOMPARE(actualGenericTools->descriptionText(), description); QCOMPARE(actualGenericTools->descriptionText(), description);
@@ -390,8 +386,7 @@ void SdkManagerOutputParserTest::testParseGenericToolsPackage()
void SdkManagerOutputParserTest::testParseGenericToolsPackageEmpty() void SdkManagerOutputParserTest::testParseGenericToolsPackageEmpty()
{ {
std::unique_ptr<GenericSdkPackage> actualGenericTools( std::unique_ptr<AndroidSdkPackage> actualGenericTools(m_parser.parseGenericTools({""}));
m_parser.parseGenericTools({""}));
QVERIFY(actualGenericTools == nullptr); QVERIFY(actualGenericTools == nullptr);
} }