@@ -49,35 +49,30 @@ Item {
4949 id: shell
5050 }
5151
52− GSettings {
53− id: backgroundSettings
54− schema.id: "org.gnome.desktop.background"
55− }
56−
5752 UT.UnityTestCase {
5853 name: "Shell"
5954 when: windowShown
6055
61−// function initTestCase() {
62−// // swipe away the greeter/lockscreen
63−// var touchX = shell.width - (shell.edgeSize / 2);
64−// var touchY = shell.height / 2;
65−// touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY);
56+ function initTestCase() {
57+ // swipe away the greeter/lockscreen
58+ var touchX = shell.width - (shell.edgeSize / 2);
59+ var touchY = shell.height / 2;
60+ touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY);
6661
67−// var dash = findChild(shell, "dash");
68−// // wait until the animation has finished
69−// tryCompare(dash, "contentScale", 1.0);
70−// tryCompare(dash, "opacity", 1.0);
71−// }
62+ var dash = findChild(shell, "dash");
63+ // wait until the animation has finished
64+ tryCompare(dash, "contentScale", 1.0);
65+ tryCompare(dash, "opacity", 1.0);
66+ }
7267
73−// function cleanup() {
74−// // kill all (fake) running apps
75−// ApplicationManager.mainStageApplications.clear();
76−// ApplicationManager.sideStageApplications.clear();
68+ function cleanup() {
69+ // kill all (fake) running apps
70+ ApplicationManager.mainStageApplications.clear();
71+ ApplicationManager.sideStageApplications.clear();
7772
78−// var dashHome = findChild(shell, "DashHome");
79−// swipeUntilScopeViewIsReached(dashHome);
80−// }
73+ var dashHome = findChild(shell, "DashHome");
74+ swipeUntilScopeViewIsReached(dashHome);
75+ }
8176
8277// /*
8378// Test the effect of a right-edge drag on the dash in 3 situations:
@@ -294,17 +289,15 @@ Item {
294289 function test_wallpaper(data) {
295290 var backgroundImage = findChild(shell, "backgroundImage")
296291 GSettingsController.setPictureUri(data.url)
292+ wait(1000)
297293 tryCompareFunction(function() { return backgroundImage.source.toString().indexOf(data.url) !== -1; }, true)
298294 tryCompare(backgroundImage, "status", Image.Ready)
299295 }
300296
301297 function test_wallpaper_wrong() {
302298 var backgroundImage = findChild(shell, "backgroundImage")
303− var oldGSettingsBackground = backgroundSettings.pictureUri
304− var oldShellBackground = shell.background
305− wait(2000)
306299 GSettingsController.setPictureUri("wrong")
307− console.log("WRONG ", oldGSettingsBackground, backgroundSettings.pictureUri)
300+ wait(2000)
308301 //tryCompareFunction(function() { return oldGSettingsBackground == backgroundSettings.pictureUri; }, true)
309302// tryCompareFunction(function() { return backgroundImage.source.toString().indexOf(data.url) !== -1; }, true)
310303 }