Fix the two weirdly named auto tests

applicationinstaller -> packagemanager
  The ApplicationInstaller singleton has been long replaced by
  PackageManager and that test had been adapted back then.

qml/simple -> qml/applicationmanager
  This was always named incorrectly and is always a source of
  confusion.

Change-Id: Iba25cd9b6b77344b2845a5c1c14cbac6ef489410
Pick-to: 6.7
Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>

14 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index c507b4b5..cdf4e29c 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
 
 add_subdirectory(application)
 add_subdirectory(applicationinfo)
-add_subdirectory(applicationinstaller)
+add_subdirectory(packagemanager)
 add_subdirectory(configuration)
 add_subdirectory(cryptography)
 add_subdirectory(debugwrapper)
diff --git a/tests/auto/applicationinstaller/CMakeLists.txt b/tests/auto/packagemanager/CMakeLists.txt
index 912f641e..45fb8578 100644
--- a/tests/auto/applicationinstaller/CMakeLists.txt
+++ b/tests/auto/packagemanager/CMakeLists.txt
@@ -1,8 +1,8 @@
 
-qt_internal_add_test(tst_applicationinstaller
+qt_internal_add_test(tst_packagemanager
     SOURCES
         ../error-checking.h
-        tst_applicationinstaller.cpp
+        tst_packagemanager.cpp
     DEFINES
         AM_TESTDATA_DIR="${CMAKE_CURRENT_BINARY_DIR}/../../data/"
     LIBRARIES
@@ -13,7 +13,7 @@ qt_internal_add_test(tst_applicationinstaller
         Qt::AppManPackagePrivate
 )
 
-qt_internal_extend_target(tst_applicationinstaller CONDITION TARGET Qt::DBus
+qt_internal_extend_target(tst_packagemanager CONDITION TARGET Qt::DBus
     LIBRARIES
         Qt::DBus
 )
diff --git a/tests/auto/applicationinstaller/tst_applicationinstaller.cpp b/tests/auto/packagemanager/tst_packagemanager.cpp
index 1d5fe347..3735171a 100644
--- a/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
+++ b/tests/auto/packagemanager/tst_packagemanager.cpp
@@ -808,4 +808,4 @@ int main(int argc, char **argv)
     return QTest::qExec(tstPackageManager, argc, argv);
 }
 
-#include "tst_applicationinstaller.moc"
+#include "tst_packagemanager.moc"
diff --git a/tests/auto/qml/CMakeLists.txt b/tests/auto/qml/CMakeLists.txt
index a246dda4..6da3dcee 100644
--- a/tests/auto/qml/CMakeLists.txt
+++ b/tests/auto/qml/CMakeLists.txt
@@ -7,7 +7,7 @@ if(TARGET Qt6::Core)
 endif()
 
 
-add_subdirectory(simple)
+add_subdirectory(applicationmanager)
 add_subdirectory(windowmanager)
 add_subdirectory(windowmapping)
 add_subdirectory(windowitem)
diff --git a/tests/auto/qml/simple/CMakeLists.txt b/tests/auto/qml/applicationmanager/CMakeLists.txt
index e38d57a2..3aab94ad 100644
--- a/tests/auto/qml/simple/CMakeLists.txt
+++ b/tests/auto/qml/applicationmanager/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-qt_am_internal_add_qml_test(tst_simple
+qt_am_internal_add_qml_test(tst_applicationmanager
     CONFIG_YAML am-config.yaml
     EXTRA_FILES apps
     TEST_FILE tst_applicationmanager.qml
diff --git a/tests/auto/qml/simple/am-config.yaml b/tests/auto/qml/applicationmanager/am-config.yaml
index 2a515905..2a515905 100644
--- a/tests/auto/qml/simple/am-config.yaml
+++ b/tests/auto/qml/applicationmanager/am-config.yaml
diff --git a/tests/auto/qml/simple/apps/tld.test.simple1/app1.qml b/tests/auto/qml/applicationmanager/apps/tld.test.simple1/app1.qml
index a721ae71..a721ae71 100644
--- a/tests/auto/qml/simple/apps/tld.test.simple1/app1.qml
+++ b/tests/auto/qml/applicationmanager/apps/tld.test.simple1/app1.qml
diff --git a/tests/auto/qml/simple/apps/tld.test.simple1/icon.png b/tests/auto/qml/applicationmanager/apps/tld.test.simple1/icon.png
index adb840ce..adb840ce 100644
--- a/tests/auto/qml/simple/apps/tld.test.simple1/icon.png
+++ b/tests/auto/qml/applicationmanager/apps/tld.test.simple1/icon.png
diff --git a/tests/auto/qml/simple/apps/tld.test.simple1/info.yaml b/tests/auto/qml/applicationmanager/apps/tld.test.simple1/info.yaml
index a94c24da..a94c24da 100644
--- a/tests/auto/qml/simple/apps/tld.test.simple1/info.yaml
+++ b/tests/auto/qml/applicationmanager/apps/tld.test.simple1/info.yaml
diff --git a/tests/auto/qml/simple/apps/tld.test.simple2/app.qml b/tests/auto/qml/applicationmanager/apps/tld.test.simple2/app.qml
index 1a06c53d..1a06c53d 100644
--- a/tests/auto/qml/simple/apps/tld.test.simple2/app.qml
+++ b/tests/auto/qml/applicationmanager/apps/tld.test.simple2/app.qml
diff --git a/tests/auto/qml/simple/apps/tld.test.simple2/icon.png b/tests/auto/qml/applicationmanager/apps/tld.test.simple2/icon.png
index adb840ce..adb840ce 100644
--- a/tests/auto/qml/simple/apps/tld.test.simple2/icon.png
+++ b/tests/auto/qml/applicationmanager/apps/tld.test.simple2/icon.png
diff --git a/tests/auto/qml/simple/apps/tld.test.simple2/info.yaml b/tests/auto/qml/applicationmanager/apps/tld.test.simple2/info.yaml
index f3366712..f3366712 100644
--- a/tests/auto/qml/simple/apps/tld.test.simple2/info.yaml
+++ b/tests/auto/qml/applicationmanager/apps/tld.test.simple2/info.yaml
diff --git a/tests/auto/qml/simple/text-file.txt b/tests/auto/qml/applicationmanager/text-file.txt
index 0a05cde5..0a05cde5 100644
--- a/tests/auto/qml/simple/text-file.txt
+++ b/tests/auto/qml/applicationmanager/text-file.txt
diff --git a/tests/auto/qml/simple/tst_applicationmanager.qml b/tests/auto/qml/applicationmanager/tst_applicationmanager.qml
index 04ae409d..04ae409d 100644
--- a/tests/auto/qml/simple/tst_applicationmanager.qml
+++ b/tests/auto/qml/applicationmanager/tst_applicationmanager.qml