From: Cheoleun Moon Date: Mon, 21 Jan 2019 04:28:21 +0000 (+0900) Subject: [Network][Non-ACR][Specify parameter type of EventHandler] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F10%2F198110%2F3;p=test%2Ftct%2Fcsharp%2Fapi.git [Network][Non-ACR][Specify parameter type of EventHandler] Change-Id: Ia1a85a45e96a47cb1f951ebd9d5c637a37d6edb7 Signed-off-by: Cheoleun Moon --- diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionManager.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionManager.cs index 37dee4815..554db98d5 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionManager.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionManager.cs @@ -134,7 +134,7 @@ namespace Tizen.Network.Connection.Tests Log.Info(Globals.LogTag, "CellularState_CONNECTED_STATE ConnectionManager created"); if (isWiFiSupported && WiFiManager.IsActive) await tearDown(); - await Task.Delay(5000); + await Task.Delay(10000); Log.Info(Globals.LogTag, "CellularState_CONNECTED_STATE WiFi is disconnected"); /** @@ -746,7 +746,7 @@ namespace Tizen.Network.Connection.Tests } } - public void EventHandlerConnectionTypeChanged(object sender, EventArgs e) + public void EventHandlerConnectionTypeChanged(object sender, ConnectionTypeEventArgs e) { _flag = true; } @@ -803,9 +803,9 @@ namespace Tizen.Network.Connection.Tests } } - public void EventHandlerIpAddressChanged(object sender, EventArgs e) + public void EventHandlerIpAddressChanged(object sender, AddressEventArgs e) { - Log.Info(Globals.LogTag, "IPCHANGE=" + ((AddressEventArgs)e).IPv4Address); + Log.Info(Globals.LogTag, "IP is changed: " + e.IPv4Address); _flag = true; } @@ -858,9 +858,9 @@ namespace Tizen.Network.Connection.Tests } } - public void EventHandlerProxyAddressChanged(object sender, EventArgs e) + public void EventHandlerProxyAddressChanged(object sender, AddressEventArgs e) { - Log.Info(Globals.LogTag, "PROXYCHANGE=" + ((AddressEventArgs)e).IPv4Address); + Log.Info(Globals.LogTag, "Proxy is changed: " + e.IPv4Address); _flag = true; } diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfile.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfile.cs index 512eae152..2fdebc74a 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfile.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfile.cs @@ -560,10 +560,10 @@ namespace Tizen.Network.Connection.Tests } } - public void EventHandlerProfileStateChanged(object sender, EventArgs e) + public void EventHandlerProfileStateChanged(object sender, ProfileStateEventArgs e) { _flag = true; - Log.Info(Globals.LogTag, "ProfileState" + ((ProfileStateEventArgs)e).State); + Log.Info(Globals.LogTag, "ProfileState" + e.State); } [Test] diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfileStateEventArgs.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfileStateEventArgs.cs index beaa467ee..34377b284 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfileStateEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionProfileStateEventArgs.cs @@ -37,9 +37,10 @@ namespace Tizen.Network.Connection.Tests await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); } - public void EventHandlerProfileStateChanged(object sender, EventArgs e) + public void EventHandlerProfileStateChanged(object sender, ProfileStateEventArgs e) { - _flag = true; + if (e.State == ProfileState.Disconnected) + _flag = true; } [Test] @@ -75,7 +76,6 @@ namespace Tizen.Network.Connection.Tests Log.Info(Globals.LogTag, "Event subscripted"); await networkSetup.ForgetCurrentAP(); await Task.Delay(1500); - Log.Info(Globals.LogTag, "_flag=" + _flag); Assert.IsTrue(_flag, "Profile State don't change"); _connectionProfile.ProfileStateChanged -= EventHandlerProfileStateChanged; // POSTCONDITION diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionStateChangedEventArgs.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionStateChangedEventArgs.cs index 179ce3df3..a79bd71fb 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionStateChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionStateChangedEventArgs.cs @@ -38,15 +38,16 @@ namespace Tizen.Network.WiFi.Tests await networkSetup.ConnectWiFi(networkParameter.wnPRIVATE, networkParameter.wType.wPrivate, networkParameter.wPASS); } - private void EventHandlerConnectionStateChangedCBState(object sender, EventArgs e) + private void EventHandlerConnectionStateChangedCBState(object sender, ConnectionStateChangedEventArgs e) { - if (WiFiManager.ConnectionState.ToString() == ((ConnectionStateChangedEventArgs)e).State.ToString()) + if (e.State == WiFiManager.ConnectionState) _flag = true; } - private void EventHandlerConnectionStateChangedCBAp(object sender, EventArgs e) + private void EventHandlerConnectionStateChangedCBAp(object sender, ConnectionStateChangedEventArgs e) { - _flag = true; + if (e.AP.NetworkInformation.Essid == networkParameter.wnPRIVATE1) + _flag = true; } [Test] diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionTypeEventArgs.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionTypeEventArgs.cs index 20cf56989..f3da2f7eb 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionTypeEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSConnectionTypeEventArgs.cs @@ -63,6 +63,7 @@ namespace Tizen.Network.Connection.Tests * Connect to wifi AP * */ Log.Info(Globals.LogTag, "ConnectionType_GET start"); + await networkSetup.ForgetCurrentAP(); Assert.IsFalse(_flag, "Flag should be fail before check"); /** TEST CODE */ @@ -94,9 +95,10 @@ namespace Tizen.Network.Connection.Tests } } - public void ConnectionTypeChangedCB(object sender, EventArgs e) + public void ConnectionTypeChangedCB(object sender, ConnectionTypeEventArgs e) { - _flag = true; + if (e.ConnectionType == ConnectionType.WiFi || e.ConnectionType == ConnectionType.Disconnected) + _flag = true; } } } diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSDeviceStateChangedEventArgs.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSDeviceStateChangedEventArgs.cs index b246eefad..fec3bc6d4 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSDeviceStateChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSDeviceStateChangedEventArgs.cs @@ -43,9 +43,11 @@ namespace Tizen.Network.WiFi.Tests await networkSetup.DeactivateWiFi(); } - private void EventHandlerDeviceStateChangedCB(object sender, EventArgs e) + private void EventHandlerDeviceStateChangedCB(object sender, DeviceStateChangedEventArgs e) { - _flag = true; + Log.Info(Globals.LogTag, "Device state is changed: " + e.State); + if (e.State == WiFiDeviceState.Deactivated) + _flag = true; } [Test] diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSProfileStateEventArgs.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSProfileStateEventArgs.cs index 398f5ae1a..9a26c32af 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSProfileStateEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSProfileStateEventArgs.cs @@ -39,9 +39,10 @@ namespace Tizen.Network.Connection.Tests await Task.Delay(1500); } - private void EventHandlerProfileStateChangedCB(object sender, EventArgs e) + private void EventHandlerProfileStateChangedCB(object sender, ProfileStateEventArgs e) { - _flag = true; + if (e.State == ProfileState.Disconnected) + _flag = true; } [Test] @@ -81,8 +82,6 @@ namespace Tizen.Network.Connection.Tests 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 2ec494935..98fe4f833 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSRssiLevelChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSRssiLevelChangedEventArgs.cs @@ -39,9 +39,13 @@ namespace Tizen.Network.WiFi.Tests await Task.Delay(1500); } - private void EventHandlerRssiLevelChangedCB(object sender, EventArgs e) + private void EventHandlerRssiLevelChangedCB(object sender, RssiLevelChangedEventArgs e) { - _flag = true; + Log.Info(Globals.LogTag, "RSSI Level " + e.Level); + if (e.Level >= WiFiRssiLevel.Level0) + { + _flag = true; + } } [Test] diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiAP.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiAP.cs index 6cac3f842..7853b3f3c 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiAP.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiAP.cs @@ -641,7 +641,7 @@ namespace Tizen.Network.WiFi.Tests ipv4Setting.IP = IPAddress.Parse(ip); _wifiAP.Update(); - await Task.Delay(1500); + await Task.Delay(3000); Assert.AreEqual(ip.ToString(), ipv4Setting.IP.ToString(), "Ip of Ipv4Setting get should be same set"); Log.Info(Globals.LogTag, "Successfully done"); diff --git a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiManager.cs b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiManager.cs index 7623d210b..dd71d6d0a 100755 --- a/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiManager.cs +++ b/tct-suite-vs/Tizen.Network.Tests/testcase/TSWiFiManager.cs @@ -889,11 +889,6 @@ namespace Tizen.Network.WiFi.Tests } } - public void BackgroundScanFinished(object sender, EventArgs e) - { - _flag = true; - } - [Test] [Category("P1")] [Description("starts BSSID scan asynchronously")]