@@ -1783,39 +1783,45 @@ Rectangle {
17831783 tryCompare(panelButtons, "visible", true);
17841784 }
17851785
1786− function test_lifecyclePolicy_data() {
1786+ function test_lifecyclePolicyForNonTouchApp_data() {
17871787 return [
1788− {tag: "phone", formFactor: "phone", usageScenario: "phone", suspendsApps: true},
1789− {tag: "tablet", formFactor: "tablet", usageScenario: "tablet", suspendsApps: true},
1790− {tag: "desktop", formFactor: "tablet", usageScenario: "desktop", suspendsApps: false}
1788+ {tag: "phone", formFactor: "phone", usageScenario: "phone"},
1789+ {tag: "tablet", formFactor: "tablet", usageScenario: "tablet"}
17911790 ]
17921791 }
17931792
1794− function test_lifecyclePolicy(data) {
1793+ function test_lifecyclePolicyForNonTouchApp(data) {
17951794 loadShell(data.formFactor);
17961795 shell.usageScenario = data.usageScenario;
17971796
1798− GSettingsController.setLifecycleExemptAppids(["webbrowser-app"]);
1799−
1800− var app1 = ApplicationManager.startApplication("camera-app");
1797+ var app1 = ApplicationManager.startApplication("libreoffice");
18011798 waitUntilAppWindowIsFullyLoaded(app1);
1802− var app2 = ApplicationManager.startApplication("webbrowser-app");
1799+ var app2 = ApplicationManager.startApplication("dialer-app");
18031800 waitUntilAppWindowIsFullyLoaded(app2);
1804− var app3 = ApplicationManager.startApplication("libreoffice");
1805− waitUntilAppWindowIsFullyLoaded(app3);
1806− var app4 = ApplicationManager.startApplication("dialer-app");
1807− waitUntilAppWindowIsFullyLoaded(app4);
18081801
1809− compare(app1.requestedState, data.suspendsApps ?
1810− ApplicationInfoInterface.RequestedSuspended :
1811− ApplicationInfoInterface.RequestedRunning);
1802+ compare(app1.isTouchApp, false); // sanity check our mock, which sets this for us
1803+ compare(app1.requestedState, ApplicationInfoInterface.RequestedRunning);
1804+ }
18121805
1813− compare(app2.requestedState, ApplicationInfoInterface.RequestedRunning);
1806+ function test_lifecyclePolicyExemption_data() {
1807+ return [
1808+ {tag: "phone", formFactor: "phone", usageScenario: "phone", suspendsApps: true},
1809+ {tag: "tablet", formFactor: "tablet", usageScenario: "tablet", suspendsApps: true}
1810+ ]
1811+ }
1812+
1813+ function test_lifecyclePolicyExemption(data) {
1814+ loadShell(data.formFactor);
1815+ shell.usageScenario = data.usageScenario;
18141816
1815− compare(app3.isTouchApp, false); // sanity check our mock, which sets this for us
1816− compare(app3.requestedState, ApplicationInfoInterface.RequestedRunning);
1817+ GSettingsController.setLifecycleExemptAppids(["webbrowser-app"]);
1818+
1819+ var app1 = ApplicationManager.startApplication("webbrowser-app");
1820+ waitUntilAppWindowIsFullyLoaded(app1);
1821+ var app2 = ApplicationManager.startApplication("dialer-app");
1822+ waitUntilAppWindowIsFullyLoaded(app2);
18171823
1818− compare(app4.requestedState, ApplicationInfoInterface.RequestedRunning);
1824+ compare(app1.requestedState, ApplicationInfoInterface.RequestedRunning);
18191825 }
18201826 }
18211827}