From 094b1dfc34e38c3f25b9cbdb0fb949bef8f6a2a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tommy=20=C3=96man?= <tommy.oman@gmail.com>
Date: Mon, 18 Nov 2019 23:31:09 +0100
Subject: [PATCH] =?UTF-8?q?Inf=C3=B6rt=20Assert=20class=20och=20f=C3=B6ren?=
 =?UTF-8?q?klat=20koden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TestRunner/MainWindow.xaml.cs    | 11 +++----
 TestingLib/TestThePaymentDate.cs | 55 ++++++--------------------------
 2 files changed, 14 insertions(+), 52 deletions(-)

diff --git a/TestRunner/MainWindow.xaml.cs b/TestRunner/MainWindow.xaml.cs
index fdf7f7a..eaaa4ed 100644
--- a/TestRunner/MainWindow.xaml.cs
+++ b/TestRunner/MainWindow.xaml.cs
@@ -22,19 +22,18 @@ namespace TestRunner
     /// </summary>
     public partial class MainWindow : Window
     {
-        private ObservableCollection<TestingLib.UnitTestInfo> _results = new ObservableCollection<UnitTestInfo>();
-        public MainWindow()
+         public MainWindow()
         {
             InitializeComponent();
-            this.DataContext = _results;
+            this.DataContext = TestingLib.Assert.TestResults;
         }
 
         private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
         {
             var testClass = new TestingLib.TestThePaymentDate();
-            _results.Add( testClass.DateIs30DaysInFuture());
-            _results.Add(testClass.ReturnsMondayIfProposedIsSaturday());
-            _results.Add(testClass.ReturnsMondayIfProposedIsSunday());
+            testClass.DateIs30DaysInFuture();
+            testClass.ReturnsMondayIfProposedIsSaturday();
+            testClass.ReturnsMondayIfProposedIsSunday();
 
         }
     }
diff --git a/TestingLib/TestThePaymentDate.cs b/TestingLib/TestThePaymentDate.cs
index 0ebd8e3..4065763 100644
--- a/TestingLib/TestThePaymentDate.cs
+++ b/TestingLib/TestThePaymentDate.cs
@@ -7,70 +7,33 @@ namespace TestingLib
 {
     public class TestThePaymentDate
     {
-        public UnitTestInfo DateIs30DaysInFuture()
+        public void DateIs30DaysInFuture()
         {
-            var testInfo = new UnitTestInfo();
-
             var pd = new SUT.PaymentSystem.PaymentDate();
             var sampleDate = DateTime.Parse("2019-12-16");
 
             var futureDate = pd.CalculateFuturePaymentDate(sampleDate);
 
-            if (futureDate.Equals(sampleDate.AddDays(30)))
-            {
-                testInfo.DidTestPass = true;
-            }
-            else
-            {
-                testInfo.DidTestPass = false;
-                testInfo.TestFailureMessage = $"Expected date is not 30 days in the future.";
-            }
-            testInfo.MethodName = "DateIs30DaysInFuture";
-            return testInfo;
+            Assert.AreEqual(futureDate, sampleDate.AddDays(30), $"Expected date is not 30 days in the future.");
+
         }
-        public UnitTestInfo ReturnsMondayIfProposedIsSunday()
+        public void ReturnsMondayIfProposedIsSunday()
         {
-            var testInfo = new UnitTestInfo();
 
             var pd = new SUT.PaymentSystem.PaymentDate();
-            var sampleDate = DateTime.Parse("2019-12-17");
+            var sampleDate = DateTime.Parse("2019-12-13");
 
             var futureDate = pd.CalculateFuturePaymentDate(sampleDate);
-
-            if (futureDate.DayOfWeek == DayOfWeek.Monday)
-            {
-                testInfo.DidTestPass = true;
-            }
-            else
-            {
-                testInfo.DidTestPass = false;
-                testInfo.TestFailureMessage = $"Expected date is not Monday.";
-            }
-
-            testInfo.MethodName = "ReturnsMondayIfProposedIsSunday";
-            return testInfo;
+            Assert.AreEqual(futureDate.DayOfWeek, DayOfWeek.Monday, $"Expected date is not Monday.");
         }
-        public UnitTestInfo ReturnsMondayIfProposedIsSaturday()
+        public void ReturnsMondayIfProposedIsSaturday()
         {
-            var testInfo = new UnitTestInfo();
-
             var pd = new SUT.PaymentSystem.PaymentDate();
-            var sampleDate = DateTime.Parse("2019-12-15");
+            var sampleDate = DateTime.Parse("2019-12-12");
 
             var futureDate = pd.CalculateFuturePaymentDate(sampleDate);
+            Assert.AreEqual(futureDate.DayOfWeek, DayOfWeek.Monday, $"Expected date is not Monday.");
 
-            if (futureDate.DayOfWeek == DayOfWeek.Monday)
-            {
-                testInfo.DidTestPass = true;
-            }
-            else
-            {
-                testInfo.DidTestPass = false;
-                testInfo.TestFailureMessage = $"Expected date is not Monday.";
-            }
-
-            testInfo.MethodName = "ReturnsMondayIfProposedIsSaturday";
-            return testInfo;
         }
 
     }