From: Edison Henrique Andreassy Date: Wed, 26 Aug 2020 21:57:05 +0000 (+0100) Subject: [VisualBasic] Fix tests for Android (#41378) X-Git-Tag: submit/tizen/20210909.063632~5751 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1f6b3c01566c72b882cae42d5452942eb0d0e69;p=platform%2Fupstream%2Fdotnet%2Fruntime.git [VisualBasic] Fix tests for Android (#41378) Remove some empty tests and add data for others. Resolves #37066 --- diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/CharTypeTests.cs b/src/libraries/Microsoft.VisualBasic.Core/tests/CharTypeTests.cs index 0585c8a..ef8d01d 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/tests/CharTypeTests.cs +++ b/src/libraries/Microsoft.VisualBasic.Core/tests/CharTypeTests.cs @@ -26,33 +26,12 @@ namespace Microsoft.VisualBasic.CompilerServices.Tests } [Theory] - [MemberData(nameof(FromObject_Overflow_TestData))] - public void FromObject_ThrowsOverflowException(object value) - { - Assert.Throws(() => CharType.FromObject(value)); - } - - [Theory] [MemberData(nameof(FromString_TestData))] public void FromString(string value, char expected) { Assert.Equal(expected, CharType.FromString(value)); } - [Theory] - [MemberData(nameof(FromString_Invalid_TestData))] - public void FromString_ThrowsInvalidCastException(string value) - { - Assert.Throws(() => CharType.FromString(value)); - } - - [Theory] - [MemberData(nameof(FromString_Overflow_TestData))] - public void FromString_ThrowsOverflowException(string value) - { - Assert.Throws(() => CharType.FromString(value)); - } - public static IEnumerable FromObject_TestData() { // char. @@ -159,11 +138,6 @@ namespace Microsoft.VisualBasic.CompilerServices.Tests yield return new object[] { new object() }; } - public static IEnumerable FromObject_Overflow_TestData() - { - yield break; - } - public static IEnumerable FromString_TestData() { yield return new object[] { null, char.MinValue }; @@ -186,15 +160,5 @@ namespace Microsoft.VisualBasic.CompilerServices.Tests yield return new object[] { "18446744073709551616", '1' }; yield return new object[] { "1844674407370955161618446744073709551616", '1' }; } - - public static IEnumerable FromString_Invalid_TestData() - { - yield break; - } - - public static IEnumerable FromString_Overflow_TestData() - { - yield break; - } } } diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/ConversionTests.cs b/src/libraries/Microsoft.VisualBasic.Core/tests/ConversionTests.cs index c948daf..c280054 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/tests/ConversionTests.cs +++ b/src/libraries/Microsoft.VisualBasic.Core/tests/ConversionTests.cs @@ -476,17 +476,23 @@ namespace Microsoft.VisualBasic.Tests public static IEnumerable Hex_Single_TestData() { - yield break; // Add more... + yield return new object[] { (float)0, "0" }; + yield return new object[] { (float)1, "1" }; + yield return new object[] { (float)15, "F" }; } public static IEnumerable Hex_Double_TestData() { - yield break; // Add more... + yield return new object[] { (double)0, "0" }; + yield return new object[] { (double)1, "1" }; + yield return new object[] { (double)15, "F" }; } public static IEnumerable Hex_Decimal_TestData() { - yield break; // Add more... + yield return new object[] { (decimal)0, "0" }; + yield return new object[] { (decimal)1, "1" }; + yield return new object[] { (decimal)15, "F" }; } [Theory] @@ -812,17 +818,23 @@ namespace Microsoft.VisualBasic.Tests public static IEnumerable Oct_Single_TestData() { - yield break; // Add more... + yield return new object[] { (float)0, "0" }; + yield return new object[] { (float)1, "1" }; + yield return new object[] { (float)15, "17" }; } public static IEnumerable Oct_Double_TestData() { - yield break; // Add more... + yield return new object[] { (double)0, "0" }; + yield return new object[] { (double)1, "1" }; + yield return new object[] { (double)15, "17" }; } public static IEnumerable Oct_Decimal_TestData() { - yield break; // Add more... + yield return new object[] { (decimal)0, "0" }; + yield return new object[] { (decimal)1, "1" }; + yield return new object[] { (decimal)15, "17" }; } [Theory] @@ -894,20 +906,6 @@ namespace Microsoft.VisualBasic.Tests } [Theory] - [MemberData(nameof(Val_Char_ArgumentException_TestData))] - public void Val_ArgumentException_Char(char value) - { - Assert.Throws(() => Conversion.Val(value)); - } - - [Theory] - [MemberData(nameof(Val_Char_OverflowException_TestData))] - public void Val_OverflowException_Char(char value) - { - Assert.Throws(() => Conversion.Val(value)); - } - - [Theory] [MemberData(nameof(Val_String_TestData))] public void Val_String_Double(string value, double expected) { @@ -915,13 +913,6 @@ namespace Microsoft.VisualBasic.Tests } [Theory] - [MemberData(nameof(Val_String_ArgumentException_TestData))] - public void Val_ArgumentException_String(string value) - { - Assert.Throws(() => Conversion.Val(value)); - } - - [Theory] [MemberData(nameof(Val_String_InvalidCastException_TestData))] public void Val_InvalidCastException(string value) { @@ -943,12 +934,12 @@ namespace Microsoft.VisualBasic.Tests public static IEnumerable Val_Object_ArgumentException_TestData() { - yield break; // Add more... + yield return new object[] { new object() }; } public static IEnumerable Val_Object_OverflowException_TestData() { - yield break; // Add more... + yield return new object[] { "123456e789" }; } public static IEnumerable Val_Char_TestData() @@ -968,16 +959,6 @@ namespace Microsoft.VisualBasic.Tests yield return new object[] { char.MaxValue, 0 }; } - public static IEnumerable Val_Char_ArgumentException_TestData() - { - yield break; // Add more... - } - - public static IEnumerable Val_Char_OverflowException_TestData() - { - yield break; // Add more... - } - public static IEnumerable Val_String_TestData() { yield return new object[] { null, 0.0 }; @@ -1019,11 +1000,6 @@ namespace Microsoft.VisualBasic.Tests yield return new object[] { "&O37777777777&", -1.0 }; } - public static IEnumerable Val_String_ArgumentException_TestData() - { - yield break; // Add more... - } - public static IEnumerable Val_String_InvalidCastException_TestData() { yield return new object[] { "1.0%" }; @@ -1032,7 +1008,7 @@ namespace Microsoft.VisualBasic.Tests public static IEnumerable Val_String_OverflowException_TestData() { - yield break; // Add more... + yield return new object[] { "123456e789" }; } public static IEnumerable Various_ArgumentException_TestData() diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/DateTypeTests.cs b/src/libraries/Microsoft.VisualBasic.Core/tests/DateTypeTests.cs index ebd9148..313f039 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/tests/DateTypeTests.cs +++ b/src/libraries/Microsoft.VisualBasic.Core/tests/DateTypeTests.cs @@ -34,13 +34,6 @@ namespace Microsoft.VisualBasic.CompilerServices.Tests } [Theory] - [MemberData(nameof(FromObject_Overflow_TestData))] - public void FromObject_ThrowsOverflowException(object value) - { - Assert.Throws(() => DateType.FromObject(value)); - } - - [Theory] [MemberData(nameof(FromString_TestData))] public void FromString(string value, DateTime expected) { @@ -63,13 +56,6 @@ namespace Microsoft.VisualBasic.CompilerServices.Tests Assert.Throws(() => DateType.FromString(value)); } - [Theory] - [MemberData(nameof(FromString_Overflow_TestData))] - public void FromString_ThrowsOverflowException(string value) - { - Assert.Throws(() => DateType.FromString(value)); - } - public static IEnumerable FromObject_TestData() { // null. @@ -172,12 +158,7 @@ namespace Microsoft.VisualBasic.CompilerServices.Tests public static IEnumerable FromObject_Invalid_TestData() { - yield break; - } - - public static IEnumerable FromObject_Overflow_TestData() - { - yield break; + yield return new object[] { new object() }; } public static IEnumerable FromString_TestData() @@ -208,10 +189,5 @@ namespace Microsoft.VisualBasic.CompilerServices.Tests yield return new object[] { "false" }; yield return new object[] { "invalid" }; } - - public static IEnumerable FromString_Overflow_TestData() - { - yield break; - } } } diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/LongTypeTests.cs b/src/libraries/Microsoft.VisualBasic.Core/tests/LongTypeTests.cs index 3e01bae..55453c7 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/tests/LongTypeTests.cs +++ b/src/libraries/Microsoft.VisualBasic.Core/tests/LongTypeTests.cs @@ -231,7 +231,7 @@ namespace Microsoft.VisualBasic.CompilerServices.Tests public static IEnumerable FromString_Overflow_TestData() { - yield break; + yield return new object[] { "12345678901234567890" }; } } } diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/SingleTypeTests.cs b/src/libraries/Microsoft.VisualBasic.Core/tests/SingleTypeTests.cs index cb43f2d..89ed4fe 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/tests/SingleTypeTests.cs +++ b/src/libraries/Microsoft.VisualBasic.Core/tests/SingleTypeTests.cs @@ -213,7 +213,7 @@ namespace Microsoft.VisualBasic.CompilerServices.Tests public static IEnumerable FromObject_Overflow_TestData() { - yield break; + yield return new object[] { "1234567890123456789012345678901234567890" }; } public static IEnumerable FromString_TestData()