Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add back fixed xunit decimal, IntPtr and UIntPtr commented test cases #87084

Merged
merged 5 commits into from
Jun 7, 2023
Merged

Add back fixed xunit decimal, IntPtr and UIntPtr commented test cases #87084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ee0d4f
Add tests removed due to bug in previous xunit versions
joaonunomota Jun 3, 2023
00e8dfd
Merge branch 'main' into add-fixed-xunit-tests
joaonunomota Jun 3, 2023
a80a1d2
Fix casing of UIntPtr type
joaonunomota Jun 3, 2023
03d7813
fix native aot tests
danmoseley Jun 5, 2023
965fe37
typo
danmoseley Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/libraries/System.Linq.Parallel/tests/ParallelEnumerableTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,7 @@ public static IEnumerable<object[]> RepeatData()
yield return new object[] { element, count };
yield return new object[] { (long)element, count };
yield return new object[] { (double)element, count };
// [ActiveIssue("https://github.com/xunit/xunit/issues/1771")]
//yield return new object[] { (decimal)element, count };
yield return new object[] { (decimal)element, count };
yield return new object[] { "" + element, count };
}
yield return new object[] { null, count };
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/System.Linq.Parallel/tests/QueryOperators/DefaultIfEmptyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ public static void DefaultIfEmpty_NotEmpty_NotPipelined_Longrunning(Labeled<Para

[Theory]
[MemberData(nameof(EmptyData))]
[ActiveIssue("https://github.com/xunit/xunit/issues/1771")]
public static void DefaultIfEmpty_Empty<T>(Labeled<ParallelQuery<T>> labeled, T def)
{
ParallelQuery<T> notEmpty = labeled.Item.DefaultIfEmpty();
Expand All @@ -125,7 +124,6 @@ public static void DefaultIfEmpty_Empty<T>(Labeled<ParallelQuery<T>> labeled, T

[Theory]
[MemberData(nameof(EmptyData))]
[ActiveIssue("https://github.com/xunit/xunit/issues/1771")]
public static void DefaultIfEmpty_Empty_NotPipelined<T>(Labeled<ParallelQuery<T>> labeled, T def)
{
IList<T> notEmpty = labeled.Item.DefaultIfEmpty().ToList();
Expand Down
109 changes: 52 additions & 57 deletions src/libraries/System.Runtime/tests/System/ArrayTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,38 +263,37 @@ public static IEnumerable<object[]> BinarySearch_SZArray_TestData()

yield return new object[] { new ulong[0], 0, 0, (ulong)0, null, -1 };

// // [ActiveIssue("https://github.com/xunit/xunit/issues/1771")]
// // IntPtr
// IntPtr

// IntPtr[] intPtrArray = new IntPtr[] { IntPtr.MinValue, (IntPtr)0, (IntPtr)0, IntPtr.MaxValue };
IntPtr[] intPtrArray = new IntPtr[] { IntPtr.MinValue, (IntPtr)0, (IntPtr)0, IntPtr.MaxValue };

// yield return new object[] { intPtrArray, 0, 4, IntPtr.MinValue, null, 0 };
// yield return new object[] { intPtrArray, 0, 4, (IntPtr)0, null, 1 };
// yield return new object[] { intPtrArray, 0, 4, IntPtr.MaxValue, null, 3 };
// yield return new object[] { intPtrArray, 0, 4, (IntPtr)1, null, -4 };
yield return new object[] { intPtrArray, 0, 4, IntPtr.MinValue, null, 0 };
yield return new object[] { intPtrArray, 0, 4, (IntPtr)0, null, 1 };
yield return new object[] { intPtrArray, 0, 4, IntPtr.MaxValue, null, 3 };
yield return new object[] { intPtrArray, 0, 4, (IntPtr)1, null, -4 };

// yield return new object[] { intPtrArray, 0, 1, IntPtr.MinValue, null, 0 };
// yield return new object[] { intPtrArray, 1, 3, IntPtr.MaxValue, null, 3 };
// yield return new object[] { intPtrArray, 1, 3, IntPtr.MinValue, null, -2 };
// yield return new object[] { intPtrArray, 1, 0, (IntPtr)0, null, -2 };
yield return new object[] { intPtrArray, 0, 1, IntPtr.MinValue, null, 0 };
yield return new object[] { intPtrArray, 1, 3, IntPtr.MaxValue, null, 3 };
yield return new object[] { intPtrArray, 1, 3, IntPtr.MinValue, null, -2 };
yield return new object[] { intPtrArray, 1, 0, (IntPtr)0, null, -2 };

// yield return new object[] { new IntPtr[0], 0, 0, (IntPtr)0, null, -1 };
yield return new object[] { new IntPtr[0], 0, 0, (IntPtr)0, null, -1 };

// // UIntPtr
// UIntPtr

// UIntPtr[] uintPtrArray = new UIntPtr[] { UIntPtr.MinValue, (UIntPtr)5, (UIntPtr)5, UIntPtr.MaxValue };
UIntPtr[] uintPtrArray = new UIntPtr[] { UIntPtr.MinValue, (UIntPtr)5, (UIntPtr)5, UIntPtr.MaxValue };

// yield return new object[] { uintPtrArray, 0, 4, UIntPtr.MinValue, null, 0 };
// yield return new object[] { uintPtrArray, 0, 4, (UIntPtr)5, null, 1 };
// yield return new object[] { uintPtrArray, 0, 4, UIntPtr.MaxValue, null, 3 };
// yield return new object[] { uintPtrArray, 0, 4, (UIntPtr)1, null, -2 };
yield return new object[] { uintPtrArray, 0, 4, UIntPtr.MinValue, null, 0 };
yield return new object[] { uintPtrArray, 0, 4, (UIntPtr)5, null, 1 };
yield return new object[] { uintPtrArray, 0, 4, UIntPtr.MaxValue, null, 3 };
yield return new object[] { uintPtrArray, 0, 4, (UIntPtr)1, null, -2 };

// yield return new object[] { uintPtrArray, 0, 1, UIntPtr.MinValue, null, 0 };
// yield return new object[] { uintPtrArray, 1, 3, UIntPtr.MaxValue, null, 3 };
// yield return new object[] { uintPtrArray, 1, 3, UIntPtr.MinValue, null, -2 };
// yield return new object[] { uintPtrArray, 1, 0, (UIntPtr)5, null, -2 };
yield return new object[] { uintPtrArray, 0, 1, UIntPtr.MinValue, null, 0 };
yield return new object[] { uintPtrArray, 1, 3, UIntPtr.MaxValue, null, 3 };
yield return new object[] { uintPtrArray, 1, 3, UIntPtr.MinValue, null, -2 };
yield return new object[] { uintPtrArray, 1, 0, (UIntPtr)5, null, -2 };

// yield return new object[] { new UIntPtr[0], 0, 0, (UIntPtr)0, null, -1 };
yield return new object[] { new UIntPtr[0], 0, 0, (UIntPtr)0, null, -1 };

// Char
char[] charArray = new char[] { char.MinValue, (char)5, (char)5, char.MaxValue };
Expand Down Expand Up @@ -2361,25 +2360,23 @@ public static IEnumerable<object[]> IndexOf_SZArray_TestData()
yield return new object[] { new double[] { 1, 2, 3, 3 }, (double)1, 0, 0, -1 };
yield return new object[] { new double[0], (double)1, 0, 0, -1 };

// [ActiveIssue("https://github.com/xunit/xunit/issues/1771")]
// IntPtr
//yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3 }, (IntPtr)1, 0, 4, 0 };
//yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3 }, (IntPtr)3, 0, 4, 2 };
//yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3 }, (IntPtr)2, 1, 2, 1 };
//yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3 }, (IntPtr)1, 1, 2, -1 };
//yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3 }, (IntPtr)1, 4, 0, -1 };
//yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3 }, (IntPtr)1, 0, 0, -1 };
//yield return new object[] { new IntPtr[0], (IntPtr)1, 0, 0, -1 };

// [ActiveIssue("https://github.com/xunit/xunit/issues/1771")]
yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3 }, (IntPtr)1, 0, 4, 0 };
yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3 }, (IntPtr)3, 0, 4, 2 };
yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3 }, (IntPtr)2, 1, 2, 1 };
yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3 }, (IntPtr)1, 1, 2, -1 };
yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3 }, (IntPtr)1, 4, 0, -1 };
yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3 }, (IntPtr)1, 0, 0, -1 };
yield return new object[] { new IntPtr[0], (IntPtr)1, 0, 0, -1 };

// UIntPtr
//yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3 }, (UIntPtr)1, 0, 4, 0 };
//yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3 }, (UIntPtr)3, 0, 4, 2 };
//yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3 }, (UIntPtr)2, 1, 2, 1 };
//yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3 }, (UIntPtr)1, 1, 2, -1 };
//yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3 }, (UIntPtr)1, 4, 0, -1 };
//yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3 }, (UIntPtr)1, 0, 0, -1 };
//yield return new object[] { new UIntPtr[0], (UIntPtr)1, 0, 0, -1 };
yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3 }, (UIntPtr)1, 0, 4, 0 };
yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3 }, (UIntPtr)3, 0, 4, 2 };
yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3 }, (UIntPtr)2, 1, 2, 1 };
yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3 }, (UIntPtr)1, 1, 2, -1 };
yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3 }, (UIntPtr)1, 4, 0, -1 };
yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3 }, (UIntPtr)1, 0, 0, -1 };
yield return new object[] { new UIntPtr[0], (UIntPtr)1, 0, 0, -1 };

// String
var stringArray = new string[] { null, null, "Hello", "Hello", "Goodbye", "Goodbye", null, null };
Expand Down Expand Up @@ -2739,25 +2736,23 @@ public static IEnumerable<object[]> LastIndexOf_SZArray_TestData()
yield return new object[] { new double[] { 1, 2, 3, 3, 4 }, (double)3, 0, 0, -1 };
yield return new object[] { new double[] { 1, 2, 3, 3, 4 }, (double)3, 3, 0, -1 };

// [ActiveIssue("https://github.com/xunit/xunit/issues/1771")]
// IntPtr
//yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)1, 4, 5, 0 };
//yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)3, 4, 5, 3 };
//yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)2, 2, 3, 1 };
//yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)4, 2, 3, -1 };
//yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)5, 4, 5, -1 };
//yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)3, 0, 0, -1 };
//yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)3, 3, 0, -1 };

// [ActiveIssue("https://github.com/xunit/xunit/issues/1771")]
yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)1, 4, 5, 0 };
yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)3, 4, 5, 3 };
yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)2, 2, 3, 1 };
yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)4, 2, 3, -1 };
yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)5, 4, 5, -1 };
yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)3, 0, 0, -1 };
yield return new object[] { new IntPtr[] { (IntPtr)1, (IntPtr)2, (IntPtr)3, (IntPtr)3, (IntPtr)4 }, (IntPtr)3, 3, 0, -1 };

// UIntPtr
//yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)1, 4, 5, 0 };
//yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)3, 4, 5, 3 };
//yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)2, 2, 3, 1 };
//yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)4, 2, 3, -1 };
//yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)5, 4, 5, -1 };
//yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)3, 0, 0, -1 };
//yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)3, 3, 0, -1 };
yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)1, 4, 5, 0 };
yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)3, 4, 5, 3 };
yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)2, 2, 3, 1 };
yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)4, 2, 3, -1 };
yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)5, 4, 5, -1 };
yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)3, 0, 0, -1 };
yield return new object[] { new UIntPtr[] { (UIntPtr)1, (UIntPtr)2, (UIntPtr)3, (UIntPtr)3, (UIntPtr)4 }, (UIntPtr)3, 3, 0, -1 };

// String
var stringArray = new string[] { null, null, "Hello", "Hello", "Goodbye", "Goodbye", null, null };
Expand Down
7 changes: 3 additions & 4 deletions src/libraries/System.Runtime/tests/System/Reflection/InvokeRefReturn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,9 @@ public static IEnumerable<object[]> RefReturnInvokeTestData
yield return new object[] { 42L };
yield return new object[] { 43.67f };
yield return new object[] { 43.67 };
// [ActiveIssue("https://github.com/xunit/xunit/issues/1771")]
//yield return new object[] { new IntPtr(42) };
//yield return new object[] { new UIntPtr(42) };
//yield return new object[] { 232953453454m };
yield return new object[] { new IntPtr(42) };
yield return new object[] { new UIntPtr(42) };
yield return new object[] { 232953453454m };
yield return new object[] { BindingFlags.IgnoreCase };
yield return new object[] { "Hello" };
yield return new object[] { new object() };
Expand Down
10 changes: 10 additions & 0 deletions src/libraries/System.Runtime/tests/default.rd.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@
<Method Name="TestNullRefReturnInvoke" Dynamic="Required All">
<GenericArgument Name="System.Double, System.Private.CoreLib" />
</Method>
<Method Name="TestNullRefReturnInvoke" Dynamic="Required All">
<GenericArgument Name="System.Decimal, System.Private.CoreLib" />
</Method>
<Method Name="TestNullRefReturnInvoke" Dynamic="Required All">
<GenericArgument Name="System.Reflection.BindingFlags, System.Private.CoreLib" />
</Method>
Expand Down Expand Up @@ -176,6 +179,9 @@
<Method Name="TestRefReturnPropertyGetValue" Dynamic="Required All">
<GenericArgument Name="System.Double, System.Private.CoreLib" />
</Method>
<Method Name="TestRefReturnPropertyGetValue" Dynamic="Required All">
<GenericArgument Name="System.Decimal, System.Private.CoreLib" />
</Method>
<Method Name="TestRefReturnPropertyGetValue" Dynamic="Required All">
<GenericArgument Name="System.Reflection.BindingFlags, System.Private.CoreLib" />
</Method>
Expand Down Expand Up @@ -222,6 +228,9 @@
<Method Name="TestRefReturnMethodInvoke" Dynamic="Required All">
<GenericArgument Name="System.Double, System.Private.CoreLib" />
</Method>
<Method Name="TestRefReturnMethodInvoke" Dynamic="Required All">
<GenericArgument Name="System.Decimal, System.Private.CoreLib" />
</Method>
<Method Name="TestRefReturnMethodInvoke" Dynamic="Required All">
<GenericArgument Name="System.Reflection.BindingFlags, System.Private.CoreLib" />
</Method>
Expand All @@ -243,6 +252,7 @@
<Type Name="System.Reflection.Tests.InvokeRefReturnNetcoreTests+TestClass`1[[System.Boolean, System.Private.CoreLib]]" Dynamic="Required All" />
<Type Name="System.Reflection.Tests.InvokeRefReturnNetcoreTests+TestClass`1[[System.Single, System.Private.CoreLib]]" Dynamic="Required All" />
<Type Name="System.Reflection.Tests.InvokeRefReturnNetcoreTests+TestClass`1[[System.Double, System.Private.CoreLib]]" Dynamic="Required All" />
<Type Name="System.Reflection.Tests.InvokeRefReturnNetcoreTests+TestClass`1[[System.Decimal, System.Private.CoreLib]]" Dynamic="Required All" />
<Type Name="System.Reflection.Tests.InvokeRefReturnNetcoreTests+TestClass`1[[System.Reflection.BindingFlags, System.Private.CoreLib]]" Dynamic="Required All" />

<Type Name="System.Reflection.Tests.MethodBaseTests">
Expand Down