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

Android: Fix compile with Qt6.2

Browse Source 
Amends 0c72395148.

Change-Id: Ia4e074311e42fdb29d956bcd0cfce36e3aeda226
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2023-02-22 15:41:05 +01:00
parent ae6ebe067e
commit 0f49b488ee
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ void SdkManagerOutputParserTest::testParseBuildToolsPackage()
BuildTools *actualBuildTools = m_parser->parseBuildToolsPackage(output); BuildTools *actualBuildTools = m_parser->parseBuildToolsPackage(output);
QCOMPARE_NE(actualBuildTools, nullptr); QVERIFY(actualBuildTools != nullptr);
QCOMPARE(actualBuildTools->descriptionText(), description); QCOMPARE(actualBuildTools->descriptionText(), description);
QCOMPARE(actualBuildTools->displayText(), displayText); QCOMPARE(actualBuildTools->displayText(), displayText);
QCOMPARE(actualBuildTools->revision(), revision); QCOMPARE(actualBuildTools->revision(), revision);
@@ -104,7 +104,7 @@ void SdkManagerOutputParserTest::testParseBuildToolsPackageEmpty()
{ {
BuildTools *actualBuildTools = m_parser->parseBuildToolsPackage({""}); BuildTools *actualBuildTools = m_parser->parseBuildToolsPackage({""});
QCOMPARE_EQ(actualBuildTools, nullptr); QVERIFY(actualBuildTools == nullptr);
} }
// SdkTools // SdkTools
@@ -140,7 +140,7 @@ void SdkManagerOutputParserTest::testParseSdkToolsPackage()
std::unique_ptr<SdkTools> actualSdkTool(m_parser->parseSdkToolsPackage(output)); std::unique_ptr<SdkTools> actualSdkTool(m_parser->parseSdkToolsPackage(output));
QCOMPARE_NE(actualSdkTool, nullptr); QVERIFY(actualSdkTool != nullptr);
QCOMPARE(actualSdkTool->descriptionText(), description); QCOMPARE(actualSdkTool->descriptionText(), description);
QCOMPARE(actualSdkTool->displayText(), displayText); QCOMPARE(actualSdkTool->displayText(), displayText);
QCOMPARE(actualSdkTool->revision(), revision); QCOMPARE(actualSdkTool->revision(), revision);
@@ -150,7 +150,7 @@ void SdkManagerOutputParserTest::testParseSdkToolsPackageEmpty()
{ {
std::unique_ptr<SdkTools> actualSdkTool(m_parser->parseSdkToolsPackage({""})); std::unique_ptr<SdkTools> actualSdkTool(m_parser->parseSdkToolsPackage({""}));
QCOMPARE_EQ(actualSdkTool, nullptr); QVERIFY(actualSdkTool == nullptr);
} }
// PlatformTools // PlatformTools
@@ -180,7 +180,7 @@ void SdkManagerOutputParserTest::testParsePlatformToolsPackage()
std::unique_ptr<PlatformTools> actualPlatformTool( std::unique_ptr<PlatformTools> actualPlatformTool(
m_parser->parsePlatformToolsPackage(output)); m_parser->parsePlatformToolsPackage(output));
QCOMPARE_NE(actualPlatformTool, nullptr); QVERIFY(actualPlatformTool != nullptr);
QCOMPARE(actualPlatformTool->descriptionText(), description); QCOMPARE(actualPlatformTool->descriptionText(), description);
QCOMPARE(actualPlatformTool->displayText(), displayText); QCOMPARE(actualPlatformTool->displayText(), displayText);
QCOMPARE(actualPlatformTool->revision(), revision); QCOMPARE(actualPlatformTool->revision(), revision);
@@ -191,7 +191,7 @@ void SdkManagerOutputParserTest::testParsePlatformToolsPackageEmpty()
std::unique_ptr<PlatformTools> actualPlatformTool( std::unique_ptr<PlatformTools> actualPlatformTool(
m_parser->parsePlatformToolsPackage({""})); m_parser->parsePlatformToolsPackage({""}));
QCOMPARE_EQ(actualPlatformTool, nullptr); QVERIFY(actualPlatformTool == nullptr);
} }
// EmulatorTools // EmulatorTools
@@ -219,7 +219,7 @@ void SdkManagerOutputParserTest::testParseEmulatorToolsPackage()
std::unique_ptr<EmulatorTools> actualEmulatorTools( std::unique_ptr<EmulatorTools> actualEmulatorTools(
m_parser->parseEmulatorToolsPackage(output)); m_parser->parseEmulatorToolsPackage(output));
QCOMPARE_NE(actualEmulatorTools, nullptr); QVERIFY(actualEmulatorTools != nullptr);
QCOMPARE(actualEmulatorTools->descriptionText(), description); QCOMPARE(actualEmulatorTools->descriptionText(), description);
QCOMPARE(actualEmulatorTools->displayText(), displayText); QCOMPARE(actualEmulatorTools->displayText(), displayText);
QCOMPARE(actualEmulatorTools->revision(), revision); QCOMPARE(actualEmulatorTools->revision(), revision);
@@ -230,7 +230,7 @@ void SdkManagerOutputParserTest::testParseEmulatorToolsPackageEmpty()
std::unique_ptr<EmulatorTools> actualEmulatorTools( std::unique_ptr<EmulatorTools> actualEmulatorTools(
m_parser->parseEmulatorToolsPackage({""})); m_parser->parseEmulatorToolsPackage({""}));
QCOMPARE_EQ(actualEmulatorTools, nullptr); QVERIFY(actualEmulatorTools == nullptr);
} }
// NDK // NDK
@@ -258,7 +258,7 @@ void SdkManagerOutputParserTest::testParseNdkPackage()
std::unique_ptr<Ndk> actualNdkPackage(m_parser->parseNdkPackage(output)); std::unique_ptr<Ndk> actualNdkPackage(m_parser->parseNdkPackage(output));
QCOMPARE_NE(actualNdkPackage, nullptr); QVERIFY(actualNdkPackage != nullptr);
QCOMPARE(actualNdkPackage->descriptionText(), description); QCOMPARE(actualNdkPackage->descriptionText(), description);
QCOMPARE(actualNdkPackage->displayText(), displayText); QCOMPARE(actualNdkPackage->displayText(), displayText);
QCOMPARE(actualNdkPackage->revision(), revision); QCOMPARE(actualNdkPackage->revision(), revision);
@@ -268,7 +268,7 @@ void SdkManagerOutputParserTest::testParseNdkPackageEmpty()
{ {
std::unique_ptr<Ndk> actualNdkPackage(m_parser->parseNdkPackage({""})); std::unique_ptr<Ndk> actualNdkPackage(m_parser->parseNdkPackage({""}));
QCOMPARE_EQ(actualNdkPackage, nullptr); QVERIFY(actualNdkPackage == nullptr);
} }
// ExtraTools // ExtraTools
@@ -301,7 +301,7 @@ void SdkManagerOutputParserTest::testParseExtraToolsPackage()
std::unique_ptr<ExtraTools> actualExtraTools( std::unique_ptr<ExtraTools> actualExtraTools(
m_parser->parseExtraToolsPackage(output)); m_parser->parseExtraToolsPackage(output));
QCOMPARE_NE(actualExtraTools, nullptr); QVERIFY(actualExtraTools != nullptr);
QCOMPARE(actualExtraTools->descriptionText(), description); QCOMPARE(actualExtraTools->descriptionText(), description);
QCOMPARE(actualExtraTools->displayText(), displayText); QCOMPARE(actualExtraTools->displayText(), displayText);
QCOMPARE(actualExtraTools->revision(), revision); QCOMPARE(actualExtraTools->revision(), revision);
@@ -312,7 +312,7 @@ void SdkManagerOutputParserTest::testParseExtraToolsPackageEmpty()
std::unique_ptr<ExtraTools> actualExtraTools( std::unique_ptr<ExtraTools> actualExtraTools(
m_parser->parseExtraToolsPackage({""})); m_parser->parseExtraToolsPackage({""}));
QCOMPARE_EQ(actualExtraTools, nullptr); QVERIFY(actualExtraTools == nullptr);
} }
// GenericTools // GenericTools
@@ -342,7 +342,7 @@ void SdkManagerOutputParserTest::testParseGenericToolsPackage()
std::unique_ptr<GenericSdkPackage> actualGenericTools( std::unique_ptr<GenericSdkPackage> actualGenericTools(
m_parser->parseGenericTools(output)); m_parser->parseGenericTools(output));
QCOMPARE_NE(actualGenericTools, nullptr); QVERIFY(actualGenericTools != nullptr);
QCOMPARE(actualGenericTools->descriptionText(), description); QCOMPARE(actualGenericTools->descriptionText(), description);
QCOMPARE(actualGenericTools->displayText(), displayText); QCOMPARE(actualGenericTools->displayText(), displayText);
QCOMPARE(actualGenericTools->revision(), revision); QCOMPARE(actualGenericTools->revision(), revision);
@@ -353,7 +353,7 @@ void SdkManagerOutputParserTest::testParseGenericToolsPackageEmpty()
std::unique_ptr<GenericSdkPackage> actualGenericTools( std::unique_ptr<GenericSdkPackage> actualGenericTools(
m_parser->parseGenericTools({""})); m_parser->parseGenericTools({""}));
QCOMPARE_EQ(actualGenericTools, nullptr); QVERIFY(actualGenericTools == nullptr);
} }
// Platform // Platform
@@ -393,7 +393,7 @@ void SdkManagerOutputParserTest::testParsePlatformPackage()
std::unique_ptr<AndroidSdkPackage> actualPlatform(m_parser->parsePlatform(output)); std::unique_ptr<AndroidSdkPackage> actualPlatform(m_parser->parsePlatform(output));
QCOMPARE_NE(actualPlatform, nullptr); QVERIFY(actualPlatform != nullptr);
QCOMPARE(actualPlatform->descriptionText(), description); QCOMPARE(actualPlatform->descriptionText(), description);
QCOMPARE(actualPlatform->installedLocation().path(), installLocation); QCOMPARE(actualPlatform->installedLocation().path(), installLocation);
QCOMPARE(actualPlatform->revision(), revision); QCOMPARE(actualPlatform->revision(), revision);
@@ -404,7 +404,7 @@ void SdkManagerOutputParserTest::testParsePlatformPackageEmpty()
{ {
std::unique_ptr<AndroidSdkPackage> actualPlatform(m_parser->parsePlatform({""})); std::unique_ptr<AndroidSdkPackage> actualPlatform(m_parser->parsePlatform({""}));
QCOMPARE_EQ(actualPlatform, nullptr); QVERIFY(actualPlatform == nullptr);
} }
// SystemImage // SystemImage
@@ -438,7 +438,7 @@ void SdkManagerOutputParserTest::testParseSystemImagePackage()
SystemImage *actualSystemImage = actualSystemImagePair.first; SystemImage *actualSystemImage = actualSystemImagePair.first;
QCOMPARE_NE(actualSystemImage, nullptr); QVERIFY(actualSystemImage != nullptr);
QCOMPARE(actualSystemImage->descriptionText(), description); QCOMPARE(actualSystemImage->descriptionText(), description);
QCOMPARE(actualSystemImage->installedLocation().path(), installLocation); QCOMPARE(actualSystemImage->installedLocation().path(), installLocation);
QCOMPARE(actualSystemImage->revision(), revision); QCOMPARE(actualSystemImage->revision(), revision);
@@ -450,7 +450,7 @@ void SdkManagerOutputParserTest::testParseSystemImagePackageEmpty()
QPair<SystemImage *, int> actualSystemImagePair(m_parser->parseSystemImage({""})); QPair<SystemImage *, int> actualSystemImagePair(m_parser->parseSystemImage({""}));
SystemImage *actualSystemImage = actualSystemImagePair.first; SystemImage *actualSystemImage = actualSystemImagePair.first;
QCOMPARE_EQ(actualSystemImage, nullptr); QVERIFY(actualSystemImage == nullptr);
delete actualSystemImage; delete actualSystemImage;
} }
void SdkManagerOutputParserTest::testParsePackageListing() void SdkManagerOutputParserTest::testParsePackageListing()