git.iko.soy/unity8
on xenial help sign in
More fixes, rename unity8-fake-env to unity8-tests
d4ccfbdMichael Terry
debian/control+10−6
compare with xenial
unifiedsplit
@@ -137,7 +137,7 @@ Depends: qml-module-qtquick-layouts,
137 unity-notifications-impl-3,
137 unity-notifications-impl-3,
138 unity-plugin-scopes | unity-scopes-impl,
138 unity-plugin-scopes | unity-scopes-impl,
139 unity-scopes-impl-11,
139 unity-scopes-impl-11,
140− unity8-fake-env | unity-application-impl,
140+ unity8-tests | unity-application-impl,
141 ${misc:Depends},
141 ${misc:Depends},
142Breaks: unity8 (<< 7.86),
142Breaks: unity8 (<< 7.86),
143Replaces: unity8 (<< 7.86),
143Replaces: unity8 (<< 7.86),
@@ -163,7 +163,7 @@ Depends: autopilot-qt5 (>= 1.4),
163 ubuntu-ui-toolkit-autopilot (>= 1.3.1845),
163 ubuntu-ui-toolkit-autopilot (>= 1.3.1845),
164 unity-scope-click,
164 unity-scope-click,
165 unity8 (= ${source:Version}),
165 unity8 (= ${source:Version}),
166− unity8-fake-env (= ${source:Version}),
166+ unity8-tests (= ${source:Version}),
167 url-dispatcher-tools,
167 url-dispatcher-tools,
168 xvfb,
168 xvfb,
169 ${misc:Depends},
169 ${misc:Depends},
@@ -171,7 +171,7 @@ Depends: autopilot-qt5 (>= 1.4),
171Description: Test package for Unity 8 shell
171Description: Test package for Unity 8 shell
172 Autopilot tests for the unity8 package
172 Autopilot tests for the unity8 package
173
173
174−Package: unity8-fake-env
174+Package: unity8-tests
175Architecture: any
175Architecture: any
176Multi-Arch: same
176Multi-Arch: same
177Pre-Depends: ${misc:Pre-Depends},
177Pre-Depends: ${misc:Pre-Depends},
@@ -181,10 +181,14 @@ Depends: dbus-test-runner,
181 ${shlibs:Depends},
181 ${shlibs:Depends},
182Provides: unity-application-impl,
182Provides: unity-application-impl,
183 unity-application-impl-14,
183 unity-application-impl-14,
184+ unity8-fake-env,
184−Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
185+Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1),
186+ unity8-fake-env,
187+Conflicts: unity8-fake-env,
185−Description: Fake environment for running Unity 8 shell
188+Description: Scripts and mocks for running Unity 8 shell tests
186 Provides fake implementations of some QML modules used by Unity 8 shell
189 Provides fake implementations of some QML modules used by Unity 8 shell
187− (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.
190+ (e.g Ubuntu.Application) so that you can run it in a sandboxed environment
191+ and scripts to run its test suite.
188
192
189Package: unity8-private
193Package: unity8-private
190Architecture: any
194Architecture: any
debian/unity8-fake-env.install → debian/unity8-tests.installrenamed

The content is the same.

tests/plugins/Greeter/Unity/Launcher/launchermodelastest.cpp+1−1
@@ -47,7 +47,7 @@ private Q_SLOTS:
47
47
48 void init() {
48 void init() {
49 // Launcher will look in current dir in testing mode for data
49 // Launcher will look in current dir in testing mode for data
50− QDir::setCurrent(testLibDir() + "/" + TEST_DIR);
50+ QDir::setCurrent(testDataDir() + "/" TEST_DIR);
51
51
52 // Prepare some fake list
52 // Prepare some fake list
53 QList<QVariantMap> list;
53 QList<QVariantMap> list;
tests/plugins/Unity/Launcher/CMakeLists.txt+2−2
@@ -60,7 +60,7 @@ foreach(DESKTOP_FILE ${DESKTOP_FILES})
60 )
60 )
61endforeach()
61endforeach()
62install(FILES ${DESKTOP_FILES}
62install(FILES ${DESKTOP_FILES}
63− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Launcher"
63+ DESTINATION "${SHELL_APP_DIR}/tests/plugins/Unity/Launcher"
64 )
64 )
65
65
66# copy .svg files into build directory for shadow builds
66# copy .svg files into build directory for shadow builds
@@ -72,5 +72,5 @@ foreach(DESKTOP_FILE ${DESKTOP_FILES})
72 )
72 )
73endforeach()
73endforeach()
74install(FILES ${DESKTOP_FILES}
74install(FILES ${DESKTOP_FILES}
75− DESTINATION "${SHELL_PRIVATE_LIBDIR}/tests/plugins/Unity/Launcher"
75+ DESTINATION "${SHELL_APP_DIR}/tests/plugins/Unity/Launcher"
76 )
76 )
tests/plugins/Unity/Launcher/launchermodeltest.cpp+1−1
@@ -166,7 +166,7 @@ private Q_SLOTS:
166 // Adding 2 apps to the mock appmanager. Both should appear in the launcher.
166 // Adding 2 apps to the mock appmanager. Both should appear in the launcher.
167 void init() {
167 void init() {
168 // Launcher will look in current dir in testing mode for data
168 // Launcher will look in current dir in testing mode for data
169− QDir::setCurrent(testLibDir() + "/" + TEST_DIR);
169+ QDir::setCurrent(testDataDir() + "/" TEST_DIR);
170
170
171 QDBusInterface accountsInterface(QStringLiteral("org.freedesktop.Accounts"),
171 QDBusInterface accountsInterface(QStringLiteral("org.freedesktop.Accounts"),
172 QStringLiteral("/org/freedesktop/Accounts"),
172 QStringLiteral("/org/freedesktop/Accounts"),