Changed Between behaviour in EverydayUnit.

Author: VitorCioletti

FluentScheduler.UnitTests/Fluent/3.Duration/EverydayUnitTests.cs

@@ -74,27 +74,26 @@ public void AtTimeSpan()
     public void AtMultipleTimeSpan()
     {
         // Arrange
-        var now = new DateTime(2025, 8, 20, 10, 0, 0);
-        var expected = new DateTime(2025, 8, 20, 15, 0, 0);
-
         var timeSpans = new TimeSpan[] { new(15, 0, 0), new(16, 0, 0), new(17, 0, 0) };
+        var now = new DateTime(2025, 8, 20, 10, 0, 0);
+        var expected = new DateTime(2025, 8, 20).Add(timeSpans[0]);
 
         var fluentCalculator = new FluentTimeCalculator();
         var calculator = (ITimeCalculator)fluentCalculator;
-        var run = new EverydayUnit(fluentCalculator);
+        var run = new RunSpecifier(fluentCalculator);
 
         calculator.Now = () => now;
 
         // Act
-        run.At(timeSpans);
+        run.Everyday().At(timeSpans);
         var calculated = calculator.Calculate(now)!;
 
         // Assert
         Equal(expected, calculated.Value);
-
+        
         // Arrange
         now = now.AddHours(5.1);
-        expected = expected.AddHours(1);
+        expected = expected.Date.Add(timeSpans[1]);
 
         // Act
         calculated = calculator.Calculate(now)!;
@@ -104,7 +103,49 @@ public void AtMultipleTimeSpan()
 
         // Arrange
         now = now.AddHours(1.1);
-        expected = expected.AddHours(1);
+        expected = expected.Date.Add(timeSpans[2]);
+
+        // Act
+        calculated = calculator.Calculate(now)!;
+
+        // Assert
+        Equal(expected, calculated.Value);
+
+        // Arrange
+        now = now.AddHours(1.1);
+        expected = new DateTime(2025, 8, 21, 15, 0, 0);
+
+        // Act
+        calculated = calculator.Calculate(now)!;
+
+        // Assert
+        Equal(expected, calculated.Value);
+    }
+    
+    [Fact]
+    public void AtMultipleTimeSpan2()
+    {
+        // Arrange
+        var timeSpans = new TimeSpan[] { new(15, 0, 0), new(16, 0, 0), new(17, 0, 0) };
+        var now = new DateTime(2025, 8, 20, 15, 1, 0);
+        var expected = new DateTime(2025, 8, 20).Add(timeSpans[1]);
+
+        var fluentCalculator = new FluentTimeCalculator();
+        var calculator = (ITimeCalculator)fluentCalculator;
+        var run = new RunSpecifier(fluentCalculator);
+
+        calculator.Now = () => now;
+
+        // Act
+        run.Everyday().At(timeSpans);
+        var calculated = calculator.Calculate(now)!;
+
+        // Assert
+        Equal(expected, calculated.Value);
+        
+        // Arrange
+        now = now.AddHours(1.1);
+        expected = expected.Date.Add(timeSpans[2]);
 
         // Act
         calculated = calculator.Calculate(now)!;
@@ -158,14 +199,11 @@ public void AtMultipleNullTimeSpan()
     }
 
     [Fact]
-    public void Between17and19TimeSpan()
+    public void EverydayAt15()
     {
         // Arrange
-        var now = new DateTime(2025, 08, 24, 16, 30, 0);
-        var expectedDate = new DateTime(2025, 08, 24, 17, 30, 0);
-
-        var from = new TimeSpan(17, 30, 0);
-        var to = new TimeSpan(19, 30, 0);
+        var now = new DateTime(2025, 08, 24, 14, 30, 0);
+        var expectedDate = new DateTime(2025, 08, 24, 15, 0, 0);
 
         var fluentCalculator = new FluentTimeCalculator();
         var calculator = (ITimeCalculator)fluentCalculator;
@@ -174,22 +212,28 @@ public void Between17and19TimeSpan()
         calculator.Now = () => now;
 
         // Act
-        run.Everyday().Between(from, to);
+        run.Everyday().At(15, 0);
         var calculated = calculator.Calculate(now)!;
 
         // Assert
         Equal(expectedDate, calculated.Value);
-    }
 
+        now = expectedDate;
+
+        calculated = calculator.Calculate(expectedDate)!;
+
+        expectedDate = expectedDate.AddDays(1);
+
+        // Assert
+        Equal(expectedDate, calculated.Value);
+    }
+    
     [Fact]
-    public void Between21and23TimeSpan()
+    public void EverydayAt16()
     {
         // Arrange
-        var now = new DateTime(2025, 8, 11, 23, 40, 0);
-        var expectedDate = new DateTime(2025, 08, 12, 21, 30, 0);
-
-        var from = new TimeSpan(21, 30, 0);
-        var to = new TimeSpan(23, 30, 0);
+        var now = new DateTime(2025, 08, 24, 16, 0, 0);
+        var expectedDate = new DateTime(2025, 08, 24, 16, 0, 0);
 
         var fluentCalculator = new FluentTimeCalculator();
         var calculator = (ITimeCalculator)fluentCalculator;
@@ -198,23 +242,31 @@ public void Between21and23TimeSpan()
         calculator.Now = () => now;
 
         // Act
-        run.Everyday().Between(from, to);
-
+        run.Everyday().At(16, 0);
         var calculated = calculator.Calculate(now)!;
 
         // Assert
         Equal(expectedDate, calculated.Value);
+
+        now = expectedDate;
+
+        calculated = calculator.Calculate(expectedDate)!;
+
+        expectedDate = expectedDate.AddDays(1);
+
+        // Assert
+        Equal(expectedDate, calculated.Value);
     }
 
     [Fact]
-    public void Between19and22TimeSpan()
+    public void Between17and19TimeSpan()
     {
         // Arrange
-        var now = new DateTime(2025, 08, 19, 23, 50, 0);
-        var expectedDate = new DateTime(2025, 08, 20, 19, 30, 0);
+        var now = new DateTime(2025, 08, 24, 16, 30, 0);
+        var expectedDate = new DateTime(2025, 08, 24, 17, 30, 0);
 
-        var from = new TimeSpan(19, 30, 0);
-        var to = new TimeSpan(22, 30, 0);
+        var from = new TimeSpan(17, 30, 0);
+        var to = new TimeSpan(19, 30, 0);
 
         var fluentCalculator = new FluentTimeCalculator();
         var calculator = (ITimeCalculator)fluentCalculator;
@@ -228,19 +280,28 @@ public void Between19and22TimeSpan()
 
         // Assert
         Equal(expectedDate, calculated.Value);
+    }
 
-        now = expectedDate.AddMinutes(5);
-        expectedDate = now;
+    [Fact]
+    public void Between21and23TimeSpan()
+    {
+        // Arrange
+        var now = new DateTime(2025, 09, 10, 23, 40, 0);
+        var expectedDate = new DateTime(2025, 09, 10, 21, 30, 0);
 
-        calculated = calculator.Calculate(now)!;
+        var from = new TimeSpan(21, 30, 0);
+        var to = new TimeSpan(23, 30, 0);
 
-        // Assert
-        Equal(expectedDate, calculated.Value);
+        var fluentCalculator = new FluentTimeCalculator();
+        var calculator = (ITimeCalculator)fluentCalculator;
+        var run = new RunSpecifier(fluentCalculator);
+
+        calculator.Now = () => now;
 
-        now = new DateTime(2025, 08, 20).Add(to).AddMinutes(1);
-        expectedDate = new DateTime(2025, 08, 21).Add(from);
+        // Act
+        run.Everyday().Between(from, to);
 
-        calculated = calculator.Calculate(now)!;
+        var calculated = calculator.Calculate(now)!;
 
         // Assert
         Equal(expectedDate, calculated.Value);
@@ -269,31 +330,8 @@ public void Between23and2TimeSpan()
         // Assert
         Equal(expectedDate, calculated.Value);
 
-        // Arrange
-        now = now.AddHours(1);
-        expectedDate = now;
-
-        // Act
-        calculated = calculator.Calculate(now)!;
-
-        // Assert
-        Equal(expectedDate, calculated.Value);
-
-        // Arrange
-        now = now.AddHours(2);
-        expectedDate = now;
+        expectedDate = expectedDate.AddDays(1);
 
-        // Act
-        calculated = calculator.Calculate(now)!;
-
-        // Assert
-        Equal(expectedDate, calculated.Value);
-
-        // Arrange
-        now = now.AddHours(6);
-        expectedDate = new DateTime(2025, 08, 25, 23, 0, 0);
-
-        // Act
         calculated = calculator.Calculate(now)!;
 
         // Assert
@@ -320,31 +358,8 @@ public void Between23and2()
         // Assert
         Equal(expectedDate, calculated.Value);
 
-        // Arrange
-        now = now.AddHours(1);
-        expectedDate = now;
+        expectedDate = expectedDate.AddDays(1);
 
-        // Act
-        calculated = calculator.Calculate(now)!;
-
-        // Assert
-        Equal(expectedDate, calculated.Value);
-
-        // Arrange
-        now = now.AddHours(2);
-        expectedDate = now;
-
-        // Act
-        calculated = calculator.Calculate(now)!;
-
-        // Assert
-        Equal(expectedDate, calculated.Value);
-
-        // Arrange
-        now = now.AddHours(6);
-        expectedDate = new DateTime(2025, 08, 25, 23, 0, 0);
-
-        // Act
         calculated = calculator.Calculate(now)!;
 
         // Assert
@@ -355,8 +370,8 @@ public void Between23and2()
     public void Between19and22()
     {
         // Arrange
-        var now = new DateTime(2025, 08, 19, 23, 50, 0);
-        var expectedDate = new DateTime(2025, 08, 20, 19, 30, 0);
+        var now = new DateTime(2025, 08, 24, 20, 0, 0);
+        var expectedDate = new DateTime(2025, 08, 24, 20, 0, 0);
 
         var fluentCalculator = new FluentTimeCalculator();
         var calculator = (ITimeCalculator)fluentCalculator;
@@ -365,24 +380,22 @@ public void Between19and22()
         calculator.Now = () => now;
 
         // Act
-        run.Everyday().Between(19, 30, 22, 30);
+        run.Everyday().Between(19, 0, 22, 0);
         var calculated = calculator.Calculate(now)!;
 
         // Assert
         Equal(expectedDate, calculated.Value);
 
-        now = expectedDate.AddMinutes(5);
-        expectedDate = now;
+        calculated = calculator.Calculate(expectedDate)!;
 
-        calculated = calculator.Calculate(now)!;
+        expectedDate = expectedDate.Date.AddDays(1).Add(new TimeSpan(19, 0, 0));
 
         // Assert
         Equal(expectedDate, calculated.Value);
 
-        now = new DateTime(2025, 08, 20).Add(new TimeSpan(22, 30, 0)).AddMinutes(1);
-        expectedDate = new DateTime(2025, 08, 21).Add(new TimeSpan(19, 30, 0));
+        calculated = calculator.Calculate(expectedDate)!;
 
-        calculated = calculator.Calculate(now)!;
+        expectedDate = expectedDate.AddDays(1);
 
         // Assert
         Equal(expectedDate, calculated.Value);

FluentScheduler/Fluent/3.Duration/EverydayUnit.cs

@@ -20,12 +20,12 @@ public void At(int hour, int minute)
     {
         ThrowHelper.ThrowIfOutOfMilitaryTimeRange(hour, minute);
 
-        _calculator.PeriodCalculations.Add(_ =>
+        _calculator.PeriodCalculations.Add(last =>
         {
             ITimeCalculator timeCalculator = _calculator;
             var now = timeCalculator.Now();
 
-            var next = new DateTime(now.Year, now.Month, now.Day, hour, minute, 0);
+            var next = new DateTime(last.Year, last.Month, last.Day, hour, minute, 0);
 
             return now > next ? next.AddDays(1) : next;
         });
@@ -84,43 +84,17 @@ public void Between(TimeSpan from, TimeSpan to)
             throw new ArgumentException($"The parameters '{nameof(from)}' and '{nameof(to)}' must not be equal.");
 
         _calculator.PeriodCalculations.Add(
-            _ =>
+            last =>
             {
-                ITimeCalculator timeCalculator = _calculator;
-                var now = timeCalculator.Now();
-
-                var doesNotCrossMidnight = from < to;
+                var fromDate = new DateTime(last.Year, last.Month, last.Day).Add(from);
+                var toDate = new DateTime(last.Year, last.Month, last.Day).Add(to);
+                var now = ((ITimeCalculator)_calculator).Now();
 
-                DateTime next;
+                var next = new DateTime(last.Year, last.Month, last.Day).Add(from);
 
-                if (doesNotCrossMidnight)
+                if (now >= fromDate && now <= toDate)
                 {
-                    var startToday = now.Date.Add(from);
-                    var endToday = now.Date.Add(to);
-
-                    var nowBetweenStartAndEnd = now >= startToday && now < endToday;
-
-                    if (nowBetweenStartAndEnd)
-                        next = now;
-                    else
-                        next = now < startToday ? startToday : startToday.AddDays(1);
-                }
-                else
-                {
-                    var startYesterday = now.Date.AddDays(-1).Add(from);
-                    var endToday = now.Date.Add(to);
-
-                    var startToday = now.Date.Add(from);
-                    var endTomorrow = now.Date.AddDays(1).Add(to);
-
-                    var nowBetweenStartAndEnd =
-                        (now >= startYesterday && now < endToday) ||
-                        (now >= startToday && now < endTomorrow);
-
-                    if (nowBetweenStartAndEnd)
-                        next = now;
-                    else
-                        next = now < startToday ? startToday : startToday.AddDays(1);
+                    next = now;
                 }
 
                 return next;