From 73036a9d51c7bd1030ab2b0dbb1f78066a459906 Mon Sep 17 00:00:00 2001 From: Cheoleun Moon Date: Tue, 15 Jan 2019 17:17:08 +0900 Subject: [PATCH] [Network][Non-ACR][Modify delay time] Change-Id: I61df2d01ad62f0f5348b7ede3cf4c4b90df34b31 Signed-off-by: Cheoleun Moon --- .../testcase/TSAddressEventArgs.cs | 12 +++--- .../testcase/TSConnectionItem.cs | 3 +- .../testcase/TSConnectionManager.cs | 31 +++++++++----- .../testcase/TSConnectionProfile.cs | 32 +++++++++------ .../testcase/TSConnectionProfileManager.cs | 12 +++--- .../TSConnectionProfileStateEventArgs.cs | 4 +- .../TSConnectionStateChangedEventArgs.cs | 12 +++--- .../testcase/TSConnectionTypeEventArgs.cs | 7 ++-- .../testcase/TSDeviceStateChangedEventArgs.cs | 6 +-- .../testcase/TSIAddressInformation.cs | 2 +- .../testcase/TSProfileStateEventArgs.cs | 10 ++--- .../testcase/TSRssiLevelChangedEventArgs.cs | 8 ++-- .../testcase/TSScanStateChangedEventArgs.cs | 1 + .../Tizen.Network.Tests/testcase/TSWiFiAP.cs | 20 ++++------ .../testcase/TSWiFiConfiguration.cs | 2 +- .../Tizen.Network.Tests/testcase/TSWiFiEap.cs | 1 - .../testcase/TSWiFiEapConfiguration.cs | 1 - .../testcase/TSWiFiManager.cs | 40 +++++++++---------- .../testcase/TSWiFiNetwork.cs | 3 -- .../testcase/TSWiFiProfile.cs | 5 --- .../testcase/TSWiFiSecurity.cs | 2 +- .../testcase/support/networkSetup.cs | 2 +- 22 files changed, 106 insertions(+), 110 deletions(-) diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSAddressEventArgs.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSAddressEventArgs.cs index 79201c36d..a5192309c 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSAddressEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSAddressEventArgs.cs @@ -59,14 +59,14 @@ namespace Tizen.Network.Connection.Tests Assert.IsFalse(_flag, "_flag should be false before checking"); ConnectionManager.IPAddressChanged += Ipv4AddressChangedCallBack; - await Task.Delay(5000); + await Task.Delay(1500); Log.Info(Globals.LogTag, "Ipv4AddressChanged Event subscribed"); await networkSetup.ForgetCurrentAP(); - await Task.Delay(3000); + await Task.Delay(1500); await setUp(); Log.Info(Globals.LogTag, "Network is connected"); - await Task.Delay(3000); + await Task.Delay(1500); Assert.IsTrue(_flag, "Ipv4Address is not changed"); ConnectionManager.IPAddressChanged -= Ipv4AddressChangedCallBack; @@ -112,13 +112,13 @@ namespace Tizen.Network.Connection.Tests await setUp(); ConnectionManager.IPAddressChanged += Ipv6AddressChangedCallBack; - await Task.Delay(5000); + await Task.Delay(1500); Log.Info(Globals.LogTag, "Ipv6Address_GET Ipv6AddressChanged Event subscribed"); await networkSetup.ForgetCurrentAP(); - await Task.Delay(3000); + await Task.Delay(1500); await setUp(); Log.Info(Globals.LogTag, "Network is connected"); - await Task.Delay(3000); + await Task.Delay(1500); Assert.IsTrue(_flag, "Ipv6Address is not changed"); /** diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionItem.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionItem.cs index 9ced1d657..b0acec703 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionItem.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionItem.cs @@ -41,6 +41,7 @@ namespace Tizen.Network.Connection.Tests public static async Task setUp() { await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); + await Task.Delay(1500); } [Test] @@ -60,7 +61,6 @@ namespace Tizen.Network.Connection.Tests */ await setUp(); - await Task.Delay(3000); /** * TEST CODE @@ -100,7 +100,6 @@ namespace Tizen.Network.Connection.Tests Log.Info(Globals.LogTag, "ConnectionItem_State_GET start"); await setUp(); - await Task.Delay(3000); /** * TEST CODE diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionManager.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionManager.cs index b51ddd0e7..cd3c22868 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionManager.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionManager.cs @@ -61,7 +61,7 @@ namespace Tizen.Network.Connection.Tests { _nameWiFi = networkParameter.wnPRIVATE; await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); - await Task.Delay(3000); + await Task.Delay(1500); } /*setup using for connecting to a PUBLIC AP*/ @@ -70,14 +70,14 @@ namespace Tizen.Network.Connection.Tests _nameWiFi = networkParameter.wnPUBLIC; Log.Info(Globals.LogTag, "Try to connect to " + networkParameter.wnPUBLIC); await networkSetup.ConnectWiFi(networkParameter.wnPUBLIC, networkParameter.wType.wPublic, null); - await Task.Delay(3000); + await Task.Delay(1500); } public static async Task tearDown() { _nameWiFi = null; await networkSetup.DeactivateWiFi(); - await Task.Delay(3000); + await Task.Delay(1500); } [Test] @@ -135,6 +135,7 @@ namespace Tizen.Network.Connection.Tests if (isWiFiSupported && WiFiManager.IsActive) await tearDown(); await Task.Delay(5000); + Log.Info(Globals.LogTag, "CellularState_CONNECTED_STATE WiFi is disconnected"); /** * TEST CODE @@ -148,6 +149,7 @@ namespace Tizen.Network.Connection.Tests } Assert.AreEqual(CellularState.Connected, ConnectionManager.CellularState, "get Cellular_Connected_State is fail"); + // POSTCONDITION await setUp(); } @@ -174,6 +176,7 @@ namespace Tizen.Network.Connection.Tests * */ Log.Info(Globals.LogTag, "WiFiState_CONNECTED_STATE start"); await setUp(); + /** * TEST CODE **/ @@ -219,13 +222,14 @@ namespace Tizen.Network.Connection.Tests _wifiAP = WiFiManager.GetConnectedAP(); Assert.IsNotNull(_wifiAP, "No WiFi connection"); await _wifiAP.ForgetAPAsync(); - await Task.Delay(3000); + await Task.Delay(1500); + /** * TEST CODE **/ Log.Info(Globals.LogTag, "WiFiState: " + ConnectionManager.WiFiState.ToString()); Assert.AreEqual(ConnectionState.Disconnected, ConnectionManager.WiFiState, "get WiFi_State_disconnected is fail"); - await Task.Delay(3000); + await setUp(); } catch (NotSupportedException) @@ -268,10 +272,12 @@ namespace Tizen.Network.Connection.Tests Log.Info(Globals.LogTag, "WiFiState_DEACTIVATED_STATE start"); if (WiFiManager.IsActive) await tearDown(); + /** * TEST CODE **/ Assert.AreEqual(ConnectionState.Deactivated, ConnectionManager.WiFiState, "get WiFi_State_deactived is fail"); + // POSTCONDITION await setUp(); } @@ -371,6 +377,7 @@ namespace Tizen.Network.Connection.Tests * create a connection to WiFi public/private * */ await setUp(); + /** * TEST CODE * */ @@ -717,8 +724,9 @@ namespace Tizen.Network.Connection.Tests * TEST CODE * */ ConnectionManager.ConnectionTypeChanged += EventHandlerConnectionTypeChanged; - networkSetup.ForgetCurrentAP(); - await Task.Delay(3000); + await Task.Delay(1500); + await networkSetup.ForgetCurrentAP(); + await Task.Delay(1500); ConnectionManager.ConnectionTypeChanged -= EventHandlerConnectionTypeChanged; Assert.IsTrue(_flag, "Event ChangeType is fail"); // POSTCONDITION @@ -761,14 +769,15 @@ namespace Tizen.Network.Connection.Tests * */ Log.Info(Globals.LogTag, "IpAddressChanged_EVENT start"); ConnectionManager.IPAddressChanged += EventHandlerIpAddressChanged; + await Task.Delay(1500); await setUp(); /** * TEST CODE * */ _wifiAP = WiFiManager.GetConnectedAP(); Assert.IsNotNull(_wifiAP, "No WiFi connection"); - await _wifiAP.DisconnectAsync(); - await Task.Delay(5000); + await _wifiAP.ForgetAPAsync(); + await Task.Delay(1500); await setUp(); ConnectionManager.IPAddressChanged -= EventHandlerIpAddressChanged; Assert.IsTrue(_flag, "Event ChangeType is fail"); @@ -819,11 +828,11 @@ namespace Tizen.Network.Connection.Tests Assert.IsNotNull(_wifiAP, "No WiFi connection"); _wifiAP.NetworkInformation.ProxyType = WiFiProxyType.Manual; _wifiAP.NetworkInformation.ProxyAddress = "192.168.1.6:8080"; - await Task.Delay(3000); + await Task.Delay(1500); Log.Info(Globals.LogTag, "GetMacAddress=" + ConnectionManager.GetMacAddress(ConnectionType.WiFi)); Log.Info(Globals.LogTag, "GetIpAddress=" + ConnectionManager.GetIPAddress(AddressFamily.IPv4)); Log.Info(Globals.LogTag, "GetProxy=" + ConnectionManager.GetProxy(AddressFamily.IPv4)); - networkSetup.ForgetCurrentAP(); + await networkSetup.ForgetCurrentAP(); ConnectionManager.ProxyAddressChanged -= EventHandlerProxyAddressChanged; // POSTCONDITION await setUp(); diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfile.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfile.cs index 01b496937..59d20feb6 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfile.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfile.cs @@ -40,7 +40,7 @@ namespace Tizen.Network.Connection.Tests public static async Task setUp() { await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); - await Task.Delay(3000); + await Task.Delay(1500); } [Test] @@ -60,7 +60,8 @@ namespace Tizen.Network.Connection.Tests * turn on a Public WiFi * */ await setUp(); - /*TEST CODE */ + + /* TEST CODE */ _connectionProfile = ConnectionProfileManager.GetCurrentProfile(); Assert.IsNotNull(_connectionProfile); Assert.IsNotNull((string)_connectionProfile.Id, "ID is null"); @@ -103,7 +104,8 @@ namespace Tizen.Network.Connection.Tests * turn on a Public WiFi * */ await setUp(); - /*TEST CODE */ + + /* TEST CODE */ _connectionProfile = ConnectionProfileManager.GetCurrentProfile(); Assert.IsNotNull(_connectionProfile); Assert.IsNotNull((string)_connectionProfile.InterfaceName, "InterfaceName is null"); @@ -146,7 +148,8 @@ namespace Tizen.Network.Connection.Tests * turn on a Public WiFi * */ await setUp(); - /*TEST CODE */ + + /* TEST CODE */ _connectionProfile = ConnectionProfileManager.GetCurrentProfile(); Assert.IsNotNull(_connectionProfile); Assert.AreEqual(ProfileState.Connected.ToString(), _connectionProfile.GetState(AddressFamily.IPv4).ToString(), "get state is fail"); @@ -189,7 +192,8 @@ namespace Tizen.Network.Connection.Tests * turn on a Public WiFi * */ await setUp(); - /*TEST CODE */ + + /* TEST CODE */ _connectionProfile = ConnectionProfileManager.GetCurrentProfile(); Assert.IsNotNull(_connectionProfile); _connectionProfile.Refresh(); @@ -240,7 +244,8 @@ namespace Tizen.Network.Connection.Tests * turn on a Public WiFi * */ await setUp(); - /*TEST CODE */ + + /* TEST CODE */ _connectionProfile = ConnectionProfileManager.GetCurrentProfile(); Assert.IsNotNull(_connectionProfile); Assert.AreEqual((string)networkParameter.wnPRIVATE, (string)_connectionProfile.Name, "get name is fail"); @@ -292,7 +297,8 @@ namespace Tizen.Network.Connection.Tests * turn on a Public WiFi * */ await setUp(); - /*TEST CODE */ + + /* TEST CODE */ _connectionProfile = ConnectionProfileManager.GetCurrentProfile(); Assert.IsNotNull(_connectionProfile); Assert.AreEqual(ConnectionProfileType.WiFi, _connectionProfile.Type, "get Type is fail"); @@ -359,7 +365,7 @@ namespace Tizen.Network.Connection.Tests Assert.AreEqual(IPConfigType.Static.ToString(), addInfor.IPConfigType.ToString(), "set IpConfigType is fail"); /* POSTCONDITION */ - networkSetup.ForgetCurrentAP(); + await networkSetup.ForgetCurrentAP(); await setUp(); Log.Info(Globals.LogTag, "Finished"); } @@ -428,7 +434,7 @@ namespace Tizen.Network.Connection.Tests Assert.AreEqual(IPConfigType.Static.ToString(), addInfor.IPConfigType.ToString(), "set IpConfigType is fail"); /* POSTCONDITION */ - networkSetup.ForgetCurrentAP(); + await networkSetup.ForgetCurrentAP(); await setUp(); Log.Info(Globals.LogTag, "Finished"); } @@ -479,7 +485,7 @@ namespace Tizen.Network.Connection.Tests Assert.AreEqual(ProxyType.Manual.ToString(), _connectionProfile.ProxyType.ToString(), "Set ProxyType is fail"); /* POSTCONDITION */ - networkSetup.ForgetCurrentAP(); + await networkSetup.ForgetCurrentAP(); await setUp(); } catch (NotSupportedException) @@ -530,7 +536,7 @@ namespace Tizen.Network.Connection.Tests Assert.AreEqual(proxy, _connectionProfile.ProxyAddress.ToString(), "Set proxyAddress is fail"); /* POSTCONDITION */ - networkSetup.ForgetCurrentAP(); + await networkSetup.ForgetCurrentAP(); await setUp(); } catch (NotSupportedException) @@ -589,9 +595,9 @@ namespace Tizen.Network.Connection.Tests Assert.IsNotNull(_connectionProfile, "No Profile Found"); _connectionProfile.ProfileStateChanged += EventHandlerProfileStateChanged; - await Task.Delay(3000); + await Task.Delay(1500); await networkSetup.ForgetCurrentAP(); - await Task.Delay(3000); + await Task.Delay(1500); Log.Info(Globals.LogTag, "_flag=" + _flag); Assert.IsTrue(_flag, "Profile State don't change"); _connectionProfile.ProfileStateChanged -= EventHandlerProfileStateChanged; diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfileManager.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfileManager.cs index c2c48317a..616d243c9 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfileManager.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfileManager.cs @@ -57,13 +57,13 @@ namespace Tizen.Network.Tests public static async Task setUp() { await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); - await Task.Delay(3000); + await Task.Delay(1500); } public static async Task tearDown() { await networkSetup.DeactivateWiFi(); - await Task.Delay(2000); + await Task.Delay(1500); } [Test] @@ -648,7 +648,7 @@ namespace Tizen.Network.Tests Assert.IsNotNull(_profile, "Profile is Null"); await ConnectionProfileManager.DisconnectProfileAsync(_profile); Assert.AreEqual(ConnectionState.Disconnected.ToString(), ConnectionManager.WiFiState.ToString(), "DisconnectProfileAsync is fail"); - await Task.Delay(3000); + await Task.Delay(1500); await ConnectionProfileManager.ConnectProfileAsync(_profile); Assert.AreEqual(ConnectionState.Connected.ToString(), ConnectionManager.WiFiState.ToString(), "ConnectProfileAsync is fail"); Log.Info(Globals.LogTag, "ConnectProfileAsync_CONNECT_AGAIN_TO_SAME_POINT Finish"); @@ -712,9 +712,9 @@ namespace Tizen.Network.Tests } /*Disconnect AP*/ await ConnectionProfileManager.DisconnectProfileAsync(_currCP); + await Task.Delay(1500); Assert.AreEqual(ConnectionState.Disconnected.ToString(), ConnectionManager.WiFiState.ToString(), "DisconnectProfileAsync is fail"); Log.Info(Globals.LogTag, "wifi is disconnected"); - await Task.Delay(3000); /* TEST CODE */ /* connect to a WANTED AP */ @@ -781,7 +781,7 @@ namespace Tizen.Network.Tests Log.Info(Globals.LogTag, "DisconnectProfileAsync_DISCONNECT_AP start"); if (WiFiManager.GetConnectedAP() == null) { - await Task.Delay(5000); + await Task.Delay(1500); } await setUp(); /* TEST CODE */ @@ -797,8 +797,8 @@ namespace Tizen.Network.Tests } } await ConnectionProfileManager.DisconnectProfileAsync(_profile); + await Task.Delay(1500); Assert.AreEqual(ConnectionState.Disconnected.ToString(), ConnectionManager.WiFiState.ToString(), "DisconnectProfileAsync is fail"); - await Task.Delay(3000); Log.Info(Globals.LogTag, "DisconnectProfileAsync_DISCONNECT_AP finish"); await setUp(); } diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfileStateEventArgs.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfileStateEventArgs.cs index 887dca663..804068a32 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfileStateEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfileStateEventArgs.cs @@ -71,10 +71,10 @@ namespace Tizen.Network.Connection.Tests Assert.IsNotNull(_connectionProfile, "No Profile Found"); _connectionProfile.ProfileStateChanged += EventHandlerProfileStateChanged; - await Task.Delay(3000); + await Task.Delay(1500); Log.Info(Globals.LogTag, "Event subscripted"); await networkSetup.ForgetCurrentAP(); - await Task.Delay(3000); + await Task.Delay(1500); Log.Info(Globals.LogTag, "_flag=" + _flag); Assert.IsTrue(_flag, "Profile State don't change"); _connectionProfile.ProfileStateChanged -= EventHandlerProfileStateChanged; diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionStateChangedEventArgs.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionStateChangedEventArgs.cs index 61c9a1dae..bc89e5a17 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionStateChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionStateChangedEventArgs.cs @@ -71,9 +71,9 @@ namespace Tizen.Network.WiFi.Tests * TEST CODE */ WiFiManager.ConnectionStateChanged += EventHandlerConnectionStateChangedCBState; - await Task.Delay(3000); - networkSetup.ForgetCurrentAP(); - await Task.Delay(3000); + await Task.Delay(1500); + await networkSetup.ForgetCurrentAP(); + await Task.Delay(1500); Assert.IsTrue(_flag, "Flag should be true after checking"); /** @@ -116,7 +116,7 @@ namespace Tizen.Network.WiFi.Tests */ await setUp(); _wifiAP1 = WiFiManager.GetConnectedAP(); - networkSetup.ForgetCurrentAP(); + await networkSetup.ForgetCurrentAP(); Assert.IsFalse(_flag, "Flag should be fail before checking"); /* @@ -124,9 +124,9 @@ namespace Tizen.Network.WiFi.Tests * Then, connect to WiFi private2, changed WiFiApjk */ WiFiManager.ConnectionStateChanged += EventHandlerConnectionStateChangedCBAp; - await Task.Delay(3000); + await Task.Delay(1500); await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE1, networkParameter.wType.wPrivate, networkParameter.wPASS); - await Task.Delay(3000); + await Task.Delay(1500); _wifiAP2 = WiFiManager.GetConnectedAP(); Assert.IsTrue(_flag, "Flag should be true after checking"); WiFiManager.ConnectionStateChanged -= EventHandlerConnectionStateChangedCBAp; diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionTypeEventArgs.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionTypeEventArgs.cs index 6bff1ac6b..252ab73c6 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionTypeEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionTypeEventArgs.cs @@ -39,6 +39,7 @@ namespace Tizen.Network.Connection.Tests public static async Task setUp() { await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); + await Task.Delay(1500); } [Test] @@ -66,12 +67,12 @@ namespace Tizen.Network.Connection.Tests /** TEST CODE */ ConnectionManager.ConnectionTypeChanged += ConnectionTypeChangedCB; + await Task.Delay(1500); Log.Info(Globals.LogTag, "ConnectionType_GET ConnectionTypeChanged Event subsribed"); await setUp(); - await Task.Delay(3000); Log.Info(Globals.LogTag, "ConnectionType_GET ConnectionTypeChanged WiFi Connected"); - networkSetup.ForgetCurrentAP(); - await Task.Delay(2000); + await networkSetup.ForgetCurrentAP(); + await Task.Delay(1500); Log.Info(Globals.LogTag, "ConnectionType_GET ConnectionTypeChanged WiFi Disconnected"); Assert.IsTrue(_flag, "ConnectionType is not changed"); ConnectionManager.ConnectionTypeChanged -= ConnectionTypeChangedCB; diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSDeviceStateChangedEventArgs.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSDeviceStateChangedEventArgs.cs index bacf99ae0..62452f852 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSDeviceStateChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSDeviceStateChangedEventArgs.cs @@ -63,11 +63,11 @@ namespace Tizen.Network.WiFi.Tests * TEST CODE */ WiFiManager.DeviceStateChanged += EventHandlerDeviceStateChangedCB; - await Task.Delay(3000); + await Task.Delay(1500); await tearDown(); - await Task.Delay(3000); + await Task.Delay(1500); await setUp(); - await Task.Delay(3000); + await Task.Delay(1500); Assert.IsTrue(_flag, "Flag should be true after checking"); WiFiManager.DeviceStateChanged -= EventHandlerDeviceStateChangedCB; diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSIAddressInformation.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSIAddressInformation.cs index cc3bf9fdd..1d6080fcb 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSIAddressInformation.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSIAddressInformation.cs @@ -35,7 +35,7 @@ namespace Tizen.Network.Connection.Tests public static async Task setUp() { await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); - await Task.Delay(3000); + await Task.Delay(1500); } [Test] diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSProfileStateEventArgs.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSProfileStateEventArgs.cs index b9d8ff593..252d91e32 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSProfileStateEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSProfileStateEventArgs.cs @@ -36,7 +36,7 @@ namespace Tizen.Network.Connection.Tests public static async Task setUp() { await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); - await Task.Delay(3000); + await Task.Delay(1500); } private static void EventHandlerProfileStateChangedCB(object sender, EventArgs e) @@ -78,10 +78,10 @@ namespace Tizen.Network.Connection.Tests */ Assert.IsNotNull(_connectionProfile, "No Profile Found"); _connectionProfile.ProfileStateChanged += EventHandlerProfileStateChangedCB; - await Task.Delay(3000); - networkSetup.ForgetCurrentAP(); - Log.Info(Globals.LogTag, "ConnectionProfile3=" + _connectionProfile.GetState(AddressFamily.IPv4).ToString()); - await Task.Delay(3000); + await Task.Delay(1500); + await networkSetup.ForgetCurrentAP(); + await Task.Delay(1500); + Log.Info(Globals.LogTag, "ConnectionProfile3=" + _connectionProfile.GetState(AddressFamily.IPv4).ToString()); Log.Info(Globals.LogTag, "ConnectionProfile5=" + _connectionProfile.GetState(AddressFamily.IPv4).ToString()); Assert.IsTrue(_flag, "Flag should be true before check"); diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSRssiLevelChangedEventArgs.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSRssiLevelChangedEventArgs.cs index ff7c928f6..899ea12e6 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSRssiLevelChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSRssiLevelChangedEventArgs.cs @@ -36,6 +36,7 @@ namespace Tizen.Network.WiFi.Tests public static async Task setUp() { await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); + await Task.Delay(1500); } private static void EventHandlerRssiLevelChangedCB(object sender, EventArgs e) @@ -58,11 +59,10 @@ namespace Tizen.Network.WiFi.Tests * TEST CODE */ WiFiManager.RssiLevelChanged += EventHandlerRssiLevelChangedCB; - await Task.Delay(3000); - networkSetup.ForgetCurrentAP(); - await Task.Delay(3000); + await Task.Delay(1500); + await networkSetup.ForgetCurrentAP(); + await Task.Delay(1500); await setUp(); - await Task.Delay(3000); Assert.IsTrue(_flag, "Flag should be true after checking"); WiFiManager.RssiLevelChanged -= EventHandlerRssiLevelChangedCB; diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSScanStateChangedEventArgs.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSScanStateChangedEventArgs.cs index 48664ad2e..23bd1b871 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSScanStateChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSScanStateChangedEventArgs.cs @@ -65,6 +65,7 @@ namespace Tizen.Network.WiFi.Tests await WiFiManager.ActivateAsync(); } WiFiManager.ScanStateChanged += EventHandlerScanStateChangedCB; + await Task.Delay(1500); await WiFiManager.ScanAsync(); WiFiManager.ScanStateChanged -= EventHandlerScanStateChangedCB; diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiAP.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiAP.cs index 98bfe3458..dd7e8b26c 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiAP.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiAP.cs @@ -241,7 +241,7 @@ namespace Tizen.Network.WiFi.Tests /** TEST CODE */ await WiFiManager.ActivateAsync(); - await Task.Delay(5000); + await WiFiManager.ScanAsync(); var list = WiFiManager.GetFoundAPs(); Log.Info(Globals.LogTag, "Got found aps"); foreach (var item in list) @@ -255,7 +255,6 @@ namespace Tizen.Network.WiFi.Tests Assert.IsNotNull(_wifiAP, "Can't create a WiFi ap"); Log.Info(Globals.LogTag, "Try to Connect to " + _wifiAP.NetworkInformation.Essid.ToString()); await _wifiAP.ConnectAsync(); - await Task.Delay(5000); _wifiAP2 = WiFiManager.GetConnectedAP(); Assert.IsNotNull(_wifiAP2, "No WiFi connection"); Assert.AreEqual(_wifiAP.NetworkInformation.Essid.ToString(), _wifiAP2.NetworkInformation.Essid.ToString(), "Can't connect to a WiFi"); @@ -310,7 +309,7 @@ namespace Tizen.Network.WiFi.Tests _wifiAP = WiFiManager.GetConnectedAP(); Assert.IsNotNull(_wifiAP, "Failed to connect WiFi"); await _wifiAP.DisconnectAsync(); - await Task.Delay(5000); + await Task.Delay(1500); Assert.AreEqual(WiFiConnectionState.Disconnected.ToString(), WiFiManager.ConnectionState.ToString(), "WiFi is not disconnected"); Log.Info(Globals.LogTag, "Successfully done"); /** @@ -441,7 +440,7 @@ namespace Tizen.Network.WiFi.Tests _wifiAP = WiFiManager.GetConnectedAP(); Assert.IsNotNull(_wifiAP, "No WiFi connection"); _wifiAP.ForgetAP(); - await Task.Delay(3000); + await Task.Delay(1500); Assert.AreEqual((int)(WiFiConnectionState.Disconnected), (int)(WiFiManager.ConnectionState), "ConnectionState of removed AP should be is DISCONNECT"); Log.Info(Globals.LogTag, "Successfully done"); @@ -489,7 +488,7 @@ namespace Tizen.Network.WiFi.Tests _wifiAP = WiFiManager.GetConnectedAP(); Assert.IsNotNull(_wifiAP, "No WiFi connection"); await _wifiAP.ForgetAPAsync(); - await Task.Delay(2000); + await Task.Delay(1500); Assert.AreEqual(WiFiConnectionState.Disconnected.ToString(), WiFiManager.ConnectionState.ToString(), "ConnectionState of removed AP should be is DISCONNECT"); Log.Info(Globals.LogTag, "Successfully done"); @@ -538,7 +537,6 @@ namespace Tizen.Network.WiFi.Tests Assert.IsNotNull(_wifiAP, "No WiFi connection"); _wifiAP.Dispose(); await _wifiAP.ForgetAPAsync(); - await Task.Delay(2000); Assert.IsTrue(false, "ObjectDisposedException should be thrown"); } catch (NotSupportedException) @@ -586,9 +584,7 @@ namespace Tizen.Network.WiFi.Tests Assert.IsNotNull(_wifiAP, "No WiFi connection"); await tearDown(); - await Task.Delay(2000); await _wifiAP.ForgetAPAsync(); - await Task.Delay(2000); Assert.IsTrue(false, "InvalidOperationException should be thrown"); } catch (NotSupportedException) @@ -645,17 +641,15 @@ namespace Tizen.Network.WiFi.Tests ipv4Setting.IP = IPAddress.Parse(ip); _wifiAP.Update(); - await Task.Delay(2000); + await Task.Delay(1500); Assert.AreEqual(ip.ToString(), ipv4Setting.IP.ToString(), "Ip of Ipv4Setting get should be same set"); Log.Info(Globals.LogTag, "Successfully done"); /* * POSTCONDITION */ - ipv4Setting.IPConfigType = IPConfigType.Static; - ipv4Setting.IP = IPAddress.Parse(oldIP); - _wifiAP.Update(); - await Task.Delay(2000); + await networkSetup.ForgetCurrentAP(); + await setUp(); } catch (NotSupportedException) { diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiConfiguration.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiConfiguration.cs index 5474c86cf..d023fdcc2 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiConfiguration.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiConfiguration.cs @@ -37,7 +37,7 @@ namespace Tizen.Network.WiFi.Tests public static async Task setUp() { await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); - await Task.Delay(3000); + await Task.Delay(1500); _wants = networkParameter.wnPRIVATE; } diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiEap.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiEap.cs index 1826754d6..b4c882fb6 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiEap.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiEap.cs @@ -128,7 +128,6 @@ namespace Tizen.Network.WiFi.Tests { setUp(); _wiFiEap.SetClientCertFile(_clientCertFile); - ; Assert.AreEqual(_clientCertFile, _wiFiEap.GetClientCertFile(), "ClientCertFile doesn't get properly"); } catch (NotSupportedException) diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiEapConfiguration.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiEapConfiguration.cs index 0c355c110..9f04f7fb3 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiEapConfiguration.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiEapConfiguration.cs @@ -52,7 +52,6 @@ namespace Tizen.Network.WiFi.Tests public static async Task setUp() { await networkSetup.ConnectWiFi(_wants, networkParameter.wType.wPrivate, networkParameter.wPASS); - await Task.Delay(3000); _wifiAP = WiFiManager.GetConnectedAP(); Assert.IsNotNull(_wifiAP, "No WiFi connection"); _wiFiConfig = new WiFiConfiguration(_wifiAP.NetworkInformation.Essid, networkParameter.wPASS, WiFiSecurityType.Eap); diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiManager.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiManager.cs index 6cdbadaec..63340aca8 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiManager.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiManager.cs @@ -52,13 +52,13 @@ namespace Tizen.Network.WiFi.Tests public static async Task setUp() { await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); - await Task.Delay(3000); + await Task.Delay(1500); } public static async Task tearDown() { await networkSetup.DeactivateWiFi(); - await Task.Delay(2000); + await Task.Delay(1500); } public static void EventHandlerRssi(object sender, RssiLevelChangedEventArgs Rssi) @@ -95,7 +95,6 @@ namespace Tizen.Network.WiFi.Tests /** TEST CODE */ await WiFiManager.ActivateAsync(); - await Task.Delay(3000); Assert.IsTrue(WiFiManager.IsActive, "WiFi is off"); Log.Info(Globals.LogTag, "Successfully done"); @@ -136,7 +135,6 @@ namespace Tizen.Network.WiFi.Tests /** TEST CODE */ await WiFiManager.ActivateWithPickerAsync(); - await Task.Delay(3000); Assert.IsTrue(WiFiManager.IsActive, "WiFi is off"); Log.Info(Globals.LogTag, "Successfully done"); @@ -178,7 +176,6 @@ namespace Tizen.Network.WiFi.Tests WiFiAP ap = WiFiManager.GetConnectedAP(); await networkSetup.ForgetCurrentAP(); await WiFiManager.DeactivateAsync(); - await Task.Delay(3000); Assert.IsFalse(WiFiManager.IsActive, "WiFi doesn't turn off"); Log.Info(Globals.LogTag, "Successfully done"); @@ -258,7 +255,6 @@ namespace Tizen.Network.WiFi.Tests /** TEST CODE **/ var count = 0; await WiFiManager.ActivateAsync(); - await Task.Delay(5000); await WiFiManager.ScanAsync(); var listApp = WiFiManager.GetFoundAPs(); foreach (var item in listApp) @@ -299,11 +295,10 @@ namespace Tizen.Network.WiFi.Tests if (!WiFiManager.IsActive) { await WiFiManager.ActivateAsync(); - await Task.Delay(3000); } await WiFiManager.ScanSpecificAPAsync(networkParameter.wnPRIVATE); var listApp = WiFiManager.GetFoundSpecificAPs(); - await Task.Delay(3000); + await Task.Delay(1500); foreach (var item in listApp) count++; Assert.Greater(count, 0, "GetFoundSpecificAps is fail"); @@ -447,23 +442,22 @@ namespace Tizen.Network.WiFi.Tests try { WiFiManager.DeviceStateChanged += EventHandlerDevice; - await Task.Delay(3000); + await Task.Delay(1500); if (!WiFiManager.IsActive) { await WiFiManager.ActivateAsync(); - await Task.Delay(3000); - await networkSetup.ForgetCurrentAP(); - await WiFiManager.DeactivateAsync(); - await Task.Delay(3000); + await Task.Delay(1500); + await tearDown(); + await Task.Delay(1500); Assert.True(_flag, "Event DeviceStateChanged hasn't been call."); } else { await networkSetup.ForgetCurrentAP(); await WiFiManager.DeactivateAsync(); - await Task.Delay(3000); + await Task.Delay(1500); await WiFiManager.ActivateAsync(); - await Task.Delay(3000); + await Task.Delay(1500); Assert.True(_flag, "Event DeviceStateChanged hasn't been call."); } WiFiManager.DeviceStateChanged -= EventHandlerDevice; @@ -501,10 +495,11 @@ namespace Tizen.Network.WiFi.Tests * TEST CODE */ WiFiManager.RssiLevelChanged += EventHandlerRssi; + await Task.Delay(1500); if (WiFiManager.IsActive) { Log.Info(Globals.LogTag, "WiFi is activated"); - networkSetup.ForgetCurrentAP(); + await networkSetup.ForgetCurrentAP(); } await setUp(); Assert.True(_flag, "Event RssiLevelChanged hasn't been call."); @@ -544,7 +539,7 @@ namespace Tizen.Network.WiFi.Tests /** TEST CODE */ Assert.AreEqual((int)(WiFiConnectionState.Connected), (int)(WiFiManager.ConnectionState), "ConnectionState didn't return connected after connect to WiFiAp"); - networkSetup.ForgetCurrentAP(); + await networkSetup.ForgetCurrentAP(); Assert.AreEqual((int)(WiFiConnectionState.Disconnected), (int)(WiFiManager.ConnectionState), "ConnectionState didn't return disconnected after discnnect"); Log.Info(Globals.LogTag, "Successfully done"); @@ -815,7 +810,7 @@ namespace Tizen.Network.WiFi.Tests * PRECONDITION */ if (WiFiManager.IsActive) - networkSetup.ForgetCurrentAP(); + await networkSetup.ForgetCurrentAP(); Assert.IsFalse(_flag, "Flag should be fail before checking"); /* @@ -826,9 +821,9 @@ namespace Tizen.Network.WiFi.Tests _flag = true; }; WiFiManager.ConnectionStateChanged += connectionStateChanged; - await Task.Delay(3000); + await Task.Delay(1500); await setUp(); - await Task.Delay(3000); + await Task.Delay(1500); Assert.IsTrue(_flag, "Flag should be true after checking"); WiFiManager.ConnectionStateChanged -= connectionStateChanged; @@ -867,7 +862,7 @@ namespace Tizen.Network.WiFi.Tests }; WiFiManager.BackgroundScanFinished += backgroundScanFinished; - await Task.Delay(3000); + await Task.Delay(1500); await setUp(); WiFiAP ap = WiFiManager.GetConnectedAP(); ap.ForgetAP(); @@ -992,10 +987,11 @@ namespace Tizen.Network.WiFi.Tests if (!WiFiManager.IsActive) { await WiFiManager.ActivateAsync(); - await Task.Delay(3000); } WiFiManager.ScanStateChanged += EventHandlerScanState; + await Task.Delay(1500); await WiFiManager.ScanAsync(); + await Task.Delay(1500); WiFiManager.ScanStateChanged -= EventHandlerScanState; Assert.IsTrue(_flag, "ScanState is not changed."); Log.Info(Globals.LogTag, "Successfully done"); diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiNetwork.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiNetwork.cs index 68aa526c2..18e2d36f8 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiNetwork.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiNetwork.cs @@ -37,7 +37,6 @@ namespace Tizen.Network.WiFi.Tests public static async Task setUp() { await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); - await Task.Delay(3000); } [Test] @@ -827,7 +826,6 @@ namespace Tizen.Network.WiFi.Tests Log.Info(Globals.LogTag, "Successfully done"); await _wifiAP.ForgetAPAsync(); - await Task.Delay(3000); await setUp(); Log.Info(Globals.LogTag, "Finished"); } @@ -903,7 +901,6 @@ namespace Tizen.Network.WiFi.Tests Log.Info(Globals.LogTag, "Successfully done"); await _wifiAP.ForgetAPAsync(); - await Task.Delay(3000); await setUp(); Log.Info(Globals.LogTag, "Finished"); } diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiProfile.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiProfile.cs index 89a9cef26..b3e981eff 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiProfile.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiProfile.cs @@ -167,11 +167,6 @@ namespace Tizen.Network.Connection.Tests } } - public static async Task delay_test_rssid() - { - await Task.Delay(5000); - } - [Test] [Category("P1")] [Description("Test Rssi property")] diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiSecurity.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiSecurity.cs index c8041cce2..457d5bb25 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiSecurity.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiSecurity.cs @@ -44,7 +44,6 @@ namespace Tizen.Network.WiFi.Tests public static async Task setup() { await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); - await Task.Delay(5000); } [Test] @@ -194,6 +193,7 @@ namespace Tizen.Network.WiFi.Tests * - Creat an SecurityInformation. */ await setup(); + await Task.Delay(1500); Log.Info(Globals.LogTag, "WiFiConnectionState=" + WiFiConnectionState.Connected.ToString()); Log.Info(Globals.LogTag, "WiFiConnectionState=" + WiFiManager.ConnectionState.ToString()); diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/support/networkSetup.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/support/networkSetup.cs index e9ab5557b..a037eaaa3 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/support/networkSetup.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/support/networkSetup.cs @@ -39,7 +39,7 @@ namespace networkUtils if (!WiFiManager.IsActive) { await WiFiManager.ActivateAsync(); - await Task.Delay(3000); + await Task.Delay(1500); } Tizen.Log.Info(Globals.LogTag, "WiFi is Activated"); } -- 2.34.1