Remove IIntervalTimer and ScheduleOnInterval.

Author: tosh-coding

src/AsyncFiberWorks/Timers/IntervalThreadingTimer.cs renamed to src/AsyncFiberWorks.Windows/Timer/IntervalThreadingTimer.cs

@@ -1,13 +1,12 @@
-using AsyncFiberWorks.Core;
-using System;
+using System;
 using System.Threading;
 
-namespace AsyncFiberWorks.Timers
+namespace AsyncFiberWorks.Windows.Timers
 {
     /// <summary>
     /// Wrapper class for System.Threading.Timer.
     /// </summary>
-    public class IntervalThreadingTimer : IIntervalTimer, IDisposable
+    public class IntervalThreadingTimer : IDisposable
     {
         readonly object _lockObj = new object();
         readonly Timer _timer;

src/AsyncFiberWorks.Windows/Timer/IntervalWaitableTimerEx.cs

@@ -4,7 +4,7 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 
-namespace AsyncFiberWorks.Windows.Timer
+namespace AsyncFiberWorks.Windows.Timers
 {
     /// <summary>
     /// Waitable timer with CREATE_WAITABLE_TIMER_HIGH_RESOLUTION.

src/AsyncFiberWorks.Windows/Timer/WaitableTimerEx.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 
-namespace AsyncFiberWorks.Windows.Timer
+namespace AsyncFiberWorks.Windows.Timers
 {
     /// <summary>
     /// Sleep implements using WaitableTimerEx in Windows.

src/AsyncFiberWorks.Windows/Timer/WaitableTimerSleeper.cs

@@ -47,7 +47,6 @@ public void ScheduledTasksShouldBeExecutedOnceScheduleIntervalShouldBeExecutedEv
             var subscriptions = new Subscriptions();
             var queue = new ConcurrentQueueActionQueue();
             var fiber = new PoolFiber(new ThreadPoolAdapter(queue));
-            var timer2 = new IntervalThreadingTimer();
 
             var scheduleFired = 0;
             var scheduleOnIntervalFired = 0;
@@ -60,7 +59,16 @@ public void ScheduledTasksShouldBeExecutedOnceScheduleIntervalShouldBeExecutedEv
             });
             var subscriptionFiber = subscriptions.BeginSubscription();
             var cancellation = new CancellationTokenSource();
-            timer2.ScheduleOnInterval(fiber, () => scheduleOnIntervalFired++, 100, 500, cancellation.Token);
+            var token = cancellation.Token;
+            _ = Task.Run(async () =>
+            {
+                await Task.Delay(100, token);
+                while (!cancellation.Token.IsCancellationRequested)
+                {
+                    fiber.Enqueue(() => scheduleOnIntervalFired++);
+                    await Task.Delay(500, token);
+                }
+            });
             subscriptionFiber.AppendDisposable(cancellation);
 
             // add to the pending list.
@@ -79,7 +87,6 @@ public void ScheduledTasksShouldBeExecutedOnceScheduleIntervalShouldBeExecutedEv
             Assert.AreEqual(2, scheduleOnIntervalFired);
 
             subscriptionFiber.Dispose();
-            timer2.Dispose();
 
             // The regularInMs has passed after dispose.
             Thread.Sleep(500);

src/AsyncFiberWorks/Core/IIntervalTimer.cs

@@ -76,39 +76,6 @@ public async Task EnqueueTest(Func<IFiber> fiberCreator)
             Assert.AreEqual(120, counter);
         }
 
-        [Test]
-        [TestCaseSource(typeof(MyDataClass), nameof(MyDataClass.AllFibers))]
-        public async Task RepeatingTimer(Func<IFiber> fiberCreator)
-        {
-            var fiber = fiberCreator();
-            var timer = new IntervalThreadingTimer();
-
-            var sw = Stopwatch.StartNew();
-            int counter = 0;
-            timer.ScheduleOnInterval(fiber, async () =>
-            {
-                await Task.Yield();
-                counter += 1;
-                Console.WriteLine($"cb{sw.Elapsed}");
-            }, 250, 500);
-            Console.WriteLine($"as{sw.Elapsed}");
-            Assert.AreEqual(0, counter);
-            await Task.Delay(500).ConfigureAwait(false);
-            Console.WriteLine($"as{sw.Elapsed}");
-            Assert.AreEqual(1, counter);
-            await Task.Delay(500).ConfigureAwait(false);
-            Console.WriteLine($"as{sw.Elapsed}");
-            Assert.AreEqual(2, counter);
-            await Task.Delay(500).ConfigureAwait(false);
-            Console.WriteLine($"as{sw.Elapsed}");
-            Assert.AreEqual(3, counter);
-            timer.Dispose();
-            await Task.Delay(500).ConfigureAwait(false);
-            Console.WriteLine($"as{sw.Elapsed}");
-            Assert.AreEqual(3, counter);
-            timer.Dispose();
-        }
-
         [Test]
         [TestCaseSource(typeof(MyDataClass), nameof(MyDataClass.AllFibers))]
         public async Task EnqueueTaskAsyncTest(Func<IFiber> fiberCreator)

src/AsyncFiberWorks/Timers/TimerExtensions.cs

@@ -1,7 +1,5 @@
-using AsyncFiberWorks.Core;
 using AsyncFiberWorks.Fibers;
-using AsyncFiberWorks.Timers;
-using AsyncFiberWorks.Windows.Timer;
+using AsyncFiberWorks.Windows.Timers;
 using NUnit.Framework;
 using System;
 using System.Threading;
@@ -12,10 +10,10 @@ namespace AsyncFiberWorksTests
     [TestFixture]
     public class TimerActionTests
     {
-        [Test, TestCaseSource(nameof(IntervalTimers))]
-        public void CallbackFromIntervalTimerWithCancel(Func<IIntervalTimer> timerCreator)
+        [Test]
+        public void CallbackFromIntervalTimerWithCancel()
         {
-            var timer = timerCreator();
+            var timer = new IntervalThreadingTimer();
             var fiber = new PoolFiber();
             long counterOnTimer = 0;
             Action actionOnTimer = () => { counterOnTimer++; };
@@ -43,14 +41,6 @@ public void CallbackFromIntervalTimerWithCancel(Func<IIntervalTimer> timerCreato
             timer.Dispose();
         }
 
-        static object[] IntervalTimers =
-        {
-            new object[] { (Func<IIntervalTimer>)(() => new IntervalThreadingTimer()) },
-#if NETFRAMEWORK || WINDOWS
-            new object[] { (Func<IIntervalTimer>)(() => new IntervalWaitableTimerEx()) },
-#endif
-        };
-
 #if NETFRAMEWORK || WINDOWS
         [Test]
         public async Task CancelWaitableTimer()