From 8a7f99ce484836982c374b0d6dbfa03c259eeaff Mon Sep 17 00:00:00 2001 From: Nguyen Van Tan Date: Tue, 29 Jan 2019 10:21:13 +0700 Subject: [PATCH] [Non-ACR] Change precondition for Connection and WiFi Change-Id: I7b76f0a78822bc5f7817c5a14b80d4b892bb262f --- .../resource/tct-testconfig-3.0.zip | Bin 55343 -> 52392 bytes .../resource/tct-testconfig/preconfigure.json | 1 + .../tct-testconfig/tct-testconfig.ini | 19 +----- .../resource/tct-testconfig/tests.xml | 60 ++---------------- tool/script/tct-testconfig/preconfigure.json | 1 + .../tct-testconfig/tct-testconfig-3.0.zip | Bin 55343 -> 52392 bytes tool/script/tct-testconfig/tct-testconfig.ini | 19 +----- tool/script/tct-testconfig/tests.xml | 60 ++---------------- 8 files changed, 12 insertions(+), 148 deletions(-) mode change 100755 => 100644 release/csharp-tct_5.5_dotnet/csharp-tct_5.5_dotnet/resource/tct-testconfig-3.0.zip 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 new mode 100644 index 15b68553a49da3ad390e5d12ab6e18b5569bc1c8..aeb5f742788309c7c2c0db67b12d6540dff71f86 GIT binary patch delta 298 zcmZ3#fqBJD<_!-rc})Ur{jR61i#O$9U@+bMHgf{YsrcAPFTt^xo^+g&C7SrW1P$+WerlWxo=M`ub>*x7GWJ<-)2q* z1`t*S+roZBXtT?y&&-pJE~syAxWK~1Xghg9uI%K07u+{HT>i$4>h{Ub*WKjMUCV#~ ke;a)#FTbv>fMFLx3B%vU&j%*Uo>HGIc|(A0=P8g30LEr&_y7O^ delta 536 zcmZ26lX?9H<_!-rc@JmX_^sD9wPfaCU|`<-Hgf{Y=Jk0inFWe${4xv_O4fukFo3Yk zgM{FsA7{tF z*~qFNZZDm@YCZqtxIEs;>o=874p?tHS-?$h^6K@GlXWd+fpUD4^*4A0fbdS-k#iWMrgCy z!OzUNMTcZorRM3uf<^kc<>bhtdzAu$2`V)`wr8^D zQT53x#|<_|9{tS-)VF8z&g0*hQDbKEp3`n}=yAe;0Dl{$Co7!MR>1H8LJ7m)M#fW< d70-xGRy`;v7U0dw29jd~!kdf?3=Y>oJODHs&O-nI 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 af6e35322..b9cbf2f77 100755 --- 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 94600c570..f02fe0a6b 100755 --- 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 d7f40bb8e..1021eebb7 100755 --- 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 - - - - - - Set name of available AP with WPS PBC function. - - - Set name of available AP with WPS PIN function. - - - 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. - - - - - - @@ -353,48 +335,20 @@ The tct-bt-helper is included in the tct-bluetooth-tizen-tests package. Install - - - - - - Set available public AP name. - - - Set available private AP name 1. - - - Set available private AP name 2. - - - Set available hidden AP name. - - - Set common password of all private APs. - - - - - - - - Set available public AP name. - - Set available private AP name 1. - + Set available private AP name 2. - + Set available hidden AP name. - + Set common password of all private APs. @@ -411,15 +365,9 @@ The tct-bt-helper is included in the tct-bluetooth-tizen-tests package. Install Set available public AP name. - Set available private AP name 1. + Set available private AP name. - Set available private AP name 2. - - - Set available hidden AP name. - - Set common password of all private APs. diff --git a/tool/script/tct-testconfig/preconfigure.json b/tool/script/tct-testconfig/preconfigure.json index af6e35322..b9cbf2f77 100755 --- 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 15b68553a49da3ad390e5d12ab6e18b5569bc1c8..aeb5f742788309c7c2c0db67b12d6540dff71f86 100644 GIT binary patch delta 298 zcmZ3#fqBJD<_!-rc})Ur{jR61i#O$9U@+bMHgf{YsrcAPFTt^xo^+g&C7SrW1P$+WerlWxo=M`ub>*x7GWJ<-)2q* z1`t*S+roZBXtT?y&&-pJE~syAxWK~1Xghg9uI%K07u+{HT>i$4>h{Ub*WKjMUCV#~ ke;a)#FTbv>fMFLx3B%vU&j%*Uo>HGIc|(A0=P8g30LEr&_y7O^ delta 536 zcmZ26lX?9H<_!-rc@JmX_^sD9wPfaCU|`<-Hgf{Y=Jk0inFWe${4xv_O4fukFo3Yk zgM{FsA7{tF z*~qFNZZDm@YCZqtxIEs;>o=874p?tHS-?$h^6K@GlXWd+fpUD4^*4A0fbdS-k#iWMrgCy z!OzUNMTcZorRM3uf<^kc<>bhtdzAu$2`V)`wr8^D zQT53x#|<_|9{tS-)VF8z&g0*hQDbKEp3`n}=yAe;0Dl{$Co7!MR>1H8LJ7m)M#fW< d70-xGRy`;v7U0dw29jd~!kdf?3=Y>oJODHs&O-nI diff --git a/tool/script/tct-testconfig/tct-testconfig.ini b/tool/script/tct-testconfig/tct-testconfig.ini index 94600c570..f02fe0a6b 100755 --- 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 d7f40bb8e..1021eebb7 100755 --- 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 - - - - - - Set name of available AP with WPS PBC function. - - - Set name of available AP with WPS PIN function. - - - 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. - - - - - - @@ -353,48 +335,20 @@ The tct-bt-helper is included in the tct-bluetooth-tizen-tests package. Install - - - - - - Set available public AP name. - - - Set available private AP name 1. - - - Set available private AP name 2. - - - Set available hidden AP name. - - - Set common password of all private APs. - - - - - - - - Set available public AP name. - - Set available private AP name 1. - + Set available private AP name 2. - + Set available hidden AP name. - + Set common password of all private APs. @@ -411,15 +365,9 @@ The tct-bt-helper is included in the tct-bluetooth-tizen-tests package. Install Set available public AP name. - Set available private AP name 1. + Set available private AP name. - Set available private AP name 2. - - - Set available hidden AP name. - - Set common password of all private APs. -- 2.34.1