[common][power][DPTTIZEN-3083, fix 2 manual tc issue]

Change-Id: I68ebaa2d8285b8f0469bbfed2a2313e0086d1cef

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 a3ef4ff2ffe181335aa1959e0931573048d319fd..4f712bc6212e45d779535f7fba384003e3cb5fb3 100755 (executable)
--- a/common/tct-power-tizen-tests/power/PowerManager_turnScreenOff_successful.html
+++ b/common/tct-power-tizen-tests/power/PowerManager_turnScreenOff_successful.html
@@ -44,11 +44,6 @@ Authors:
 <script type="text/javascript">
 //==== TEST: PowerManager_turnScreenOff_successful
 //==== LABEL Check if turnScreenOff method works correctly
-//==== EXECUTION_TYPE manual
-//==== STEP Click 'Run'
-//==== EXPECT The screen should be turned off
-//==== STEP Unlock the screen and display the test application
-//==== EXPECT The result should be 'Pass'
 //==== SPEC Tizen Web API:System:Power:PowerManager:turnScreenOff M
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/power.html
 //==== PRIORITY P1
@@ -58,6 +53,7 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), powerMgr = tizen.power, isScreenOn, changeCallback;
 t.step(function () {
     changeCallback = t.step_func(function (previousState, changedState) {
+        isScreenOn = powerMgr.isScreenOn();
         assert_not_equals(previousState, changedState, "Screen States should be different.");
         assert_false(isScreenOn, "The screen should be turned off");
         t.done();
@@ -66,9 +62,8 @@ t.step(function () {
     powerMgr.turnScreenOn();
     setTimeout(t.step_func(function () {
         powerMgr.setScreenStateChangeListener(changeCallback);
+        powerMgr.turnScreenOff();
     }), 500);
-    powerMgr.turnScreenOff();
-    isScreenOn = powerMgr.isScreenOn();
 });
 
 </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 db5f33a907292ed954b830427d90653e9d60d2be..85661482d46b0e81a4708dc9356e829c71bb0745 100755 (executable)
--- a/common/tct-power-tizen-tests/power/PowerManager_turnScreenOn_successful.html
+++ b/common/tct-power-tizen-tests/power/PowerManager_turnScreenOn_successful.html
@@ -45,11 +45,6 @@ Authors:
 <script type="text/javascript">
 //==== TEST: PowerManager_turnScreenOn_successful
 //==== LABEL Check if turnScreenOn method works correctly
-//==== EXECUTION_TYPE manual
-//==== STEP Click 'Run'
-//==== EXPECT The screen should be turned locked
-//==== STEP Unlock the screen and display the test application
-//==== EXPECT The result should be 'Pass'
 //==== SPEC Tizen Web API:System:Power:PowerManager:turnScreenOn M
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/power.html
 //==== PRIORITY P1
@@ -60,6 +55,7 @@ var t = async_test(document.title, {timeout: 90000}), isScreenOn, changeCallback
 
 t.step(function () {
     changeCallback = t.step_func(function (previousState, changedState) {
+        isScreenOn = tizen.power.isScreenOn();
         assert_not_equals(previousState, changedState, "Screen States should be different.");
         assert_true(isScreenOn, "The screen should be turned on");
         t.done();
@@ -68,9 +64,8 @@ t.step(function () {
     tizen.power.turnScreenOff();
     setTimeout(t.step_func(function () {
         tizen.power.setScreenStateChangeListener(changeCallback);
+        tizen.power.turnScreenOn();
     }), 500);
-    tizen.power.turnScreenOn();
-    isScreenOn = tizen.power.isScreenOn();
 });
 
 </script>

diff --git a/common/tct-power-tizen-tests/tests.xml b/common/tct-power-tizen-tests/tests.xml
index 42b9e693d919257a562246db42d97d2836f75af7..e378a874e3f0fb9291c0ee1e0839542f9bd11827 100755 (executable)
--- a/common/tct-power-tizen-tests/tests.xml
+++ b/common/tct-power-tizen-tests/tests.xml
@@ -282,18 +282,8 @@
           <test_script_entry>/opt/tct-power-tizen-tests/power/PowerManager_turnScreenOn_method_exists.html</test_script_entry>
         </description>
       </testcase>
-      <testcase purpose="Check if turnScreenOn method works correctly" component="Tizen Device APIs/System/Power" execution_type="manual" priority="P1" id="PowerManager_turnScreenOn_successful">
+      <testcase purpose="Check if turnScreenOn method works correctly" component="Tizen Device APIs/System/Power" execution_type="auto" priority="P1" id="PowerManager_turnScreenOn_successful">
         <description>
-          <steps>
-            <step order="1">
-              <step_desc>Click 'Run'</step_desc>
-              <expected>The screen should be turned locked</expected>
-            </step>
-            <step order="2">
-              <step_desc>Unlock the screen and display the test application</step_desc>
-              <expected>The result should be 'Pass'</expected>
-            </step>
-          </steps>
           <test_script_entry>/opt/tct-power-tizen-tests/power/PowerManager_turnScreenOn_successful.html</test_script_entry>
         </description>
       </testcase>
@@ -587,18 +577,8 @@
           <test_script_entry>/opt/tct-power-tizen-tests/power/PowerManager_turnScreenOff_extra_argument.html</test_script_entry>
         </description>
       </testcase>
-      <testcase purpose="Check if turnScreenOff method works correctly" component="Tizen Device APIs/System/Power" execution_type="manual" priority="P1" id="PowerManager_turnScreenOff_successful">
+      <testcase purpose="Check if turnScreenOff method works correctly" component="Tizen Device APIs/System/Power" execution_type="auto" priority="P1" id="PowerManager_turnScreenOff_successful">
         <description>
-          <steps>
-            <step order="1">
-              <step_desc>Click 'Run'</step_desc>
-              <expected>The screen should be turned off</expected>
-            </step>
-            <step order="2">
-              <step_desc>Unlock the screen and display the test application</step_desc>
-              <expected>The result should be 'Pass'</expected>
-            </step>
-          </steps>
           <test_script_entry>/opt/tct-power-tizen-tests/power/PowerManager_turnScreenOff_successful.html</test_script_entry>
         </description>
       </testcase>