chore: code clean up

egil · egil · commit 6803a0bc9dfc · 2023-05-19T15:15:06.000Z
diff --git a/src/TimeProviderExtensions/TimeProviderExtensions.csproj b/src/TimeProviderExtensions/TimeProviderExtensions.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <PackageId>TimeProviderExtensions</PackageId>
     <Title>TimeProvider Extensions</Title>
-    <Version>0.9.0-preview</Version>
+    <Version>1.0.0-preview.1</Version>
     <Company>Egil Hansen</Company>
     <Authors>Egil Hansen</Authors>
     <Description>
@@ -49,10 +49,6 @@
     <PackageReference Include="Microsoft.Bcl.TimeProvider" Version="8.0.0-preview.*" />
   </ItemGroup>
 
-  <!--<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-  </ItemGroup>-->
-
   <ItemGroup>
     <None Include="..\..\LICENSE">
       <Pack>True</Pack>
diff --git a/test/TimeProviderExtensions.Tests/ManualTimeProviderPeriodicTimerTests.cs b/test/TimeProviderExtensions.Tests/ManualTimeProviderPeriodicTimerTests.cs
@@ -1,5 +1,5 @@
 #if NET6_0_OR_GREATER
-namespace TimeProviderExtensions.Testing;
+namespace TimeProviderExtensions;
 
 public class ManualTimeProviderPeriodicTimerTests
 {
@@ -98,16 +98,20 @@ public void PeriodicTimer_WaitForNextTickAsync_completes_multiple()
         calledTimes.Should().Be(2);
     }
 
-    [Fact]
-    public void PeriodicTimer_WaitForNextTickAsync_completes_multiple_single_forward()
+    [Theory]
+    [InlineData(1)]
+    [InlineData(2)]
+    [InlineData(3)]
+    public void PeriodicTimer_WaitForNextTickAsync_completes_iterations(int expectedCallbacks)
     {
         var sut = new ManualTimeProvider();
         var calledTimes = 0;
         var interval = TimeSpan.FromSeconds(1);
         var looper = WaitForNextTickInLoop(sut, () => calledTimes++, interval);
 
-        sut.ForwardTime(interval * 3);
-        calledTimes.Should().Be(3);
+        sut.ForwardTime(interval * expectedCallbacks);
+
+        calledTimes.Should().Be(expectedCallbacks);
     }
 
     [Fact]
@@ -179,7 +183,7 @@ static async Task CancelAfterWaitForNextTick(System.Threading.PeriodicTimer peri
         }
     }
 
-    static async Task WaitForNextTickInLoop(TimeProvider scheduler, Action callback, TimeSpan interval)
+    private static async Task WaitForNextTickInLoop(TimeProvider scheduler, Action callback, TimeSpan interval)
     {
         using var periodicTimer = scheduler.CreatePeriodicTimer(interval);
         while (await periodicTimer.WaitForNextTickAsync(CancellationToken.None).ConfigureAwait(false))
diff --git a/test/TimeProviderExtensions.Tests/ManualTimeProviderWaitAsyncTests.cs b/test/TimeProviderExtensions.Tests/ManualTimeProviderWaitAsyncTests.cs
@@ -1,7 +1,5 @@
 #if NET6_0_OR_GREATER
-using TimeProviderExtensions;
-
-namespace TimeProviderExtensions.Testing;
+namespace TimeProviderExtensions;
 
 public class ManualTimeProviderWaitAsyncTests
 {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#if NET6_0_OR_GREATER`
`2`		`-namespace TimeProviderExtensions.Testing;`
	`2`	`+namespace TimeProviderExtensions;`
`3`	`3`
`4`	`4`	`public class ManualTimeProviderPeriodicTimerTests`
`5`	`5`	`{`
`@@ -98,16 +98,20 @@ public void PeriodicTimer_WaitForNextTickAsync_completes_multiple()`
`98`	`98`	`calledTimes.Should().Be(2);`
`99`	`99`	`}`
`100`	`100`
`101`		`- [Fact]`
`102`		`- public void PeriodicTimer_WaitForNextTickAsync_completes_multiple_single_forward()`
	`101`	`+ [Theory]`
	`102`	`+ [InlineData(1)]`
	`103`	`+ [InlineData(2)]`
	`104`	`+ [InlineData(3)]`
	`105`	`+ public void PeriodicTimer_WaitForNextTickAsync_completes_iterations(int expectedCallbacks)`
`103`	`106`	`{`
`104`	`107`	`var sut = new ManualTimeProvider();`
`105`	`108`	`var calledTimes = 0;`
`106`	`109`	`var interval = TimeSpan.FromSeconds(1);`
`107`	`110`	`var looper = WaitForNextTickInLoop(sut, () => calledTimes++, interval);`
`108`	`111`
`109`		`- sut.ForwardTime(interval * 3);`
`110`		`- calledTimes.Should().Be(3);`
	`112`	`+ sut.ForwardTime(interval * expectedCallbacks);`
	`113`	`+`
	`114`	`+ calledTimes.Should().Be(expectedCallbacks);`
`111`	`115`	`}`
`112`	`116`
`113`	`117`	`[Fact]`
`@@ -179,7 +183,7 @@ static async Task CancelAfterWaitForNextTick(System.Threading.PeriodicTimer peri`
`179`	`183`	`}`
`180`	`184`	`}`
`181`	`185`
`182`		`- static async Task WaitForNextTickInLoop(TimeProvider scheduler, Action callback, TimeSpan interval)`
	`186`	`+ private static async Task WaitForNextTickInLoop(TimeProvider scheduler, Action callback, TimeSpan interval)`
`183`	`187`	`{`
`184`	`188`	`using var periodicTimer = scheduler.CreatePeriodicTimer(interval);`
`185`	`189`	`while (await periodicTimer.WaitForNextTickAsync(CancellationToken.None).ConfigureAwait(false))`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`#if NET6_0_OR_GREATER`
`2`		`-using TimeProviderExtensions;`
`3`		`-`
`4`		`-namespace TimeProviderExtensions.Testing;`
	`2`	`+namespace TimeProviderExtensions;`
`5`	`3`
`6`	`4`	`public class ManualTimeProviderWaitAsyncTests`
`7`	`5`	`{`