[common][tct-power-tizen-tests][modify 2 TCs]

Change-Id: Iaf24ff274eafe4a7d84f5998eabcd8a1788c73de
Signed-off-by: xy.qian <xy.qian@samsung.com>

diff --git a/common/tct-power-tizen-tests/power/PowerManager_turnScreenOff_successful.html b/common/tct-power-tizen-tests/power/PowerManager_turnScreenOff_successful.html
index 7f1cdc3f6695c1bb7ba374c9aa78ea58c0185f8b..a3ef4ff2ffe181335aa1959e0931573048d319fd 100755 (executable)
--- a/common/tct-power-tizen-tests/power/PowerManager_turnScreenOff_successful.html
+++ b/common/tct-power-tizen-tests/power/PowerManager_turnScreenOff_successful.html
@@ -55,15 +55,20 @@ Authors:
 //==== TEST_CRITERIA MNA MNAST
 setup({timeout: 90000});
 
-var t = async_test(document.title, {timeout: 90000}), powerMgr = tizen.power, isScreenOn;
+var t = async_test(document.title, {timeout: 90000}), powerMgr = tizen.power, isScreenOn, changeCallback;
 t.step(function () {
+    changeCallback = t.step_func(function (previousState, changedState) {
+        assert_not_equals(previousState, changedState, "Screen States should be different.");
+        assert_false(isScreenOn, "The screen should be turned off");
+        t.done();
+    });
+
     powerMgr.turnScreenOn();
+    setTimeout(t.step_func(function () {
+        powerMgr.setScreenStateChangeListener(changeCallback);
+    }), 500);
     powerMgr.turnScreenOff();
     isScreenOn = powerMgr.isScreenOn();
-    setTimeout(t.step_func(function () {
-        assert_false(isScreenOn, "The screen should be turned off");
-        t.done();
-    }), 1000);
 });
 
 </script>

diff --git a/common/tct-power-tizen-tests/power/PowerManager_turnScreenOn_successful.html b/common/tct-power-tizen-tests/power/PowerManager_turnScreenOn_successful.html
index 1a360ce04d94897ee4d75c4086ce3f3c224e39e7..db5f33a907292ed954b830427d90653e9d60d2be 100755 (executable)
--- a/common/tct-power-tizen-tests/power/PowerManager_turnScreenOn_successful.html
+++ b/common/tct-power-tizen-tests/power/PowerManager_turnScreenOn_successful.html
@@ -56,14 +56,21 @@ Authors:
 //==== TEST_CRITERIA MNA MNAST
 setup({timeout: 90000});
 
-var t = async_test(document.title, {timeout: 90000}), isScreenOn = tizen.power.isScreenOn();
+var t = async_test(document.title, {timeout: 90000}), isScreenOn, changeCallback;
+
 t.step(function () {
-    tizen.power.turnScreenOff();
-    tizen.power.turnScreenOn();
-    setTimeout(t.step_func(function () {
+    changeCallback = t.step_func(function (previousState, changedState) {
+        assert_not_equals(previousState, changedState, "Screen States should be different.");
         assert_true(isScreenOn, "The screen should be turned on");
         t.done();
-    }), 1000);
+    });
+
+    tizen.power.turnScreenOff();
+    setTimeout(t.step_func(function () {
+        tizen.power.setScreenStateChangeListener(changeCallback);
+    }), 500);
+    tizen.power.turnScreenOn();
+    isScreenOn = tizen.power.isScreenOn();
 });
 
 </script>