Use safer approach for calculating the time span

IT-VBFK · Nov 28, 2022 · d2ef03e · d2ef03e
1 parent 35444f6
commit d2ef03e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Src/FluentAssertions/Extensions/FluentTimeSpanExtensions.cs b/Src/FluentAssertions/Extensions/FluentTimeSpanExtensions.cs
@@ -52,7 +52,7 @@ public static TimeSpan Ticks(this long ticks)
     /// </summary>
     internal static TimeSpan AddTicks(this TimeSpan timeSpan, int ticks)
     {
-        return TimeSpan.FromTicks(timeSpan.Ticks + ticks);
+        return timeSpan + ticks.Ticks();
     }
 
     /// <summary>

diff --git a/Src/FluentAssertions/Primitives/TimeOnlyAssertions.cs b/Src/FluentAssertions/Primitives/TimeOnlyAssertions.cs
@@ -154,7 +154,7 @@ public AndConstraint<TAssertions> Be(TimeOnly? expected, string because = "", pa
         }
 
         TimeOnly minimumValue = nearbyTime.Add(-precision);
-        TimeOnly maximumValue = nearbyTime.Add((precision == TimeSpan.MaxValue) ? precision : precision.AddTicks(1));
+        TimeOnly maximumValue = nearbyTime.Add(precision.AddTicks(1));
 
         TimeSpan? difference = (Subject != null)
             ? MinimumDifference(Subject.Value, nearbyTime)
@@ -208,7 +208,7 @@ public AndConstraint<TAssertions> Be(TimeOnly? expected, string because = "", pa
         }
 
         TimeOnly minimumValue = distantTime.Add(-precision);
-        TimeOnly maximumValue = distantTime.Add((precision == TimeSpan.MaxValue) ? precision : precision.AddTicks(1));
+        TimeOnly maximumValue = distantTime.Add(precision.AddTicks(1));
 
         Execute.Assertion
             .BecauseOf(because, becauseArgs)

diff --git a/Tests/FluentAssertions.Specs/Primitives/TimeOnlyAssertionSpecs.cs b/Tests/FluentAssertions.Specs/Primitives/TimeOnlyAssertionSpecs.cs
@@ -294,8 +294,11 @@ public void A_precision_of_maximum_time_span_does_not_overflow()
             TimeOnly time = new TimeOnly(23, 59, 0);
             TimeOnly nearbyTime = new TimeOnly(0, 1, 0);
 
-            // Act / Assert
-            time.Should().BeCloseTo(nearbyTime, TimeSpan.MaxValue);
+            // Act
+            Actionn act = () => time.Should().BeCloseTo(nearbyTime, TimeSpan.MaxValue);
+
+            // Assert
+            act.Should().Throw<OverflowException>();
         }
 
         [Fact]
@@ -464,7 +467,7 @@ public void A_precision_of_maximum_time_span_does_not_overflow()
             Action act = () => time.Should().NotBeCloseTo(nearbyTime, TimeSpan.MaxValue);
 
             // Assert
-            act.Should().Throw<XunitException>();
+            act.Should().Throw<OverflowException>();
         }
 
         [Fact]