[Non-ACR] Change precondition for Connection and WiFi

Change-Id: I7b76f0a78822bc5f7817c5a14b80d4b892bb262f

diff --git a/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig-3.0.zip b/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig-3.0.zip
old mode 100755 (executable)
new mode 100644 (file)
index 15b6855..aeb5f74
Binary files a/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig-3.0.zip and b/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig-3.0.zip differ

diff --git a/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig/preconfigure.json b/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig/preconfigure.json
index af6e353..b9cbf2f 100755 (executable)
--- a/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig/preconfigure.json
+++ b/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig/preconfigure.json
@@ -25,6 +25,7 @@
     "HIDDEN_AP":"Set available hidden AP name",
     "PASSWORD_FOR_ALL_PRIVATE_AP":"Set common password of all private APs",
     "PUBLIC_AP":"Set available public AP name",
+    "PRIVATE_AP":"Set available private AP name",
     "PRIVATE_AP_1_2":"Set available private AP name 1",
     "PRIVATE_AP_2_2":"Set available private AP name 2",
     "HIDDEN_AP":"Set available hidden AP name",

diff --git a/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig/tct-testconfig.ini b/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig/tct-testconfig.ini
index 94600c5..f02fe0a 100755 (executable)
--- a/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig/tct-testconfig.ini
+++ b/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig/tct-testconfig.ini
@@ -19,23 +19,8 @@ BT_REMOTE_BLE_DEVICE_ADDRESS=Set remote BLE device address. (AA:AA:AA:AA:AA:AA)
 BT_REMOTE_HID_DEVICE_ADDRESS=Set remote HID device address. (AA:AA:AA:AA:AA:AA)
 BT_REMOTE_OPP_DEVICE_ADDRESS=Set remote OPP device address. (AA:AA:AA:AA:AA:AA)
 
-# Network AP name settings
-[Tizen.Network.Tests]
-PUBLIC_AP=Set available public AP name
-PRIVATE_AP_1_2=Set available private AP name 1
-PRIVATE_AP_2_2=Set available private AP name 2
-HIDDEN_AP=Set available hidden AP
-PASSWORD_FOR_ALL_PRIVATE_AP=Set common password of all private APs
-
-# WPS AP name settings
-[Tizen.Network.Manual.Tests]
-WPS_PBC_AP=Set name of available AP with WPS PBC function
-WPS_PIN_AP=Set name of available AP with WPS PIN function
-PIN_NUMBER_OF_WPS_PIN_AP=Set pin number of WPS_PIN_AP
-
 # WiFi test settings
 [Tizen.WiFi.Tests]
-PUBLIC_AP=Set available public AP name
 PRIVATE_AP_1_2=Set available private AP name 1
 PRIVATE_AP_2_2=Set available private AP name 2
 HIDDEN_AP=Set available hidden AP
@@ -50,9 +35,7 @@ PIN_NUMBER_OF_WPS_PIN_AP=Set pin number of WPS_PIN_AP
 # Connection test settings
 [Tizen.Connection.Tests]
 PUBLIC_AP=Set available public AP name
-PRIVATE_AP_1_2=Set available private AP name 1
-PRIVATE_AP_2_2=Set available private AP name 2
-HIDDEN_AP=Set available hidden AP
+PRIVATE_AP=Set available private AP name
 PASSWORD_FOR_ALL_PRIVATE_AP=Set common password of all private APs
 
 # Map test key settings

diff --git a/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig/tests.xml b/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig/tests.xml
index d7f40bb..1021eeb 100755 (executable)
--- a/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig/tests.xml
+++ b/release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig/tests.xml
@@ -231,24 +231,6 @@ The tct-bt-helper is included in the tct-bluetooth-tizen-tests package. Install
         </description>
       </testcase>
     </set>
-    <set name="Tizen.Network.Manual.Tests">
-      <testcase component="WebAPI/Tizen/configuration" execution_type="manual" id="Networkconfiguration" purpose="Tizen.Network.Manual.Tests configuration">
-        <description>
-          <steps>
-            <step order="1">
-              <step_desc>Set name of available AP with WPS PBC function.</step_desc>
-            </step>
-            <step order="2">
-              <step_desc>Set name of available AP with WPS PIN function.</step_desc>
-            </step>
-            <step order="3">
-              <step_desc>Set pin number of WPS_PIN_AP to PIN_NUMBER_WPS_PIN_AP. The pin number should be generated with the checksum defined in WSC spec (Wi-Fi Simple Configuration Technical Specification). The length of WPS PIN number should be 4 or 8. If you are not familiar with it, please use an example number, 47363533.</step_desc>
-            </step>
-          </steps>
-          <test_script_entry test_script_expected_result="0" timeout="90"/>
-        </description>
-      </testcase>
-    </set>
 
     <set name="Tizen.WiFi.Manual.Tests">
       <testcase component="WebAPI/Tizen/configuration" execution_type="manual" id="WiFiconfiguration" purpose="Tizen.WiFi.Manual.Tests configuration">
@@ -353,48 +335,20 @@ The tct-bt-helper is included in the tct-bluetooth-tizen-tests package. Install
       </testcase>
     </set>
 
-    <set name="Tizen.Network.Tests">
-      <testcase component="WebAPI/Tizen/configuration" execution_type="manual" id="Networkconfiguration" purpose="Tizen.Network.Tests configuration">
-        <description>
-          <steps>
-            <step order="1">
-              <step_desc>Set available public AP name.</step_desc>
-            </step>
-            <step order="2">
-              <step_desc>Set available private AP name 1.</step_desc>
-            </step>
-            <step order="3">
-              <step_desc>Set available private AP name 2.</step_desc>
-            </step>
-            <step order="4">
-              <step_desc>Set available hidden AP name.</step_desc>
-            </step>
-            <step order="5">
-              <step_desc>Set common password of all private APs.</step_desc>
-            </step>
-          </steps>
-          <test_script_entry test_script_expected_result="0" timeout="90"/>
-        </description>
-      </testcase>
-    </set>
-
     <set name="Tizen.WiFi.Tests">
       <testcase component="WebAPI/Tizen/configuration" execution_type="manual" id="WiFiconfiguration" purpose="Tizen.WiFi.Tests configuration">
         <description>
           <steps>
             <step order="1">
-              <step_desc>Set available public AP name.</step_desc>
-            </step>
-            <step order="2">
               <step_desc>Set available private AP name 1.</step_desc>
             </step>
-            <step order="3">
+            <step order="2">
               <step_desc>Set available private AP name 2.</step_desc>
             </step>
-            <step order="4">
+            <step order="3">
               <step_desc>Set available hidden AP name.</step_desc>
             </step>
-            <step order="5">
+            <step order="4">
               <step_desc>Set common password of all private APs.</step_desc>
             </step>
           </steps>
@@ -411,15 +365,9 @@ The tct-bt-helper is included in the tct-bluetooth-tizen-tests package. Install
               <step_desc>Set available public AP name.</step_desc>
             </step>
             <step order="2">
-              <step_desc>Set available private AP name 1.</step_desc>
+              <step_desc>Set available private AP name.</step_desc>
             </step>
             <step order="3">
-              <step_desc>Set available private AP name 2.</step_desc>
-            </step>
-            <step order="4">
-              <step_desc>Set available hidden AP name.</step_desc>
-            </step>
-            <step order="5">
               <step_desc>Set common password of all private APs.</step_desc>
             </step>
           </steps>

diff --git a/tool/script/tct-testconfig/preconfigure.json b/tool/script/tct-testconfig/preconfigure.json
index af6e353..b9cbf2f 100755 (executable)
--- a/tool/script/tct-testconfig/preconfigure.json
+++ b/tool/script/tct-testconfig/preconfigure.json
@@ -25,6 +25,7 @@
     "HIDDEN_AP":"Set available hidden AP name",
     "PASSWORD_FOR_ALL_PRIVATE_AP":"Set common password of all private APs",
     "PUBLIC_AP":"Set available public AP name",
+    "PRIVATE_AP":"Set available private AP name",
     "PRIVATE_AP_1_2":"Set available private AP name 1",
     "PRIVATE_AP_2_2":"Set available private AP name 2",
     "HIDDEN_AP":"Set available hidden AP name",

diff --git a/tool/script/tct-testconfig/tct-testconfig-3.0.zip b/tool/script/tct-testconfig/tct-testconfig-3.0.zip
index 15b6855..aeb5f74 100644 (file)
Binary files a/tool/script/tct-testconfig/tct-testconfig-3.0.zip and b/tool/script/tct-testconfig/tct-testconfig-3.0.zip differ

diff --git a/tool/script/tct-testconfig/tct-testconfig.ini b/tool/script/tct-testconfig/tct-testconfig.ini
index 94600c5..f02fe0a 100755 (executable)
--- a/tool/script/tct-testconfig/tct-testconfig.ini
+++ b/tool/script/tct-testconfig/tct-testconfig.ini
@@ -19,23 +19,8 @@ BT_REMOTE_BLE_DEVICE_ADDRESS=Set remote BLE device address. (AA:AA:AA:AA:AA:AA)
 BT_REMOTE_HID_DEVICE_ADDRESS=Set remote HID device address. (AA:AA:AA:AA:AA:AA)
 BT_REMOTE_OPP_DEVICE_ADDRESS=Set remote OPP device address. (AA:AA:AA:AA:AA:AA)
 
-# Network AP name settings
-[Tizen.Network.Tests]
-PUBLIC_AP=Set available public AP name
-PRIVATE_AP_1_2=Set available private AP name 1
-PRIVATE_AP_2_2=Set available private AP name 2
-HIDDEN_AP=Set available hidden AP
-PASSWORD_FOR_ALL_PRIVATE_AP=Set common password of all private APs
-
-# WPS AP name settings
-[Tizen.Network.Manual.Tests]
-WPS_PBC_AP=Set name of available AP with WPS PBC function
-WPS_PIN_AP=Set name of available AP with WPS PIN function
-PIN_NUMBER_OF_WPS_PIN_AP=Set pin number of WPS_PIN_AP
-
 # WiFi test settings
 [Tizen.WiFi.Tests]
-PUBLIC_AP=Set available public AP name
 PRIVATE_AP_1_2=Set available private AP name 1
 PRIVATE_AP_2_2=Set available private AP name 2
 HIDDEN_AP=Set available hidden AP
@@ -50,9 +35,7 @@ PIN_NUMBER_OF_WPS_PIN_AP=Set pin number of WPS_PIN_AP
 # Connection test settings
 [Tizen.Connection.Tests]
 PUBLIC_AP=Set available public AP name
-PRIVATE_AP_1_2=Set available private AP name 1
-PRIVATE_AP_2_2=Set available private AP name 2
-HIDDEN_AP=Set available hidden AP
+PRIVATE_AP=Set available private AP name
 PASSWORD_FOR_ALL_PRIVATE_AP=Set common password of all private APs
 
 # Map test key settings

diff --git a/tool/script/tct-testconfig/tests.xml b/tool/script/tct-testconfig/tests.xml
index d7f40bb..1021eeb 100755 (executable)
--- a/tool/script/tct-testconfig/tests.xml
+++ b/tool/script/tct-testconfig/tests.xml
@@ -231,24 +231,6 @@ The tct-bt-helper is included in the tct-bluetooth-tizen-tests package. Install
         </description>
       </testcase>
     </set>
-    <set name="Tizen.Network.Manual.Tests">
-      <testcase component="WebAPI/Tizen/configuration" execution_type="manual" id="Networkconfiguration" purpose="Tizen.Network.Manual.Tests configuration">
-        <description>
-          <steps>
-            <step order="1">
-              <step_desc>Set name of available AP with WPS PBC function.</step_desc>
-            </step>
-            <step order="2">
-              <step_desc>Set name of available AP with WPS PIN function.</step_desc>
-            </step>
-            <step order="3">
-              <step_desc>Set pin number of WPS_PIN_AP to PIN_NUMBER_WPS_PIN_AP. The pin number should be generated with the checksum defined in WSC spec (Wi-Fi Simple Configuration Technical Specification). The length of WPS PIN number should be 4 or 8. If you are not familiar with it, please use an example number, 47363533.</step_desc>
-            </step>
-          </steps>
-          <test_script_entry test_script_expected_result="0" timeout="90"/>
-        </description>
-      </testcase>
-    </set>
 
     <set name="Tizen.WiFi.Manual.Tests">
       <testcase component="WebAPI/Tizen/configuration" execution_type="manual" id="WiFiconfiguration" purpose="Tizen.WiFi.Manual.Tests configuration">
@@ -353,48 +335,20 @@ The tct-bt-helper is included in the tct-bluetooth-tizen-tests package. Install
       </testcase>
     </set>
 
-    <set name="Tizen.Network.Tests">
-      <testcase component="WebAPI/Tizen/configuration" execution_type="manual" id="Networkconfiguration" purpose="Tizen.Network.Tests configuration">
-        <description>
-          <steps>
-            <step order="1">
-              <step_desc>Set available public AP name.</step_desc>
-            </step>
-            <step order="2">
-              <step_desc>Set available private AP name 1.</step_desc>
-            </step>
-            <step order="3">
-              <step_desc>Set available private AP name 2.</step_desc>
-            </step>
-            <step order="4">
-              <step_desc>Set available hidden AP name.</step_desc>
-            </step>
-            <step order="5">
-              <step_desc>Set common password of all private APs.</step_desc>
-            </step>
-          </steps>
-          <test_script_entry test_script_expected_result="0" timeout="90"/>
-        </description>
-      </testcase>
-    </set>
-
     <set name="Tizen.WiFi.Tests">
       <testcase component="WebAPI/Tizen/configuration" execution_type="manual" id="WiFiconfiguration" purpose="Tizen.WiFi.Tests configuration">
         <description>
           <steps>
             <step order="1">
-              <step_desc>Set available public AP name.</step_desc>
-            </step>
-            <step order="2">
               <step_desc>Set available private AP name 1.</step_desc>
             </step>
-            <step order="3">
+            <step order="2">
               <step_desc>Set available private AP name 2.</step_desc>
             </step>
-            <step order="4">
+            <step order="3">
               <step_desc>Set available hidden AP name.</step_desc>
             </step>
-            <step order="5">
+            <step order="4">
               <step_desc>Set common password of all private APs.</step_desc>
             </step>
           </steps>
@@ -411,15 +365,9 @@ The tct-bt-helper is included in the tct-bluetooth-tizen-tests package. Install
               <step_desc>Set available public AP name.</step_desc>
             </step>
             <step order="2">
-              <step_desc>Set available private AP name 1.</step_desc>
+              <step_desc>Set available private AP name.</step_desc>
             </step>
             <step order="3">
-              <step_desc>Set available private AP name 2.</step_desc>
-            </step>
-            <step order="4">
-              <step_desc>Set available hidden AP name.</step_desc>
-            </step>
-            <step order="5">
               <step_desc>Set common password of all private APs.</step_desc>
             </step>
           </steps>