diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2022-08-08 09:21:46 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2022-08-08 11:18:09 +0000 |
| commit | 100f51ff505fd36f6abd1957d93b58efcc6b6144 (patch) | |
| tree | c9bb8ade4f957a72958d4ebd9a55b070b61b7a69 /tests/auto/android | |
| parent | 07053b3a268dc97af09699ddc6cd697804a78867 (diff) | |
| download | qt-creator-100f51ff505fd36f6abd1957d93b58efcc6b6144.tar.gz | |
Tests: Fix android autotest
While at it add qbs build files.
Change-Id: I2a57f7addda9e980a9e429a3d69e0994dac6d120
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'tests/auto/android')
| -rw-r--r-- | tests/auto/android/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/android/android.qbs | 34 | ||||
| -rw-r--r-- | tests/auto/android/tst_avdmanageroutputparser.cpp | 12 |
3 files changed, 41 insertions, 6 deletions
diff --git a/tests/auto/android/CMakeLists.txt b/tests/auto/android/CMakeLists.txt index 8f328fe98e..4639c9cd80 100644 --- a/tests/auto/android/CMakeLists.txt +++ b/tests/auto/android/CMakeLists.txt @@ -12,6 +12,7 @@ add_qtc_test(tst_avdmanageroutputparser ) qtc_add_resources(tst_avdmanageroutputparser tst_avdmanageroutputparser_rcc + PREFIX "/" FILES Test.avd/config.ini TestTablet.avd/config.ini diff --git a/tests/auto/android/android.qbs b/tests/auto/android/android.qbs new file mode 100644 index 0000000000..d5f675142c --- /dev/null +++ b/tests/auto/android/android.qbs @@ -0,0 +1,34 @@ +import qbs + +QtcAutotest { + name: "Android AVD Manager autotest" + Depends { name: "Utils" } + Depends { name: "Qt.network" } + + property string androidDir: project.ide_source_tree + "/src/plugins/android/" + + Group { + name: "Sources from Android plugin" + prefix: androidDir + files: [ + "androiddeviceinfo.cpp", "androiddeviceinfo.h", + "avdmanageroutputparser.cpp", "avdmanageroutputparser.h", + ] + } + Group { + name: "Test sources" + files: [ + "tst_avdmanageroutputparser.cpp", + ] + } + + Group { + name: "Resource files" + Qt.core.resourcePrefix: "/" + Qt.core.resourceSourceBase: "." + fileTags: "qt.core.resource_data" + files: ["Test.avd/config.ini", "TestTablet.avd/config.ini"] + } + + cpp.includePaths: base.concat([androidDir, project.ide_source_tree + "/src/plugins/"]) +} diff --git a/tests/auto/android/tst_avdmanageroutputparser.cpp b/tests/auto/android/tst_avdmanageroutputparser.cpp index 4dc8a0d357..921a04334d 100644 --- a/tests/auto/android/tst_avdmanageroutputparser.cpp +++ b/tests/auto/android/tst_avdmanageroutputparser.cpp @@ -51,7 +51,7 @@ void tst_AvdManagerOutputParser::parse_data() QTest::newRow("one") << "Available Android Virtual Devices:\n" " Name: Test\n" " Device: Galaxy Nexus (Google)\n" - " Path: :Test.avd\n" + " Path: :/Test.avd\n" " Target: Google APIs (Google Inc.)\n" " Based on: Android API 30 Tag/ABI: google_apis/x86\n" " Sdcard: 512 MB\n" @@ -61,20 +61,20 @@ void tst_AvdManagerOutputParser::parse_data() -1, IDevice::DeviceConnected, IDevice::Emulator, - Utils::FilePath::fromString(":Test.avd")}}) + Utils::FilePath::fromString(":/Test.avd")}}) << QStringList(); QTest::newRow("two") << "Available Android Virtual Devices:\n" " Name: Test\n" " Device: Galaxy Nexus (Google)\n" - " Path: :Test.avd\n" + " Path: :/Test.avd\n" " Target: Google APIs (Google Inc.)\n" " Based on: Android API 30 Tag/ABI: google_apis/x86\n" " Sdcard: 512 MB\n" "---------\n" " Name: TestTablet\n" " Device: 7in WSVGA (Tablet) (Generic)\n" - " Path: :TestTablet.avd\n" + " Path: :/TestTablet.avd\n" " Target: Google APIs (Google Inc.)\n" " Based on: Android API 30 Tag/ABI: google_apis/x86\n" " Sdcard: 256 MB\n" @@ -84,14 +84,14 @@ void tst_AvdManagerOutputParser::parse_data() -1, IDevice::DeviceConnected, IDevice::Emulator, - Utils::FilePath::fromString(":Test.avd")}, + Utils::FilePath::fromString(":/Test.avd")}, {"", "TestTablet", {"x86"}, -1, IDevice::DeviceConnected, IDevice::Emulator, - Utils::FilePath::fromString(":TestTablet.avd")}} + Utils::FilePath::fromString(":/TestTablet.avd")}} ) << QStringList(); } |