Skip to content

Commit 6c12a9d

Browse files
jnm2jnm2
committed
Use file-scoped namespaces
1 parent a8f2f48 commit 6c12a9d

30 files changed

+2005
-2032
lines changed

‎.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
[*.cs]
22

3+
csharp_style_namespace_declarations = file_scoped:warning
4+
35
dotnet_sort_system_directives_first = true
46

57
# IDE0005: Using directive is unnecessary.

‎src/TfvcMigrator.Tests/EnumerableExtensionsTests/WithLookaheadTests.cs

Lines changed: 91 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,124 @@
11
using NSubstitute;
22

3-
namespace TfvcMigrator.Tests.EnumerableExtensionsTests
3+
namespace TfvcMigrator.Tests.EnumerableExtensionsTests;
4+
5+
public static class WithLookaheadTests
46
{
5-
public static class WithLookaheadTests
7+
[Test]
8+
public static async Task Current_value_should_not_become_available_before_MoveNextAsync_succeeds_asynchronously()
69
{
7-
[Test]
8-
public static async Task Current_value_should_not_become_available_before_MoveNextAsync_succeeds_asynchronously()
9-
{
10-
var tcs = new TaskCompletionSource<bool>();
11-
12-
var inner = Substitute.For<IAsyncEnumerable<int>>();
13-
inner.GetAsyncEnumerator().Current.Returns(42);
14-
inner.GetAsyncEnumerator().MoveNextAsync().Returns(
15-
new ValueTask<bool>(tcs.Task),
16-
new ValueTask<bool>(false));
17-
18-
var enumerator = inner.WithLookahead().GetAsyncEnumerator();
10+
var tcs = new TaskCompletionSource<bool>();
1911

20-
enumerator.Current.ShouldBe(0);
21-
var moveNextTask = enumerator.MoveNextAsync();
22-
enumerator.Current.ShouldBe(0);
12+
var inner = Substitute.For<IAsyncEnumerable<int>>();
13+
inner.GetAsyncEnumerator().Current.Returns(42);
14+
inner.GetAsyncEnumerator().MoveNextAsync().Returns(
15+
new ValueTask<bool>(tcs.Task),
16+
new ValueTask<bool>(false));
2317

24-
tcs.SetResult(true);
25-
await moveNextTask;
26-
}
18+
var enumerator = inner.WithLookahead().GetAsyncEnumerator();
2719

28-
[Test]
29-
public static async Task Current_value_should_become_available_when_MoveNextAsync_succeeds_synchronously()
30-
{
31-
var inner = Substitute.For<IAsyncEnumerable<int>>();
32-
inner.GetAsyncEnumerator().Current.Returns(42);
33-
inner.GetAsyncEnumerator().MoveNextAsync().Returns(
34-
new ValueTask<bool>(true),
35-
new ValueTask<bool>(false));
20+
enumerator.Current.ShouldBe(0);
21+
var moveNextTask = enumerator.MoveNextAsync();
22+
enumerator.Current.ShouldBe(0);
3623

37-
var enumerator = inner.WithLookahead().GetAsyncEnumerator();
24+
tcs.SetResult(true);
25+
await moveNextTask;
26+
}
3827

39-
await enumerator.MoveNextAsync();
40-
enumerator.Current.ShouldBe(42);
41-
}
28+
[Test]
29+
public static async Task Current_value_should_become_available_when_MoveNextAsync_succeeds_synchronously()
30+
{
31+
var inner = Substitute.For<IAsyncEnumerable<int>>();
32+
inner.GetAsyncEnumerator().Current.Returns(42);
33+
inner.GetAsyncEnumerator().MoveNextAsync().Returns(
34+
new ValueTask<bool>(true),
35+
new ValueTask<bool>(false));
4236

43-
[Test]
44-
public static async Task Current_value_should_become_available_when_MoveNextAsync_succeeds_asynchronously()
45-
{
46-
var tcs = new TaskCompletionSource<bool>();
37+
var enumerator = inner.WithLookahead().GetAsyncEnumerator();
4738

48-
var inner = Substitute.For<IAsyncEnumerable<int>>();
49-
inner.GetAsyncEnumerator().Current.Returns(42);
50-
inner.GetAsyncEnumerator().MoveNextAsync().Returns(
51-
new ValueTask<bool>(tcs.Task),
52-
new ValueTask<bool>(false));
39+
await enumerator.MoveNextAsync();
40+
enumerator.Current.ShouldBe(42);
41+
}
5342

54-
var enumerator = inner.WithLookahead().GetAsyncEnumerator();
43+
[Test]
44+
public static async Task Current_value_should_become_available_when_MoveNextAsync_succeeds_asynchronously()
45+
{
46+
var tcs = new TaskCompletionSource<bool>();
5547

56-
var moveNextTask = enumerator.MoveNextAsync();
57-
tcs.SetResult(true);
58-
await moveNextTask;
48+
var inner = Substitute.For<IAsyncEnumerable<int>>();
49+
inner.GetAsyncEnumerator().Current.Returns(42);
50+
inner.GetAsyncEnumerator().MoveNextAsync().Returns(
51+
new ValueTask<bool>(tcs.Task),
52+
new ValueTask<bool>(false));
5953

60-
enumerator.Current.ShouldBe(42);
61-
}
54+
var enumerator = inner.WithLookahead().GetAsyncEnumerator();
6255

63-
[Test]
64-
public static async Task Immediate_second_MoveNextAsync_call_should_not_be_detected_as_overlapping()
65-
{
66-
var tcs = new TaskCompletionSource<bool>();
56+
var moveNextTask = enumerator.MoveNextAsync();
57+
tcs.SetResult(true);
58+
await moveNextTask;
6759

68-
var inner = Substitute.For<IAsyncEnumerable<int>>();
69-
inner.GetAsyncEnumerator().MoveNextAsync().Returns(
70-
new ValueTask<bool>(tcs.Task),
71-
new ValueTask<bool>(false));
60+
enumerator.Current.ShouldBe(42);
61+
}
7262

73-
var enumerator = inner.WithLookahead().GetAsyncEnumerator();
63+
[Test]
64+
public static async Task Immediate_second_MoveNextAsync_call_should_not_be_detected_as_overlapping()
65+
{
66+
var tcs = new TaskCompletionSource<bool>();
7467

75-
var awaitAssertionsTask = CallAgainImmediatelyAfterAwaiting();
76-
async Task CallAgainImmediatelyAfterAwaiting()
77-
{
78-
(await enumerator.MoveNextAsync()).ShouldBeTrue();
79-
(await enumerator.MoveNextAsync()).ShouldBeFalse();
80-
}
68+
var inner = Substitute.For<IAsyncEnumerable<int>>();
69+
inner.GetAsyncEnumerator().MoveNextAsync().Returns(
70+
new ValueTask<bool>(tcs.Task),
71+
new ValueTask<bool>(false));
8172

82-
tcs.SetResult(true);
73+
var enumerator = inner.WithLookahead().GetAsyncEnumerator();
8374

84-
await awaitAssertionsTask;
75+
var awaitAssertionsTask = CallAgainImmediatelyAfterAwaiting();
76+
async Task CallAgainImmediatelyAfterAwaiting()
77+
{
78+
(await enumerator.MoveNextAsync()).ShouldBeTrue();
79+
(await enumerator.MoveNextAsync()).ShouldBeFalse();
8580
}
8681

87-
[Test]
88-
public static async Task MoveNextAsync_call_after_sync_fault_should_not_be_detected_as_overlapping()
89-
{
90-
var inner = Substitute.For<IAsyncEnumerable<int>>();
91-
inner.GetAsyncEnumerator().MoveNextAsync().Returns(
92-
new ValueTask<bool>(Task.FromException<bool>(new Exception())),
93-
new ValueTask<bool>(false));
82+
tcs.SetResult(true);
9483

95-
var enumerator = inner.WithLookahead().GetAsyncEnumerator();
84+
await awaitAssertionsTask;
85+
}
9686

97-
await Should.ThrowAsync<Exception>(enumerator.MoveNextAsync().AsTask());
98-
(await enumerator.MoveNextAsync()).ShouldBeFalse();
99-
}
87+
[Test]
88+
public static async Task MoveNextAsync_call_after_sync_fault_should_not_be_detected_as_overlapping()
89+
{
90+
var inner = Substitute.For<IAsyncEnumerable<int>>();
91+
inner.GetAsyncEnumerator().MoveNextAsync().Returns(
92+
new ValueTask<bool>(Task.FromException<bool>(new Exception())),
93+
new ValueTask<bool>(false));
10094

101-
[Test]
102-
public static async Task MoveNextAsync_call_after_async_fault_should_not_be_detected_as_overlapping()
103-
{
104-
var tcs = new TaskCompletionSource<bool>();
95+
var enumerator = inner.WithLookahead().GetAsyncEnumerator();
10596

106-
var inner = Substitute.For<IAsyncEnumerable<int>>();
107-
inner.GetAsyncEnumerator().MoveNextAsync().Returns(
108-
new ValueTask<bool>(tcs.Task),
109-
new ValueTask<bool>(false));
97+
await Should.ThrowAsync<Exception>(enumerator.MoveNextAsync().AsTask());
98+
(await enumerator.MoveNextAsync()).ShouldBeFalse();
99+
}
110100

111-
var enumerator = inner.WithLookahead().GetAsyncEnumerator();
101+
[Test]
102+
public static async Task MoveNextAsync_call_after_async_fault_should_not_be_detected_as_overlapping()
103+
{
104+
var tcs = new TaskCompletionSource<bool>();
112105

113-
var awaitAssertionsTask = CallAgainImmediatelyAfterAwaiting();
114-
async Task CallAgainImmediatelyAfterAwaiting()
115-
{
116-
await Should.ThrowAsync<Exception>(enumerator.MoveNextAsync().AsTask());
117-
(await enumerator.MoveNextAsync()).ShouldBeFalse();
118-
}
106+
var inner = Substitute.For<IAsyncEnumerable<int>>();
107+
inner.GetAsyncEnumerator().MoveNextAsync().Returns(
108+
new ValueTask<bool>(tcs.Task),
109+
new ValueTask<bool>(false));
119110

120-
tcs.SetException(new Exception());
111+
var enumerator = inner.WithLookahead().GetAsyncEnumerator();
121112

122-
await awaitAssertionsTask;
113+
var awaitAssertionsTask = CallAgainImmediatelyAfterAwaiting();
114+
async Task CallAgainImmediatelyAfterAwaiting()
115+
{
116+
await Should.ThrowAsync<Exception>(enumerator.MoveNextAsync().AsTask());
117+
(await enumerator.MoveNextAsync()).ShouldBeFalse();
123118
}
119+
120+
tcs.SetException(new Exception());
121+
122+
await awaitAssertionsTask;
124123
}
125124
}

‎src/TfvcMigrator.Tests/UtilsTests/ContainsCrlfTests.cs

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
1-
namespace TfvcMigrator.Tests.UtilsTests
1+
namespace TfvcMigrator.Tests.UtilsTests;
2+
3+
public static class ContainsCrlfTests
24
{
3-
public static class ContainsCrlfTests
4-
{
5-
private const byte CR = (byte)'\r', LF = (byte)'\n';
5+
private const byte CR = (byte)'\r', LF = (byte)'\n';
66

7-
[Test]
8-
public static void False_for_only_CR()
9-
{
10-
using var stream = new MemoryStream(new[] { CR, CR });
7+
[Test]
8+
public static void False_for_only_CR()
9+
{
10+
using var stream = new MemoryStream(new[] { CR, CR });
1111

12-
Utils.ContainsCrlf(stream, out _, out _).ShouldBeFalse();
13-
}
12+
Utils.ContainsCrlf(stream, out _, out _).ShouldBeFalse();
13+
}
1414

15-
[Test]
16-
public static void False_for_only_LF()
17-
{
18-
using var stream = new MemoryStream(new[] { LF, LF });
15+
[Test]
16+
public static void False_for_only_LF()
17+
{
18+
using var stream = new MemoryStream(new[] { LF, LF });
1919

20-
Utils.ContainsCrlf(stream, out _, out _).ShouldBeFalse();
21-
}
20+
Utils.ContainsCrlf(stream, out _, out _).ShouldBeFalse();
21+
}
2222

23-
[Test]
24-
public static void Detects_CRLF_following_CR()
25-
{
26-
using var stream = new MemoryStream(new[] { CR, CR, LF });
23+
[Test]
24+
public static void Detects_CRLF_following_CR()
25+
{
26+
using var stream = new MemoryStream(new[] { CR, CR, LF });
2727

28-
Utils.ContainsCrlf(stream, out _, out _).ShouldBeTrue();
29-
}
28+
Utils.ContainsCrlf(stream, out _, out _).ShouldBeTrue();
3029
}
3130
}

0 commit comments

Comments
 (0)