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

Android: Move tests from sdkmanager class to test class

Browse Source 
Change-Id: I2e7be8f33b40d7c67e72efa88ca5528deb046ade
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Artem Sokolovskii
2023-01-20 15:21:00 +01:00
parent b9dca8f8fa
commit 41aeb175b8
8 changed files with 107 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/plugins/android/androidsdkmanager.cpp
View File

@@ -20,18 +20,13 @@
#include <QSettings>
#include <QTextCodec>
#ifdef WITH_TESTS
# include <QTest>
# include "androidplugin.h"
#endif // WITH_TESTS
using namespace Utils;
namespace {
Q_LOGGING_CATEGORY(sdkManagerLog, "qtc.android.sdkManager", QtWarningMsg)
const char commonArgsKey[] = "Common Arguments:";
}
using namespace Utils;
namespace Android {
namespace Internal {
@@ -652,54 +647,5 @@ void AndroidSdkManagerPrivate::clearPackages()
m_allPackages.clear();
}
#ifdef WITH_TESTS
void AndroidPlugin::testAndroidSdkManagerProgressParser_data()
{
QTest::addColumn<QString>("output");
QTest::addColumn<int>("progress");
QTest::addColumn<bool>("foundAssertion");
// Output of "sdkmanager --licenses", Android SDK Tools version 4.0
QTest::newRow("Loading local repository")
<< "Loading local repository... \r"
<< -1
<< false;
QTest::newRow("Fetch progress (single line)")
<< "[============= ] 34% Fetch remote repository... \r"
<< 34
<< false;
QTest::newRow("Fetch progress (multi line)")
<< "[============================= ] 73% Fetch remote repository... \r"
"[============================= ] 75% Fetch remote repository... \r"
<< 75
<< false;
QTest::newRow("Some SDK package licenses not accepted")
<< "7 of 7 SDK package licenses not accepted.\n"
<< -1
<< false;
QTest::newRow("Unaccepted licenses assertion")
<< "\nReview licenses that have not been accepted (y/N)? "
<< -1
<< true;
}
void AndroidPlugin::testAndroidSdkManagerProgressParser()
{
QFETCH(QString, output);
QFETCH(int, progress);
QFETCH(bool, foundAssertion);
bool actualFoundAssertion = false;
const int actualProgress = parseProgress(output, actualFoundAssertion);
QCOMPARE(progress, actualProgress);
QCOMPARE(foundAssertion, actualFoundAssertion);
}
#endif // WITH_TESTS
} // namespace Internal
} // namespace Android