From 6f1272161607cc77696549714633d64bf47759e1 Mon Sep 17 00:00:00 2001 From: madmir <1119735+madmir@users.noreply.github.com> Date: Tue, 20 Aug 2019 02:59:07 +0200 Subject: [PATCH] Re-enable xunit warning 1019 (dotnet/corefx#40415) Make MemberData reference IEnumerable Commit migrated from https://github.com/dotnet/corefx/commit/3c09762fa14249c65e5bc676a5d812c2654c8941 --- .../tests/BitArray/BitArray_GetSetTests.cs | 2 +- .../BitArray/BitArray_OperatorsTests.netcoreapp.cs | 4 +-- .../DataAnnotations/MaxLengthAttributeTests.cs | 2 +- .../Serialization/MemberRelationshipTests.cs | 2 +- .../tests/CompareInfo/CompareInfoTests.cs | 2 +- .../tests/BinaryOperators/Assignment/Assign.cs | 4 +-- .../Coalesce/BinaryCoalesceTests.cs | 2 +- .../tests/DelegateType/DelegateCreationTests.cs | 16 +++++----- .../tests/Dynamic/InvokeMemberBindingTests.cs | 2 +- .../tests/Combinatorial/SourcesAndOperators.cs | 36 +++++++++++----------- src/libraries/System.Linq/tests/ContainsTests.cs | 6 ++-- .../HttpClient.SelectedSitesTest.cs | 2 +- .../tests/FunctionalTests/HttpProtocolTests.cs | 2 +- .../tests/PortableExecutable/PEBuilderTests.cs | 2 +- .../GetTypedObjectForIUnknownTests.Windows.cs | 2 +- .../System.Runtime.Numerics/tests/ComplexTests.cs | 2 +- .../tests/Oid.cs | 8 ++--- .../tests/CertTests.cs | 2 +- 18 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/libraries/System.Collections/tests/BitArray/BitArray_GetSetTests.cs b/src/libraries/System.Collections/tests/BitArray/BitArray_GetSetTests.cs index 6245f15..40120d9 100644 --- a/src/libraries/System.Collections/tests/BitArray/BitArray_GetSetTests.cs +++ b/src/libraries/System.Collections/tests/BitArray/BitArray_GetSetTests.cs @@ -359,7 +359,7 @@ namespace System.Collections.Tests Assert.NotSame(bitArray.SyncRoot, ((ICollection)new BitArray(10)).SyncRoot); } - public static IEnumerable CopyTo_Hidden_Data() + public static IEnumerable CopyTo_Hidden_Data() { yield return new object[] { "ZeroLength", new BitArray(0) }; yield return new object[] { "Constructor", new BitArray(BitsPerInt32 / 2 - 3, true) }; diff --git a/src/libraries/System.Collections/tests/BitArray/BitArray_OperatorsTests.netcoreapp.cs b/src/libraries/System.Collections/tests/BitArray/BitArray_OperatorsTests.netcoreapp.cs index 65e6611..e402174 100644 --- a/src/libraries/System.Collections/tests/BitArray/BitArray_OperatorsTests.netcoreapp.cs +++ b/src/libraries/System.Collections/tests/BitArray/BitArray_OperatorsTests.netcoreapp.cs @@ -12,7 +12,7 @@ namespace System.Collections.Tests { #region Shift Tests - public static IEnumerable Shift_Data() + public static IEnumerable Shift_Data() { foreach (int size in new[] { 0, 1, BitsPerInt32 / 2, BitsPerInt32, BitsPerInt32 + 1, 2 * BitsPerInt32, 2 * BitsPerInt32 + 1 }) { @@ -98,7 +98,7 @@ namespace System.Collections.Tests Assert.Throws(() => enumerator.MoveNext()); } - public static IEnumerable RightShift_Hidden_Data() + public static IEnumerable RightShift_Hidden_Data() { yield return new object[] { "Constructor", Unset_Visible_Bits(new BitArray(BitsPerInt32 / 2, true)) }; yield return new object[] { "Not", Unset_Visible_Bits(new BitArray(BitsPerInt32 / 2, false).Not()) }; diff --git a/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/MaxLengthAttributeTests.cs b/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/MaxLengthAttributeTests.cs index ecd3393..9974f7e 100644 --- a/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/MaxLengthAttributeTests.cs +++ b/src/libraries/System.ComponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/MaxLengthAttributeTests.cs @@ -58,7 +58,7 @@ namespace System.ComponentModel.DataAnnotations.Tests yield return new TestCase(new MaxLengthAttribute(12), new int[4, 4]); } - public static IEnumerable InvalidValues_ICollection() + public static IEnumerable InvalidValues_ICollection() { yield return new object[] { new MaxLengthAttribute(12), new Collection(new byte[13]) }; yield return new object[] { new MaxLengthAttribute(12), new List(new byte[13]) }; diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/Design/Serialization/MemberRelationshipTests.cs b/src/libraries/System.ComponentModel.TypeConverter/tests/Design/Serialization/MemberRelationshipTests.cs index 2259ca6..d041242 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/tests/Design/Serialization/MemberRelationshipTests.cs +++ b/src/libraries/System.ComponentModel.TypeConverter/tests/Design/Serialization/MemberRelationshipTests.cs @@ -52,7 +52,7 @@ namespace System.ComponentModel.Design.Serialization.Tests Assert.True(memberRelationship.IsEmpty); } - public static IEnumerable Equals_TestData() + public static IEnumerable Equals_TestData() { var owner1 = new object(); var owner2 = new object(); diff --git a/src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.cs b/src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.cs index d6c9fb5..6e6f67e 100644 --- a/src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.cs +++ b/src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.cs @@ -49,7 +49,7 @@ namespace System.Globalization.Tests } } - public static object[] GetHashCodeTestData => new[] + public static IEnumerable GetHashCodeTestData => new[] { new object[] { "abc", CompareOptions.OrdinalIgnoreCase, "ABC", CompareOptions.OrdinalIgnoreCase, true }, new object[] { "abc", CompareOptions.Ordinal, "ABC", CompareOptions.Ordinal, false }, diff --git a/src/libraries/System.Linq.Expressions/tests/BinaryOperators/Assignment/Assign.cs b/src/libraries/System.Linq.Expressions/tests/BinaryOperators/Assignment/Assign.cs index 4ecdad4..eda17d5 100644 --- a/src/libraries/System.Linq.Expressions/tests/BinaryOperators/Assignment/Assign.cs +++ b/src/libraries/System.Linq.Expressions/tests/BinaryOperators/Assignment/Assign.cs @@ -111,7 +111,7 @@ namespace System.Linq.Expressions.Tests yield return new object[] { Expression.Property(Expression.Constant(new ReadOnlyIndexer()), "Item", new Expression[] { Expression.Constant(1) }) }; } - public static IEnumerable WriteOnlyExpressions() + public static IEnumerable WriteOnlyExpressions() { Expression obj = Expression.Constant(new PropertyAndFields()); yield return new object[] { Expression.Property(obj, typeof(PropertyAndFields), nameof(PropertyAndFields.WriteOnlyInt32)) }; @@ -121,7 +121,7 @@ namespace System.Linq.Expressions.Tests yield return new object[] { Expression.Property(Expression.Constant(new WriteOnlyIndexer()), "Item", new Expression[] { Expression.Constant(1) }) }; } - public static IEnumerable MemberAssignments() + public static IEnumerable MemberAssignments() { Expression obj = Expression.Constant(new PropertyAndFields()); yield return new object[] { Expression.Field(null, typeof(PropertyAndFields), nameof(PropertyAndFields.StaticInt32Field)), 1 }; diff --git a/src/libraries/System.Linq.Expressions/tests/BinaryOperators/Coalesce/BinaryCoalesceTests.cs b/src/libraries/System.Linq.Expressions/tests/BinaryOperators/Coalesce/BinaryCoalesceTests.cs index 20090fb..37fb012 100644 --- a/src/libraries/System.Linq.Expressions/tests/BinaryOperators/Coalesce/BinaryCoalesceTests.cs +++ b/src/libraries/System.Linq.Expressions/tests/BinaryOperators/Coalesce/BinaryCoalesceTests.cs @@ -67,7 +67,7 @@ namespace System.Linq.Expressions.Tests } } - public static IEnumerable ImplicitNumericConversionData() + public static IEnumerable ImplicitNumericConversionData() { foreach (bool useInterpreter in new bool[] { true, false }) { diff --git a/src/libraries/System.Linq.Expressions/tests/DelegateType/DelegateCreationTests.cs b/src/libraries/System.Linq.Expressions/tests/DelegateType/DelegateCreationTests.cs index 0aa4e3a..c346499 100644 --- a/src/libraries/System.Linq.Expressions/tests/DelegateType/DelegateCreationTests.cs +++ b/src/libraries/System.Linq.Expressions/tests/DelegateType/DelegateCreationTests.cs @@ -30,48 +30,48 @@ namespace System.Linq.Expressions.Tests } } - public static IEnumerable ExcessiveLengthTypeArgs() + public static IEnumerable ExcessiveLengthTypeArgs() { yield return new object[] { Enumerable.Repeat(typeof(int), 18).ToArray() }; } - public static IEnumerable ExcessiveLengthOpenGenericTypeArgs() + public static IEnumerable ExcessiveLengthOpenGenericTypeArgs() { yield return new object[] { Enumerable.Repeat(typeof(List), 18).ToArray() }; } - public static IEnumerable EmptyTypeArgs() + public static IEnumerable EmptyTypeArgs() { yield return new object[] { Array.Empty() }; } - public static IEnumerable ByRefTypeArgs() + public static IEnumerable ByRefTypeArgs() { yield return new object[] { new[] { typeof(int), typeof(int).MakeByRefType(), typeof(string) } }; yield return new object[] { new[] { typeof(int).MakeByRefType() } }; yield return new object[] { Enumerable.Repeat(typeof(double).MakeByRefType(), 20).ToArray() }; } - public static IEnumerable ByRefLikeTypeArgs() + public static IEnumerable ByRefLikeTypeArgs() { yield return new object[] { new[] { typeof(Span) } }; } - public static IEnumerable PointerTypeArgs() + public static IEnumerable PointerTypeArgs() { yield return new object[] { new[] { typeof(int).MakePointerType() } }; yield return new object[] { new[] { typeof(string), typeof(double).MakePointerType(), typeof(int) } }; yield return new object[] { Enumerable.Repeat(typeof(int).MakePointerType(), 20).ToArray() }; } - public static IEnumerable ManagedPointerTypeArgs() + public static IEnumerable ManagedPointerTypeArgs() { yield return new object[] { new[] { typeof(string).MakePointerType() } }; yield return new object[] { new[] { typeof(int), typeof(string).MakePointerType(), typeof(double) } }; yield return new object[] { Enumerable.Repeat(typeof(string).MakePointerType(), 20).ToArray() }; } - public static IEnumerable VoidTypeArgs(bool includeSingleVoid) + public static IEnumerable VoidTypeArgs(bool includeSingleVoid) { if (includeSingleVoid) { diff --git a/src/libraries/System.Linq.Expressions/tests/Dynamic/InvokeMemberBindingTests.cs b/src/libraries/System.Linq.Expressions/tests/Dynamic/InvokeMemberBindingTests.cs index 840a7da..a1859a5 100644 --- a/src/libraries/System.Linq.Expressions/tests/Dynamic/InvokeMemberBindingTests.cs +++ b/src/libraries/System.Linq.Expressions/tests/Dynamic/InvokeMemberBindingTests.cs @@ -363,7 +363,7 @@ namespace System.Dynamic.Tests Assert.Equal(11, d.GetValue2(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10)); } - public static IEnumerable SameNameObjectPairs() + public static IEnumerable SameNameObjectPairs() { object[] testObjects = Enumerable.Range(0, 4) .Select( diff --git a/src/libraries/System.Linq.Parallel/tests/Combinatorial/SourcesAndOperators.cs b/src/libraries/System.Linq.Parallel/tests/Combinatorial/SourcesAndOperators.cs index 1478dab..6e531d6 100644 --- a/src/libraries/System.Linq.Parallel/tests/Combinatorial/SourcesAndOperators.cs +++ b/src/libraries/System.Linq.Parallel/tests/Combinatorial/SourcesAndOperators.cs @@ -244,34 +244,34 @@ namespace System.Linq.Parallel.Tests yield return new object[] { Labeled.Label, Action, ParallelQuery>>("Where-Index", (source, cancel) => source.Where((x, index) => { cancel(); return true; })) }; } - public static IEnumerable> BinaryOperations(Labeled otherSource) + public static IEnumerable BinaryOperations(Labeled otherSource) { string label = otherSource.ToString(); Operation other = otherSource.Item; - yield return Label("Concat-Right:" + label, (start, count, source) => source(start, count / 2).Concat(other(start + count / 2, count / 2 + count % 2))); - yield return Label("Concat-Left:" + label, (start, count, source) => other(start, count / 2).Concat(source(start + count / 2, count / 2 + count % 2))); + yield return new object[] { Label("Concat-Right:" + label, (start, count, source) => source(start, count / 2).Concat(other(start + count / 2, count / 2 + count % 2))) }; + yield return new object[] { Label("Concat-Left:" + label, (start, count, source) => other(start, count / 2).Concat(source(start + count / 2, count / 2 + count % 2))) }; // Comparator needs to cover _source_ size, as which of two "equal" items is returned is undefined for unordered collections. - yield return Label("Except-Right:" + label, (start, count, source) => source(start, count + count / 2).Except(other(start + count, count), new ModularCongruenceComparer(count * 2))); - yield return Label("Except-Left:" + label, (start, count, source) => other(start, count + count / 2).Except(source(start + count, count), new ModularCongruenceComparer(count * 2))); + yield return new object[] { Label("Except-Right:" + label, (start, count, source) => source(start, count + count / 2).Except(other(start + count, count), new ModularCongruenceComparer(count * 2))) }; + yield return new object[] { Label("Except-Left:" + label, (start, count, source) => other(start, count + count / 2).Except(source(start + count, count), new ModularCongruenceComparer(count * 2))) }; - yield return Label("GroupJoin-Right:" + label, (start, count, source) => source(start, count).GroupJoin(other(start, count * CountFactor), x => x, y => y % count, (x, g) => g.Min(), new ModularCongruenceComparer(count))); - yield return Label("GroupJoin-Left:" + label, (start, count, source) => other(start, count).GroupJoin(source(start, count * CountFactor), x => x, y => y % count, (x, g) => g.Min(), new ModularCongruenceComparer(count))); + yield return new object[] { Label("GroupJoin-Right:" + label, (start, count, source) => source(start, count).GroupJoin(other(start, count * CountFactor), x => x, y => y % count, (x, g) => g.Min(), new ModularCongruenceComparer(count))) }; + yield return new object[] { Label("GroupJoin-Left:" + label, (start, count, source) => other(start, count).GroupJoin(source(start, count * CountFactor), x => x, y => y % count, (x, g) => g.Min(), new ModularCongruenceComparer(count))) }; // Comparator needs to cover _source_ size, as which of two "equal" items is returned is undefined. - yield return Label("Intersect-Right:" + label, (start, count, source) => source(start, count + count / 2).Intersect(other(start - count / 2, count + count / 2), new ModularCongruenceComparer(count * 2))); - yield return Label("Intersect-Left:" + label, (start, count, source) => other(start, count + count / 2).Intersect(source(start - count / 2, count + count / 2), new ModularCongruenceComparer(count * 2))); + yield return new object[] { Label("Intersect-Right:" + label, (start, count, source) => source(start, count + count / 2).Intersect(other(start - count / 2, count + count / 2), new ModularCongruenceComparer(count * 2))) }; + yield return new object[] { Label("Intersect-Left:" + label, (start, count, source) => other(start, count + count / 2).Intersect(source(start - count / 2, count + count / 2), new ModularCongruenceComparer(count * 2))) }; - yield return Label("Join-Right:" + label, (start, count, source) => source(0, count).Join(other(start, count), x => x, y => y - start, (x, y) => x + start, new ModularCongruenceComparer(count))); - yield return Label("Join-Left:" + label, (start, count, source) => other(0, count).Join(source(start, count), x => x, y => y - start, (x, y) => x + start, new ModularCongruenceComparer(count))); + yield return new object[] { Label("Join-Right:" + label, (start, count, source) => source(0, count).Join(other(start, count), x => x, y => y - start, (x, y) => x + start, new ModularCongruenceComparer(count))) }; + yield return new object[] { Label("Join-Left:" + label, (start, count, source) => other(0, count).Join(source(start, count), x => x, y => y - start, (x, y) => x + start, new ModularCongruenceComparer(count))) }; - yield return Label("Union-Right:" + label, (start, count, source) => source(start, count * 3 / 4).Union(other(start + count / 2, count / 2 + count % 2), new ModularCongruenceComparer(count))); - yield return Label("Union-Left:" + label, (start, count, source) => other(start, count * 3 / 4).Union(source(start + count / 2, count / 2 + count % 2), new ModularCongruenceComparer(count))); + yield return new object[] { Label("Union-Right:" + label, (start, count, source) => source(start, count * 3 / 4).Union(other(start + count / 2, count / 2 + count % 2), new ModularCongruenceComparer(count))) }; + yield return new object[] { Label("Union-Left:" + label, (start, count, source) => other(start, count * 3 / 4).Union(source(start + count / 2, count / 2 + count % 2), new ModularCongruenceComparer(count))) }; // When both sources are unordered any element can be matched to any other, so a different check is required. - yield return Label("Zip-Unordered-Right:" + label, (start, count, source) => source(0, count).Zip(other(start * 2, count), (x, y) => x + start)); - yield return Label("Zip-Unordered-Left:" + label, (start, count, source) => other(start * 2, count).Zip(source(0, count), (x, y) => y + start)); + yield return new object[] { Label("Zip-Unordered-Right:" + label, (start, count, source) => source(0, count).Zip(other(start * 2, count), (x, y) => x + start)) }; + yield return new object[] { Label("Zip-Unordered-Left:" + label, (start, count, source) => other(start * 2, count).Zip(source(0, count), (x, y) => y + start)) }; } public static IEnumerable BinaryOperations() @@ -284,7 +284,7 @@ namespace System.Linq.Parallel.Tests foreach (Labeled source in UnorderedRangeSources()) { // Operations having multiple paths to check. - foreach (Labeled operation in BinaryOperations(LabeledDefaultSource)) + foreach (Labeled operation in BinaryOperations(LabeledDefaultSource).Select(i => i[0])) { yield return new object[] { source, operation }; } @@ -298,7 +298,7 @@ namespace System.Linq.Parallel.Tests // Each binary can work differently, depending on which of the two source queries (or both) is ordered. // For most, only the ordering of the first query is important - foreach (Labeled operation in BinaryOperations(LabeledDefaultSource).Where(op => !(op.ToString().StartsWith("Union") || op.ToString().StartsWith("Zip") || op.ToString().StartsWith("Concat")) && op.ToString().Contains("Right"))) + foreach (Labeled operation in BinaryOperations(LabeledDefaultSource).Select(i => i[0]).Where(op => !(op.ToString().StartsWith("Union") || op.ToString().StartsWith("Zip") || op.ToString().StartsWith("Concat")) && op.ToString().Contains("Right"))) { yield return new object[] { source, operation }; } @@ -333,7 +333,7 @@ namespace System.Linq.Parallel.Tests { Labeled failing = Label("Failing", (start, count, s) => s(start, count).Select(x => { throw new DeliberateTestException(); })); - foreach (Labeled operation in BinaryOperations(LabeledDefaultSource)) + foreach (Labeled operation in BinaryOperations(LabeledDefaultSource).Select(i => i[0])) { yield return new object[] { LabeledDefaultSource.Append(failing), operation }; yield return new object[] { Failing, operation }; diff --git a/src/libraries/System.Linq/tests/ContainsTests.cs b/src/libraries/System.Linq/tests/ContainsTests.cs index 30552ce..52c315d 100644 --- a/src/libraries/System.Linq/tests/ContainsTests.cs +++ b/src/libraries/System.Linq/tests/ContainsTests.cs @@ -29,7 +29,7 @@ namespace System.Linq.Tests Assert.Equal(q.Contains("X"), q.Contains("X")); } - public static IEnumerable Int_TestData() + public static IEnumerable Int_TestData() { yield return new object[] { new int[0], 6, false }; yield return new object[] { new int[] { 8, 10, 3, 0, -8 }, 6, false }; @@ -59,7 +59,7 @@ namespace System.Linq.Tests Assert.Equal(expected, source.RunOnce().Contains(value, null)); } - public static IEnumerable String_TestData() + public static IEnumerable String_TestData() { yield return new object[] { new string[] { null }, StringComparer.Ordinal, null, true }; yield return new object[] { new string[] { "Bob", "Robert", "Tim" }, null, "trboeR", false }; @@ -89,7 +89,7 @@ namespace System.Linq.Tests Assert.Equal(expected, source.RunOnce().Contains(value, comparer)); } - public static IEnumerable NullableInt_TestData() + public static IEnumerable NullableInt_TestData() { yield return new object[] { new int?[] { 8, 0, 10, 3, 0, -8, 0 }, null, false }; yield return new object[] { new int?[] { 8, 0, 10, null, 3, 0, -8, 0 }, null, true }; diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClient.SelectedSitesTest.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClient.SelectedSitesTest.cs index 4d6732c..cfa7754 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClient.SelectedSitesTest.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClient.SelectedSitesTest.cs @@ -59,7 +59,7 @@ namespace System.Net.Http.Functional.Tests await VisitSite(site); } - public static IEnumerable GetSelectedSites() + public static IEnumerable GetSelectedSites() { const string resourceName = "SelectedSitesTest.txt"; Assembly assembly = typeof(HttpClient_SelectedSites_Test).Assembly; diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpProtocolTests.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpProtocolTests.cs index c54a043..30d84ce 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpProtocolTests.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpProtocolTests.cs @@ -528,7 +528,7 @@ namespace System.Net.Http.Functional.Tests }, new LoopbackServer.Options { StreamWrapper = GetStream }); } - public static IEnumerable GetAsync_Chunked_VaryingSizeChunks_ReceivedCorrectly_MemberData() + public static IEnumerable GetAsync_Chunked_VaryingSizeChunks_ReceivedCorrectly_MemberData() { foreach (int maxChunkSize in new[] { 1, 10_000 }) foreach (string lineEnding in new[] { "\n", "\r\n" }) diff --git a/src/libraries/System.Reflection.Metadata/tests/PortableExecutable/PEBuilderTests.cs b/src/libraries/System.Reflection.Metadata/tests/PortableExecutable/PEBuilderTests.cs index 006afe2..8e8e445 100644 --- a/src/libraries/System.Reflection.Metadata/tests/PortableExecutable/PEBuilderTests.cs +++ b/src/libraries/System.Reflection.Metadata/tests/PortableExecutable/PEBuilderTests.cs @@ -95,7 +95,7 @@ namespace System.Reflection.PortableExecutable.Tests peBlob.WriteContentTo(peStream); } - public static IEnumerable AllMachineTypes() + public static IEnumerable AllMachineTypes() { return ((Machine[])Enum.GetValues(typeof(Machine))).Select(m => new object[]{(object)m}); } diff --git a/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/Marshal/GetTypedObjectForIUnknownTests.Windows.cs b/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/Marshal/GetTypedObjectForIUnknownTests.Windows.cs index ffa79e9..d20880b 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/Marshal/GetTypedObjectForIUnknownTests.Windows.cs +++ b/src/libraries/System.Runtime.InteropServices/tests/System/Runtime/InteropServices/Marshal/GetTypedObjectForIUnknownTests.Windows.cs @@ -10,7 +10,7 @@ namespace System.Runtime.InteropServices.Tests { public partial class GetTypedObjectForIUnknownTests { - public static IEnumerable GetTypedObjectForIUnknown_ComObject_TestData() + public static IEnumerable GetTypedObjectForIUnknown_ComObject_TestData() { yield return new object[] { new ComImportObject(), typeof(ComImportObject) }; yield return new object[] { new ComImportObject(), typeof(ComImportObject).BaseType }; diff --git a/src/libraries/System.Runtime.Numerics/tests/ComplexTests.cs b/src/libraries/System.Runtime.Numerics/tests/ComplexTests.cs index 1727f02..2903b37 100644 --- a/src/libraries/System.Runtime.Numerics/tests/ComplexTests.cs +++ b/src/libraries/System.Runtime.Numerics/tests/ComplexTests.cs @@ -1540,7 +1540,7 @@ namespace System.Numerics.Tests yield return new object[] { 0, double.MinValue, 9.48075190810917E+153, -9.48075190810917E+153 }; } - public static IEnumerable Sqrt_AdvancedTestData () + public static IEnumerable Sqrt_AdvancedTestData () { yield return new object[] { -1, 0, 0, 1 }; // .NET Framework does not properly handle this simple case. yield return new object[] { -double.MaxValue, 0.0, 0.0, Math.Sqrt(double.MaxValue) }; diff --git a/src/libraries/System.Security.Cryptography.Encoding/tests/Oid.cs b/src/libraries/System.Security.Cryptography.Encoding/tests/Oid.cs index d800942..3f908a2 100644 --- a/src/libraries/System.Security.Cryptography.Encoding/tests/Oid.cs +++ b/src/libraries/System.Security.Cryptography.Encoding/tests/Oid.cs @@ -326,18 +326,18 @@ namespace System.Security.Cryptography.Encoding.Tests Assert.Equal(ObsoleteSmime3desWrap_Name, oid.FriendlyName); } - public static IEnumerable ValidOidFriendlyNamePairs + public static IEnumerable ValidOidFriendlyNamePairs { get { - List data = new List(ValidOidFriendlyNameHashAlgorithmPairs); + List data = new List(ValidOidFriendlyNameHashAlgorithmPairs); data.AddRange(ValidOidFriendlyNameEncryptionAlgorithmPairs); return data; } } - public static IEnumerable ValidOidFriendlyNameHashAlgorithmPairs + public static IEnumerable ValidOidFriendlyNameHashAlgorithmPairs { get { @@ -352,7 +352,7 @@ namespace System.Security.Cryptography.Encoding.Tests } } - public static IEnumerable ValidOidFriendlyNameEncryptionAlgorithmPairs + public static IEnumerable ValidOidFriendlyNameEncryptionAlgorithmPairs { get { diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/tests/CertTests.cs b/src/libraries/System.Security.Cryptography.X509Certificates/tests/CertTests.cs index 4962341..20cfe52 100644 --- a/src/libraries/System.Security.Cryptography.X509Certificates/tests/CertTests.cs +++ b/src/libraries/System.Security.Cryptography.X509Certificates/tests/CertTests.cs @@ -387,6 +387,6 @@ namespace System.Security.Cryptography.X509Certificates.Tests } } - public static IEnumerable StorageFlags => CollectionImportTests.StorageFlags; + public static IEnumerable StorageFlags => CollectionImportTests.StorageFlags; } } -- 2.7.4