Added equality/comparison overloads for Duration and TimeSpan (#171)

* Added equality overloads for Duration and TimeSpan
angularsen · Jun 28, 2016 · d9b388c · d9b388c · angularsen · Jun 28, 2016
1 parent 8370a1b
commit d9b388c
Show file tree

Hide file tree

Showing 2 changed files with 157 additions and 1 deletion.
diff --git a/UnitsNet.Tests/CustomCode/DurationTests.cs b/UnitsNet.Tests/CustomCode/DurationTests.cs
@@ -65,7 +65,7 @@ public static void ToTimeSpanShouldNotThrowExceptionOnValuesSlightlyLargerThanTi
         {
             Duration duration = Duration.FromSeconds(TimeSpan.MinValue.TotalSeconds + 1);
             TimeSpan timeSpan = duration.ToTimeSpan();
-            Assert.AreEqual(duration.Seconds, timeSpan.TotalSeconds,1e-3);
+            Assert.AreEqual(duration.Seconds, timeSpan.TotalSeconds, 1e-3);
         }
 
         [Test]
@@ -111,5 +111,101 @@ public static void DateTimeMinusDurationReturnsDateTime()
             DateTime expected = new DateTime(2016, 1, 1);
             Assert.AreEqual(expected, result);
         }
+
+        [Test]
+        public static void TimeSpanLessThanDurationShouldReturnCorrectly()
+        {
+            TimeSpan timeSpan = TimeSpan.FromHours(10);
+            Duration duration = Duration.FromHours(11);
+            Assert.IsTrue(timeSpan < duration, "timeSpan should be less than duration");
+        }
+
+        [Test]
+        public static void TimeSpanGreaterThanDurationShouldReturnCorrectly()
+        {
+            TimeSpan timeSpan = TimeSpan.FromHours(12);
+            Duration duration = Duration.FromHours(11);
+            Assert.IsTrue(timeSpan > duration, "timeSpan should be greater than duration");
+        }
+
+        [Test]
+        public static void DurationLessThanTimeSpanShouldReturnCorrectly()
+        {
+            TimeSpan timeSpan = TimeSpan.FromHours(11);
+            Duration duration = Duration.FromHours(10);
+            Assert.IsTrue(duration < timeSpan, "duration should be less than timeSpan");
+        }
+
+        [Test]
+        public static void DurationGreaterThanTimeSpanShouldReturnCorrectly()
+        {
+            TimeSpan timeSpan = TimeSpan.FromHours(11);
+            Duration duration = Duration.FromHours(12);
+            Assert.IsTrue(duration > timeSpan, "duration should be greater than timeSpan");
+        }
+
+        [Test]
+        public static void TimeSpanLessOrEqualThanDurationShouldReturnCorrectly()
+        {
+            TimeSpan timeSpan = TimeSpan.FromHours(10);
+            Duration duration = Duration.FromHours(11);
+            Assert.IsTrue(timeSpan <= duration, "timeSpan should be less than duration");
+        }
+
+        [Test]
+        public static void TimeSpanGreaterThanOrEqualDurationShouldReturnCorrectly()
+        {
+            TimeSpan timeSpan = TimeSpan.FromHours(12);
+            Duration duration = Duration.FromHours(11);
+            Assert.IsTrue(timeSpan >= duration, "timeSpan should be greater than duration");
+        }
+
+        [Test]
+        public static void DurationLessThanOrEqualTimeSpanShouldReturnCorrectly()
+        {
+            TimeSpan timeSpan = TimeSpan.FromHours(11);
+            Duration duration = Duration.FromHours(10);
+            Assert.IsTrue(duration <= timeSpan, "duration should be less than timeSpan");
+        }
+
+        [Test]
+        public static void DurationGreaterThanOrEqualTimeSpanShouldReturnCorrectly()
+        {
+            TimeSpan timeSpan = TimeSpan.FromHours(11);
+            Duration duration = Duration.FromHours(12);
+            Assert.IsTrue(duration >= timeSpan, "duration should be greater than timeSpan");
+        }
+
+        [Test]
+        public static void DurationEqualToTimeSpanShouldReturnCorrectly()
+        {
+            TimeSpan timeSpan = TimeSpan.FromHours(11);
+            Duration duration = Duration.FromHours(11);
+            Assert.IsTrue(duration == timeSpan, "duration should be equal to timeSpan");
+        }
+
+        [Test]
+        public static void TimeSpanEqualToDurationShouldReturnCorrectly()
+        {
+            TimeSpan timeSpan = TimeSpan.FromHours(11);
+            Duration duration = Duration.FromHours(11);
+            Assert.IsTrue(timeSpan == duration, "timeSpan should be equal to duration");
+        }
+
+        [Test]
+        public static void DurationNotEqualToTimeSpanShouldReturnCorrectly()
+        {
+            TimeSpan timeSpan = TimeSpan.FromHours(12);
+            Duration duration = Duration.FromHours(11);
+            Assert.IsTrue(duration != timeSpan, "duration should not be equal to timeSpan");
+        }
+
+        [Test]
+        public static void TimeSpanNotEqualToDurationShouldReturnCorrectly()
+        {
+            TimeSpan timeSpan = TimeSpan.FromHours(12);
+            Duration duration = Duration.FromHours(11);
+            Assert.IsTrue(timeSpan != duration, "timeSpan should not be equal to duration");
+        }
     }
 }
diff --git a/UnitsNet/CustomCode/UnitClasses/Duration.extra.cs b/UnitsNet/CustomCode/UnitClasses/Duration.extra.cs
@@ -50,6 +50,66 @@ public static explicit operator Duration(TimeSpan duration)
         {
             return FromSeconds(duration.TotalSeconds);
         }
+
+        public static bool operator <(Duration duration, TimeSpan timeSpan)
+        {
+            return duration.Seconds < timeSpan.TotalSeconds;
+        }
+
+        public static bool operator >(Duration duration, TimeSpan timeSpan)
+        {
+            return duration.Seconds > timeSpan.TotalSeconds;
+        }
+
+        public static bool operator <=(Duration duration, TimeSpan timeSpan)
+        {
+            return duration.Seconds <= timeSpan.TotalSeconds;
+        }
+
+        public static bool operator >=(Duration duration, TimeSpan timeSpan)
+        {
+            return duration.Seconds >= timeSpan.TotalSeconds;
+        }
+
+        public static bool operator ==(Duration duration, TimeSpan timeSpan)
+        {
+            return duration.Seconds == timeSpan.TotalSeconds;
+        }
+
+        public static bool operator !=(Duration duration, TimeSpan timeSpan)
+        {
+            return duration.Seconds != timeSpan.TotalSeconds;
+        }
+
+        public static bool operator <(TimeSpan timeSpan, Duration duration)
+        {
+            return timeSpan.TotalSeconds < duration.Seconds;
+        }
+
+        public static bool operator >(TimeSpan timeSpan, Duration duration)
+        {
+            return timeSpan.TotalSeconds > duration.Seconds;
+        }
+
+        public static bool operator <=(TimeSpan timeSpan, Duration duration)
+        {
+            return timeSpan.TotalSeconds <= duration.Seconds;
+        }
+
+        public static bool operator >=(TimeSpan timeSpan, Duration duration)
+        {
+            return timeSpan.TotalSeconds >= duration.Seconds;
+        }
+
+        public static bool operator ==(TimeSpan timeSpan, Duration duration)
+        {
+            return timeSpan.TotalSeconds == duration.Seconds;
+        }
+
+        public static bool operator !=(TimeSpan timeSpan, Duration duration)
+        {
+            return timeSpan.TotalSeconds != duration.Seconds;
+        }
 #endif
 
         /// <summary>