Skip to content

Commit

Permalink
More shared assertion tests that shouldn't return ValueTask
Browse files Browse the repository at this point in the history
  • Loading branch information
@bradwilson
bradwilson committed Nov 1, 2023
1 parent 262dd72 commit f244cc8
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 33 deletions.
14 changes: 7 additions & 7 deletions test/test.xunit.assert/Asserts/CollectionAssertsTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ public static void ActionCanReceiveIndex()
public class AllAsync
{
[Fact]
public static async ValueTask GuardClauses()
public static async Task GuardClauses()
{
await Assert.ThrowsAsync<ArgumentNullException>("collection", () => Assert.AllAsync<object>(null!, async _ => await Task.Yield()));
await Assert.ThrowsAsync<ArgumentNullException>("action", () => Assert.AllAsync(Array.Empty<object>(), (Func<object, ValueTask>)null!));
await Assert.ThrowsAsync<ArgumentNullException>("action", () => Assert.AllAsync(Array.Empty<object>(), (Func<object, int, ValueTask>)null!));
}

[Fact]
public static async ValueTask Success()
public static async Task Success()
{
var items = new[] { 1, 1, 1, 1, 1, 1 };

Expand Down Expand Up @@ -108,7 +108,7 @@ public static void Failure()
}

[Fact]
public static async ValueTask ActionCanReceiveIndex()
public static async Task ActionCanReceiveIndex()
{
var items = new[] { 1, 1, 2, 2, 1, 1 };
var indices = new List<int>();
Expand Down Expand Up @@ -194,15 +194,15 @@ public static void MismatchedElement()
public class CollectionAsync
{
[Fact]
public static async ValueTask EmptyCollection()
public static async Task EmptyCollection()
{
var list = new List<int>();

await Assert.CollectionAsync(list);
}

[Fact]
public static async ValueTask MismatchedElementCountAsync()
public static async Task MismatchedElementCountAsync()
{
var list = new List<int>();

Expand All @@ -224,7 +224,7 @@ public static async ValueTask MismatchedElementCountAsync()
}

[Fact]
public static async ValueTask NonEmptyCollectionAsync()
public static async Task NonEmptyCollectionAsync()
{
var list = new List<int> { 42, 2112 };

Expand All @@ -243,7 +243,7 @@ public static async ValueTask NonEmptyCollectionAsync()
}

[Fact]
public static async ValueTask MismatchedElementAsync()
public static async Task MismatchedElementAsync()
{
var list = new List<int> { 42, 2112 };

Expand Down
18 changes: 9 additions & 9 deletions test/test.xunit.assert/Asserts/EventAssertsTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public static async Task DerivedTypeRaised_NonGeneric()
public class RaisesAnyAsync_ValueTask
{
[Fact]
public static async ValueTask NoEventRaised()
public static async Task NoEventRaised()
{
var obj = new RaisingClass();

Expand All @@ -326,7 +326,7 @@ public static async ValueTask NoEventRaised()
}

[Fact]
public static async ValueTask NoEventRaised_NonGeneric()
public static async Task NoEventRaised_NonGeneric()
{
var obj = new RaisingClass_NonGeneric();

Expand All @@ -348,7 +348,7 @@ public static async ValueTask NoEventRaised_NonGeneric()
}

[Fact]
public static async ValueTask ExactTypeRaised()
public static async Task ExactTypeRaised()
{
var obj = new RaisingClass();
var eventObj = new object();
Expand All @@ -369,7 +369,7 @@ public static async ValueTask ExactTypeRaised()
}

[Fact]
public static async ValueTask ExactTypeRaised_NonGeneric()
public static async Task ExactTypeRaised_NonGeneric()
{
var obj = new RaisingClass_NonGeneric();
var eventObj = new EventArgs();
Expand All @@ -390,7 +390,7 @@ public static async ValueTask ExactTypeRaised_NonGeneric()
}

[Fact]
public static async ValueTask DerivedTypeRaised()
public static async Task DerivedTypeRaised()
{
var obj = new RaisingClass();
var eventObj = new DerivedObject();
Expand All @@ -411,7 +411,7 @@ public static async ValueTask DerivedTypeRaised()
}

[Fact]
public static async ValueTask DerivedTypeRaised_NonGeneric()
public static async Task DerivedTypeRaised_NonGeneric()
{
var obj = new RaisingClass_NonGeneric();
var eventObj = new DerivedEventArgs();
Expand Down Expand Up @@ -502,7 +502,7 @@ public static async Task DerivedTypeRaised()
public class RaisesAsync_ValueTask
{
[Fact]
public static async ValueTask NoEventRaised()
public static async Task NoEventRaised()
{
var obj = new RaisingClass();

Expand All @@ -524,7 +524,7 @@ public static async ValueTask NoEventRaised()
}

[Fact]
public static async ValueTask ExactTypeRaised()
public static async Task ExactTypeRaised()
{
var obj = new RaisingClass();
var eventObj = new object();
Expand All @@ -545,7 +545,7 @@ public static async ValueTask ExactTypeRaised()
}

[Fact]
public static async ValueTask DerivedTypeRaised()
public static async Task DerivedTypeRaised()
{
var obj = new RaisingClass();
var eventObj = new DerivedObject();
Expand Down
32 changes: 16 additions & 16 deletions test/test.xunit.assert/Asserts/ExceptionAssertsTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ public static async Task DerivedExceptionThrown()
public class WithValueTask
{
[Fact]
public static async ValueTask GuardClause()
public static async Task GuardClause()
{
async ValueTask testCode()
{
Expand All @@ -739,7 +739,7 @@ async ValueTask testCode()
}

[Fact]
public static async ValueTask NoExceptionThrown()
public static async Task NoExceptionThrown()
{
ValueTask testCode() => default(ValueTask);

Expand All @@ -755,15 +755,15 @@ public static async ValueTask NoExceptionThrown()
}

[Fact]
public static async ValueTask CorrectExceptionThrown()
public static async Task CorrectExceptionThrown()
{
ValueTask testCode() => throw new ArgumentException();

await Assert.ThrowsAnyAsync<ArgumentException>(testCode);
}

[Fact]
public static async ValueTask IncorrectExceptionThrown()
public static async Task IncorrectExceptionThrown()
{
var thrown = new DivideByZeroException();
ValueTask testCode() => throw thrown;
Expand All @@ -781,7 +781,7 @@ public static async ValueTask IncorrectExceptionThrown()
}

[Fact]
public static async ValueTask DerivedExceptionThrown()
public static async Task DerivedExceptionThrown()
{
ValueTask testCode() => throw new ArgumentNullException();

Expand Down Expand Up @@ -866,7 +866,7 @@ public static async Task DerivedExceptionThrown()
public class WithValueTask
{
[Fact]
public static async ValueTask GuardClause()
public static async Task GuardClause()
{
async ValueTask testCode()
{
Expand All @@ -877,7 +877,7 @@ async ValueTask testCode()
}

[Fact]
public static async ValueTask NoExceptionThrown()
public static async Task NoExceptionThrown()
{
ValueTask testCode() => default(ValueTask);

Expand All @@ -893,15 +893,15 @@ public static async ValueTask NoExceptionThrown()
}

[Fact]
public static async ValueTask CorrectExceptionThrown()
public static async Task CorrectExceptionThrown()
{
ValueTask testCode() => throw new ArgumentException();

await Assert.ThrowsAsync<ArgumentException>(testCode);
}

[Fact]
public static async ValueTask IncorrectExceptionThrown()
public static async Task IncorrectExceptionThrown()
{
var thrown = new DivideByZeroException();
ValueTask testCode() => throw thrown;
Expand All @@ -919,7 +919,7 @@ public static async ValueTask IncorrectExceptionThrown()
}

[Fact]
public static async ValueTask DerivedExceptionThrown()
public static async Task DerivedExceptionThrown()
{
var thrown = new ArgumentNullException();
ValueTask testCode() => throw thrown;
Expand Down Expand Up @@ -1031,7 +1031,7 @@ public static async Task DerivedExceptionThrown()
public class WithValueTask
{
[Fact]
public static async ValueTask GuardClause()
public static async Task GuardClause()
{
async ValueTask testCode()
{
Expand All @@ -1042,7 +1042,7 @@ async ValueTask testCode()
}

[Fact]
public static async ValueTask NoExceptionThrown()
public static async Task NoExceptionThrown()
{
ValueTask testCode() => default(ValueTask);

Expand All @@ -1058,15 +1058,15 @@ public static async ValueTask NoExceptionThrown()
}

[Fact]
public static async ValueTask CorrectExceptionThrown()
public static async Task CorrectExceptionThrown()
{
ValueTask testCode() => throw new ArgumentException("Hello world", "paramName");

await Assert.ThrowsAsync<ArgumentException>("paramName", testCode);
}

[Fact]
public static async ValueTask IncorrectParameterName()
public static async Task IncorrectParameterName()
{
ValueTask testCode() => throw new ArgumentException("Hello world", "paramName1");

Expand All @@ -1083,7 +1083,7 @@ public static async ValueTask IncorrectParameterName()
}

[Fact]
public static async ValueTask IncorrectExceptionThrown()
public static async Task IncorrectExceptionThrown()
{
var thrown = new DivideByZeroException();
ValueTask testCode() => throw thrown;
Expand All @@ -1101,7 +1101,7 @@ public static async ValueTask IncorrectExceptionThrown()
}

[Fact]
public static async ValueTask DerivedExceptionThrown()
public static async Task DerivedExceptionThrown()
{
var thrown = new ArgumentNullException();
ValueTask testCode() => throw thrown;
Expand Down
2 changes: 1 addition & 1 deletion test/test.xunit.assert/Asserts/TypeAssertsTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ class CSharpDynamicAssembly : CSharpAcceptanceTestAssembly
protected override IEnumerable<string> GetStandardReferences() =>
new[] { "mscorlib.dll" };

public static async ValueTask<CSharpDynamicAssembly> Create(string code)
public static async Task<CSharpDynamicAssembly> Create(string code)
{
var assembly = new CSharpDynamicAssembly();
await assembly.Compile(new[] { code }, Array.Empty<string>());
Expand Down

0 comments on commit f244cc8

Please sign in to comment.