Infört Assert class och förenklat koden

This commit is contained in:
2019-11-18 23:31:09 +01:00
parent eef116b5f6
commit 094b1dfc34
2 changed files with 14 additions and 52 deletions

View File

@ -22,19 +22,18 @@ namespace TestRunner
/// </summary> /// </summary>
public partial class MainWindow : Window public partial class MainWindow : Window
{ {
private ObservableCollection<TestingLib.UnitTestInfo> _results = new ObservableCollection<UnitTestInfo>(); public MainWindow()
public MainWindow()
{ {
InitializeComponent(); InitializeComponent();
this.DataContext = _results; this.DataContext = TestingLib.Assert.TestResults;
} }
private void ButtonBase_OnClick(object sender, RoutedEventArgs e) private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
{ {
var testClass = new TestingLib.TestThePaymentDate(); var testClass = new TestingLib.TestThePaymentDate();
_results.Add( testClass.DateIs30DaysInFuture()); testClass.DateIs30DaysInFuture();
_results.Add(testClass.ReturnsMondayIfProposedIsSaturday()); testClass.ReturnsMondayIfProposedIsSaturday();
_results.Add(testClass.ReturnsMondayIfProposedIsSunday()); testClass.ReturnsMondayIfProposedIsSunday();
} }
} }

View File

@ -7,70 +7,33 @@ namespace TestingLib
{ {
public class TestThePaymentDate public class TestThePaymentDate
{ {
public UnitTestInfo DateIs30DaysInFuture() public void DateIs30DaysInFuture()
{ {
var testInfo = new UnitTestInfo();
var pd = new SUT.PaymentSystem.PaymentDate(); var pd = new SUT.PaymentSystem.PaymentDate();
var sampleDate = DateTime.Parse("2019-12-16"); var sampleDate = DateTime.Parse("2019-12-16");
var futureDate = pd.CalculateFuturePaymentDate(sampleDate); var futureDate = pd.CalculateFuturePaymentDate(sampleDate);
if (futureDate.Equals(sampleDate.AddDays(30))) Assert.AreEqual(futureDate, sampleDate.AddDays(30), $"Expected date is not 30 days in the future.");
{
testInfo.DidTestPass = true;
}
else
{
testInfo.DidTestPass = false;
testInfo.TestFailureMessage = $"Expected date is not 30 days in the future.";
}
testInfo.MethodName = "DateIs30DaysInFuture";
return testInfo;
} }
public UnitTestInfo ReturnsMondayIfProposedIsSunday() public void ReturnsMondayIfProposedIsSunday()
{ {
var testInfo = new UnitTestInfo();
var pd = new SUT.PaymentSystem.PaymentDate(); 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); 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 = "ReturnsMondayIfProposedIsSunday";
return testInfo;
} }
public UnitTestInfo ReturnsMondayIfProposedIsSaturday() public void ReturnsMondayIfProposedIsSaturday()
{ {
var testInfo = new UnitTestInfo();
var pd = new SUT.PaymentSystem.PaymentDate(); 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); 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;
} }
} }