From: Sanghoon Lee Date: Tue, 4 Sep 2018 08:11:11 +0000 (+0900) Subject: [Device][Non-ACR][Removed static keyword] X-Git-Tag: tct5.0_m2~81 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c19421568e824488f9c97791c86c98292ca7b74;p=test%2Ftct%2Fcsharp%2Fapi.git [Device][Non-ACR][Removed static keyword] Change-Id: I51d9ca6b3169366e6634c1e5793641f8cb60f86b --- diff --git a/tct-suite-vs/Tizen.Device.Tests/testcase/TSBattery.cs b/tct-suite-vs/Tizen.Device.Tests/testcase/TSBattery.cs index 0657f9544..75ec5a42c 100755 --- a/tct-suite-vs/Tizen.Device.Tests/testcase/TSBattery.cs +++ b/tct-suite-vs/Tizen.Device.Tests/testcase/TSBattery.cs @@ -9,9 +9,9 @@ namespace Tizen.System.Tests [Description("Tizen.System.Battery tests")] class BatteryTests { - private static int isSupport = 1; + private int isSupport = 1; [SetUp] - public static void Init() + public void Init() { bool ret_value; bool value; @@ -28,7 +28,7 @@ namespace Tizen.System.Tests LogUtils.Write(LogUtils.DEBUG, LogUtils.TAG, "isSupport:" + isSupport); } - private static int PassForNotSuppot() + private int PassForNotSuppot() { if (isSupport == 0) { @@ -41,7 +41,7 @@ namespace Tizen.System.Tests } [TearDown] - public static void Destroy() + public void Destroy() { } @@ -52,7 +52,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRE")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void Level_PROPERTY_GET_ENUM_ALL() + public void Level_PROPERTY_GET_ENUM_ALL() { //Not pssible to check for all other enum values as the exact definition for each enum value is not available. /* TEST CODE */ @@ -76,7 +76,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void Percent_PROPERTY_READ_ONLY() + public void Percent_PROPERTY_READ_ONLY() { if (PassForNotSuppot() == 1) return; /* TEST CODE */ diff --git a/tct-suite-vs/Tizen.Device.Tests/testcase/TSDisplay.cs b/tct-suite-vs/Tizen.Device.Tests/testcase/TSDisplay.cs index 778beca6a..4d182dd5c 100755 --- a/tct-suite-vs/Tizen.Device.Tests/testcase/TSDisplay.cs +++ b/tct-suite-vs/Tizen.Device.Tests/testcase/TSDisplay.cs @@ -9,9 +9,9 @@ namespace Tizen.System.Tests [Description("Tizen.System.Display tests")] class DisplayTests { - private static int isSupport = 1; + private int isSupport = 1; [SetUp] - public static void Init() + public void Init() { bool ret_value; string value = null; @@ -26,7 +26,7 @@ namespace Tizen.System.Tests } [TearDown] - public static void Destroy() + public void Destroy() { } @@ -37,7 +37,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void NumberOfDisplays_PROPERTY_READ_ONLY() + public void NumberOfDisplays_PROPERTY_READ_ONLY() { if (isSupport == 1) { @@ -57,7 +57,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void Displays_PROPERTY_READ_ONLY() + public void Displays_PROPERTY_READ_ONLY() { if (isSupport == 1) { @@ -76,7 +76,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void MaxBrightness_PROPERTY_READ_ONLY() + public void MaxBrightness_PROPERTY_READ_ONLY() { if (isSupport == 1) { @@ -100,7 +100,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRW")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void State_PROPERTY_READ_WRITE() + public void State_PROPERTY_READ_WRITE() { if (isSupport == 1) { @@ -122,7 +122,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRW")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void Brightness_READ_WRITE() + public void Brightness_READ_WRITE() { if (isSupport == 1) { @@ -146,7 +146,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PAM")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void Brightness_CHANGE_VALUE() + public void Brightness_CHANGE_VALUE() { if (isSupport == 1) { diff --git a/tct-suite-vs/Tizen.Device.Tests/testcase/TSIR.cs b/tct-suite-vs/Tizen.Device.Tests/testcase/TSIR.cs index b9cfee33f..252a3d352 100755 --- a/tct-suite-vs/Tizen.Device.Tests/testcase/TSIR.cs +++ b/tct-suite-vs/Tizen.Device.Tests/testcase/TSIR.cs @@ -9,12 +9,12 @@ namespace Tizen.System.Tests class IRTests { [SetUp] - public static void Init() + public void Init() { } [TearDown] - public static void Destroy() + public void Destroy() { } @@ -25,7 +25,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void IsAvailable_PROPERTY_READ_ONLY() + public void IsAvailable_PROPERTY_READ_ONLY() { /* TEST CODE */ var test = IR.IsAvailable; @@ -44,7 +44,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void Transmit_RETURN_CHECK() + public void Transmit_RETURN_CHECK() { /* TEST CODE */ bool value; diff --git a/tct-suite-vs/Tizen.Device.Tests/testcase/TSLed.cs b/tct-suite-vs/Tizen.Device.Tests/testcase/TSLed.cs index 68ea185ac..14954b2f9 100755 --- a/tct-suite-vs/Tizen.Device.Tests/testcase/TSLed.cs +++ b/tct-suite-vs/Tizen.Device.Tests/testcase/TSLed.cs @@ -11,12 +11,12 @@ namespace Tizen.System.Tests class LedTests { [SetUp] - public static void Init() + public void Init() { } [TearDown] - public static void Destroy() + public void Destroy() { } @@ -27,7 +27,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void MaxBrightness_PROPERTY_READ_ONLY() + public void MaxBrightness_PROPERTY_READ_ONLY() { /* TEST CODE */ bool value; @@ -38,7 +38,7 @@ namespace Tizen.System.Tests var test = Led.MaxBrightness; Assert.IsInstanceOf(test, "return type of MaxBrightness should be valid"); } - else + else { Assert.IsTrue(Led.MaxBrightness == 0, "Max brightness should be 0"); } @@ -51,7 +51,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRW")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void Brightness_PROPERTY_READ_WRITE() + public void Brightness_PROPERTY_READ_WRITE() { /* TEST CODE */ bool value; @@ -80,7 +80,7 @@ namespace Tizen.System.Tests } } - private static void Led_BrightnessChanged(object sender, LedBrightnessChangedEventArgs e) + private void Led_BrightnessChanged(object sender, LedBrightnessChangedEventArgs e) { Assert.IsTrue(e.Brightness == 30, "get/set brightness of Display should be same"); } @@ -92,7 +92,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void BrightnessChanged_EVENT_CHECK() + public void BrightnessChanged_EVENT_CHECK() { /* TEST CODE */ bool value; @@ -130,7 +130,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MCST")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void Play_STATUS_CHANGED() + public void Play_STATUS_CHANGED() { /* TEST CODE */ bool value; @@ -162,7 +162,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MCST")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void Stop_STATUS_CHANGED() + public void Stop_STATUS_CHANGED() { /* TEST CODE */ bool value; diff --git a/tct-suite-vs/Tizen.Device.Tests/testcase/TSPower.cs b/tct-suite-vs/Tizen.Device.Tests/testcase/TSPower.cs old mode 100644 new mode 100755 index 69c5f2215..5d1da8d40 --- a/tct-suite-vs/Tizen.Device.Tests/testcase/TSPower.cs +++ b/tct-suite-vs/Tizen.Device.Tests/testcase/TSPower.cs @@ -9,12 +9,12 @@ namespace Tizen.System.Tests class PowerTests { [SetUp] - public static void Init() + public void Init() { } [TearDown] - public static void Destroy() + public void Destroy() { } @@ -25,7 +25,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MCST")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void RequestCpuLock_CHECK_RESULT() + public void RequestCpuLock_CHECK_RESULT() { /* TEST CODE */ try @@ -45,7 +45,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MCST")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void ReleaseCpuLock_CHECK_RESULT() + public void ReleaseCpuLock_CHECK_RESULT() { /* TEST CODE */ try @@ -65,7 +65,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MCST")] [Property("AUTHOR", "Pureum Jung, pr.jung@samsung.com")] - public static void RequestLock_CHECK_RESULT() + public void RequestLock_CHECK_RESULT() { /* TEST CODE */ try @@ -88,7 +88,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Pureum Jung, pr.jung@samsung.com")] - public static void RequestLock_ARGUMENT_EXCEPTION() + public void RequestLock_ARGUMENT_EXCEPTION() { /* TEST CODE */ try @@ -108,7 +108,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MCST")] [Property("AUTHOR", "Pureum Jung, pr.jung@samsung.com")] - public static void ReleaseLock_CHECK_RESULT() + public void ReleaseLock_CHECK_RESULT() { /* TEST CODE */ try @@ -131,7 +131,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Pureum Jung, pr.jung@samsung.com")] - public static void ReleaseLock_ARGUMENT_EXCEPTION() + public void ReleaseLock_ARGUMENT_EXCEPTION() { /* TEST CODE */ try diff --git a/tct-suite-vs/Tizen.Device.Tests/testcase/TSVibrator.cs b/tct-suite-vs/Tizen.Device.Tests/testcase/TSVibrator.cs index 78750b103..d6a185712 100755 --- a/tct-suite-vs/Tizen.Device.Tests/testcase/TSVibrator.cs +++ b/tct-suite-vs/Tizen.Device.Tests/testcase/TSVibrator.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Threading; using System.Threading.Tasks; using NUnit.Framework; using Tizen.System; @@ -10,9 +11,9 @@ namespace Tizen.System.Tests [Description("Tizen.System.Vibrator tests")] class VibratorTests { - private static bool support; + private bool support; [SetUp] - public static void Init() + public void Init() { bool ret; bool value; @@ -25,7 +26,7 @@ namespace Tizen.System.Tests } [TearDown] - public static void Destroy() + public void Destroy() { } @@ -36,7 +37,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void NumberOfVibrators_PROPERTY_READ_ONLY() + public void NumberOfVibrators_PROPERTY_READ_ONLY() { if (!support) return; @@ -53,7 +54,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static void Vibrators_PROPERTY_READ_ONLY() + public void Vibrators_PROPERTY_READ_ONLY() { if (!support) return; @@ -76,7 +77,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static async Task Vibrate_STATUS_CHANGE() + public void Vibrate_STATUS_CHANGE() { if (!support) return; @@ -87,7 +88,7 @@ namespace Tizen.System.Tests try { vib.Vibrate(1000, 50); - await Task.Delay(1500); + Thread.Sleep(1500); } catch (Exception e) { @@ -102,7 +103,7 @@ namespace Tizen.System.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Praveen Kumar Gattu, gattu.p@samsung.com")] - public static async Task Stop_VIBRATE_STOP() + public void Stop_VIBRATE_STOP() { if (!support) return; @@ -113,7 +114,7 @@ namespace Tizen.System.Tests try { vib.Vibrate(3000, 50); - await Task.Delay(500); + Thread.Sleep(500); vib.Stop(); } catch (Exception e)