[common][systeminfo][fix tc issue]

Change-Id: I875af7336ed2adc5bab49a9027a9918fc8145a23
Signed-off-by: mengli.zhang <mengli.zhang@samsung.com>

diff --git a/common/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValue.html b/common/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValue.html
index 1077623a52949acf95b8f315cb2a6a0b83e23bd9..0a3021964af5b47dce4a00beafacf4524abba935 100755 (executable)
--- a/common/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValue.html
+++ b/common/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValue.html
@@ -51,13 +51,12 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), getPropertyValueSuccess, retValue = null;
 
 t.step(function () {
-    getPropertyValueSuccess = t.step_func(function (battery) {
-        assert_not_equals(battery.level, null, "Fail to getPropertyValue");
+    getPropertyValueSuccess = t.step_func(function (cellular) {
         assert_equals(retValue, undefined, "getPropertyValue returns wrong value");
 
         t.done();
     });
-    retValue = tizen.systeminfo.getPropertyValue("BATTERY", getPropertyValueSuccess);
+    retValue = tizen.systeminfo.getPropertyValue("BUILD", getPropertyValueSuccess);
 });
 
 </script>

diff --git a/common/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValueArray.html b/common/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValueArray.html
index 21bd7158796d2340777c55db5333602d69d8be7c..215d33a331be1bf13da1e85f504fbd4c344abdef 100755 (executable)
--- a/common/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValueArray.html
+++ b/common/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValueArray.html
@@ -42,12 +42,11 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), getPropertyValueArraySuccess, retValue = null;
 
 t.step(function () {
-    getPropertyValueArraySuccess = t.step_func(function (battery) {
-        assert_not_equals(battery.level, null, "Fail to getPropertyValueArray");
+    getPropertyValueArraySuccess = t.step_func(function (cellular) {
         assert_equals(retValue, undefined, "getPropertyValueArray returns wrong value");
         t.done();
     });
-    retValue = tizen.systeminfo.getPropertyValueArray("BATTERY", getPropertyValueArraySuccess);
+    retValue = tizen.systeminfo.getPropertyValueArray("BUILD", getPropertyValueArraySuccess);
 });
 
 </script>

diff --git a/common/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValue_with_errorCallback.html b/common/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValue_with_errorCallback.html
index 41e3ce58d6ba35404a780433e17088c6b9a490bb..3444533bae2b44aa78d69431f56ae2ed432a8764 100755 (executable)
--- a/common/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValue_with_errorCallback.html
+++ b/common/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValue_with_errorCallback.html
@@ -49,11 +49,11 @@ Authors:
 setup({timeout: 90000});
 
 var t = async_test(document.title, {timeout: 90000}),
-    getPropertyValueSuccess, getPropertyValueError;
+    getPropertyValueSuccess, getPropertyValueError, retValue = null;
 
 t.step(function () {
-    getPropertyValueSuccess = t.step_func(function (battery) {
-        assert_not_equals(battery.level, null, "Failed to getPropertyValue");
+    getPropertyValueSuccess = t.step_func(function (cellular) {
+        assert_equals(retValue, undefined, "getPropertyValueArray returns wrong value");
         t.done();
     });
     getPropertyValueError = t.step_func(function (error) {
@@ -61,7 +61,7 @@ t.step(function () {
             error.name + ", msg: " + error.message);
     });
 
-    tizen.systeminfo.getPropertyValue("BATTERY", getPropertyValueSuccess, getPropertyValueError);
+    retValue = tizen.systeminfo.getPropertyValue("BUILD", getPropertyValueSuccess, getPropertyValueError);
 });
 
 </script>

diff --git a/common/tct-systeminfo-tizen-tests/tests.full.xml b/common/tct-systeminfo-tizen-tests/tests.full.xml
index 068a81e17a753cedbad498bf656be3631d91a793..2491dd484d587e8c43f48f9b84771cb7ee036836 100755 (executable)
--- a/common/tct-systeminfo-tizen-tests/tests.full.xml
+++ b/common/tct-systeminfo-tizen-tests/tests.full.xml
@@ -316,42 +316,6 @@
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Check if SystemInfoBattery can have new property added" type="compliance" onload_delay="90" status="approved" component="TizenAPI/System/SystemInfo" execution_type="auto" priority="P3" id="SystemInfoBattery_extend">
-        <description>
-          <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfoBattery_extend.html</test_script_entry>
-        </description>
-        <specs>
-          <spec>
-            <spec_assertion interface="SystemInfoBattery" usage="true" specification="SystemInfo" section="System" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/systeminfo.html</spec_url>
-            <spec_statement>TBD</spec_statement>
-          </spec>
-        </specs>
-      </testcase>
-      <testcase purpose="Check attribute level in SystemInfoBattery" type="compliance" onload_delay="90" status="approved" component="TizenAPI/System/SystemInfo" execution_type="auto" priority="P1" id="SystemInfoBattery_level_attribute">
-        <description>
-          <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfoBattery_level_attribute.html</test_script_entry>
-        </description>
-        <specs>
-          <spec>
-            <spec_assertion interface="SystemInfoBattery" element_type="attribute" element_name="level" specification="SystemInfo" section="System" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/systeminfo.html</spec_url>
-            <spec_statement>TBD</spec_statement>
-          </spec>
-        </specs>
-      </testcase>
-      <testcase purpose="Check attribute isCharging in SystemInfoBattery" type="compliance" onload_delay="90" status="approved" component="TizenAPI/System/SystemInfo" execution_type="auto" priority="P1" id="SystemInfoBattery_isCharging_attribute">
-        <description>
-          <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfoBattery_isCharging_attribute.html</test_script_entry>
-        </description>
-        <specs>
-          <spec>
-            <spec_assertion interface="SystemInfoBattery" element_type="attribute" element_name="isCharging" specification="SystemInfo" section="System" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/systeminfo.html</spec_url>
-            <spec_statement>TBD</spec_statement>
-          </spec>
-        </specs>
-      </testcase>
       <testcase purpose="Check if instance of interface SystemInfo can be extended with new property" type="compliance" status="approved" component="TizenAPI/System/SystemInfo" execution_type="auto" priority="P3" id="SystemInfo_extend">
         <description>
           <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_extend.html</test_script_entry>
@@ -9226,30 +9190,6 @@
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Check if SystemInfoBattery can have new property added" type="compliance" onload_delay="90" status="approved" component="TizenAPI/System/SystemInfo" execution_type="auto" priority="P3" id="SystemInfoBattery_extend">
-        <description>
-          <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfoBattery_extend.html</test_script_entry>
-        </description>
-        <specs>
-          <spec>
-            <spec_assertion interface="SystemInfoBattery" usage="true" specification="SystemInfo" section="System" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/systeminfo.html</spec_url>
-            <spec_statement>TBD</spec_statement>
-          </spec>
-        </specs>
-      </testcase>
-      <testcase purpose="Check attribute isCharging in SystemInfoBattery" type="compliance" onload_delay="90" status="approved" component="TizenAPI/System/SystemInfo" execution_type="auto" priority="P1" id="SystemInfoBattery_isCharging_attribute">
-        <description>
-          <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfoBattery_isCharging_attribute.html</test_script_entry>
-        </description>
-        <specs>
-          <spec>
-            <spec_assertion interface="SystemInfoBattery" element_type="attribute" element_name="isCharging" specification="SystemInfo" section="System" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/systeminfo.html</spec_url>
-            <spec_statement>TBD</spec_statement>
-          </spec>
-        </specs>
-      </testcase>
       <testcase purpose="Check if instance of interface SystemInfo can be extended with new property" type="compliance" status="approved" component="TizenAPI/System/SystemInfo" execution_type="auto" priority="P3" id="SystemInfo_extend">
         <description>
           <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_extend.html</test_script_entry>
@@ -9622,18 +9562,6 @@
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Check method SystemInfo_getPropertyValue with errorCallback" type="compliance" onload_delay="90" status="approved" component="TizenAPI/System/SystemInfo" execution_type="auto" priority="P1" id="SystemInfo_getPropertyValue_with_errorCallback">
-        <description>
-          <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValue_with_errorCallback.html</test_script_entry>
-        </description>
-        <specs>
-          <spec>
-            <spec_assertion interface="SystemInfo" element_type="method" element_name="getPropertyValue" specification="SystemInfo" section="System" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/systeminfo.html</spec_url>
-            <spec_statement>TBD</spec_statement>
-          </spec>
-        </specs>
-      </testcase>
       <testcase purpose="Check if getPropertyValue throws exception when property is incorrect" type="compliance" onload_delay="90" status="approved" component="TizenAPI/System/SystemInfo" execution_type="auto" priority="P2" id="SystemInfo_getPropertyValue_property_TypeMismatch">
         <description>
           <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValue_property_TypeMismatch.html</test_script_entry>
@@ -9874,18 +9802,6 @@
           </spec>
         </specs>
       </testcase>
-      <testcase purpose="Check if getPropertyValue('BATTERY', successCB, errorCB) calls successCallback + results' attributes" type="compliance" onload_delay="90" status="approved" component="TizenAPI/System/SystemInfo" execution_type="auto" priority="P1" id="SystemInfoPropertySuccessCallback_onsuccess_Battery">
-        <description>
-          <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfoPropertySuccessCallback_onsuccess_Battery.html</test_script_entry>
-        </description>
-        <specs>
-          <spec>
-            <spec_assertion interface="SystemInfoPropertySuccessCallback" element_type="method" element_name="onsuccess" specification="SystemInfo" section="System" category="Tizen Device API Specifications"/>
-            <spec_url>https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/systeminfo.html</spec_url>
-            <spec_statement>TBD</spec_statement>
-          </spec>
-        </specs>
-      </testcase>
       <testcase purpose="Check if getPropertyValue('BUILD', successCB, errorCB) calls successCallback + results' attributes" type="compliance" onload_delay="90" status="approved" component="TizenAPI/System/SystemInfo" execution_type="auto" priority="P1" id="SystemInfoPropertySuccessCallback_onsuccess_Build">
         <description>
           <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfoPropertySuccessCallback_onsuccess_Build.html</test_script_entry>

diff --git a/common/tct-systeminfo-tizen-tests/tests.xml b/common/tct-systeminfo-tizen-tests/tests.xml
index 879edf640687bce372ade83e463e032de19d73b8..2033ffc5e6f0a8d5b53b155b15e89df696e05085 100755 (executable)
--- a/common/tct-systeminfo-tizen-tests/tests.xml
+++ b/common/tct-systeminfo-tizen-tests/tests.xml
@@ -3446,16 +3446,6 @@
           <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfoNetwork_networkType_attribute.html</test_script_entry>
         </description>
       </testcase>
-      <testcase component="TizenAPI/System/SystemInfo" execution_type="auto" id="SystemInfoBattery_extend" onload_delay="90" priority="P3" purpose="Check if SystemInfoBattery can have new property added">
-        <description>
-          <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfoBattery_extend.html</test_script_entry>
-        </description>
-      </testcase>
-      <testcase component="TizenAPI/System/SystemInfo" execution_type="auto" id="SystemInfoBattery_isCharging_attribute" onload_delay="90" priority="P1" purpose="Check attribute isCharging in SystemInfoBattery">
-        <description>
-          <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfoBattery_isCharging_attribute.html</test_script_entry>
-        </description>
-      </testcase>
       <testcase component="TizenAPI/System/SystemInfo" execution_type="auto" id="SystemInfo_extend" priority="P3" purpose="Check if instance of interface SystemInfo can be extended with new property">
         <description>
           <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_extend.html</test_script_entry>
@@ -3711,11 +3701,6 @@
           <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfo_getPropertyValue_successCallback_TypeMismatch.html</test_script_entry>
         </description>
       </testcase>
-      <testcase component="TizenAPI/System/SystemInfo" execution_type="auto" id="SystemInfoPropertySuccessCallback_onsuccess_Battery" onload_delay="90" priority="P1" purpose="Check if getPropertyValue('BATTERY', successCB, errorCB) calls successCallback + results' attributes">
-        <description>
-          <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfoPropertySuccessCallback_onsuccess_Battery.html</test_script_entry>
-        </description>
-      </testcase>
       <testcase component="TizenAPI/System/SystemInfo" execution_type="auto" id="SystemInfoPropertySuccessCallback_onsuccess_Build" onload_delay="90" priority="P1" purpose="Check if getPropertyValue('BUILD', successCB, errorCB) calls successCallback + results' attributes">
         <description>
           <test_script_entry>/opt/tct-systeminfo-tizen-tests/systeminfo/SystemInfoPropertySuccessCallback_onsuccess_Build.html</test_script_entry>