From b347cc88aa1908c6d150230d38e068cd9c33e420 Mon Sep 17 00:00:00 2001 From: Jaculabilis Date: Tue, 29 Mar 2022 20:49:33 -0700 Subject: [PATCH] Make TestCaseBuilder reusable --- MultiversalDiplomacyTests/MovementAdjudicatorTest.cs | 2 -- MultiversalDiplomacyTests/TestCaseBuilder.cs | 3 +++ MultiversalDiplomacyTests/TimeTravelTest.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs b/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs index 5ffaadb..149b92c 100644 --- a/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs +++ b/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs @@ -212,7 +212,6 @@ public class MovementAdjudicatorTest Assert.That(u2.Past, Is.EqualTo(mun1.Order.Unit)); Assert.That(u2.Season, Is.EqualTo(s2)); - setup = new(updated); setup[(1, 0)] ["Germany"] .Army("Mun").Holds().GetReference(out var mun2); @@ -263,7 +262,6 @@ public class MovementAdjudicatorTest Assert.That(u2.Past, Is.EqualTo(mun1.Order.Unit)); Assert.That(u2.Season, Is.EqualTo(s2)); - setup = new(updated); setup[(1, 0)] ["Germany"] .Army("Tyr").MovesTo("Mun").GetReference(out var tyr2); diff --git a/MultiversalDiplomacyTests/TestCaseBuilder.cs b/MultiversalDiplomacyTests/TestCaseBuilder.cs index 9698f87..8d11680 100644 --- a/MultiversalDiplomacyTests/TestCaseBuilder.cs +++ b/MultiversalDiplomacyTests/TestCaseBuilder.cs @@ -258,6 +258,7 @@ public class TestCaseBuilder public List ValidateOrders(IPhaseAdjudicator adjudicator) { this.ValidationResults = adjudicator.ValidateOrders(this.World, this.Orders.ToList()); + this.OrderList.Clear(); return this.ValidationResults; } @@ -273,6 +274,7 @@ public class TestCaseBuilder .Select(validation => validation.Order) .ToList(); this.AdjudicationResults = adjudicator.AdjudicateOrders(this.World, orders); + this.ValidationResults = null; return this.AdjudicationResults; } @@ -284,6 +286,7 @@ public class TestCaseBuilder } this.World = adjudicator.UpdateWorld(this.World, this.AdjudicationResults); + this.AdjudicationResults = null; return this.World; } diff --git a/MultiversalDiplomacyTests/TimeTravelTest.cs b/MultiversalDiplomacyTests/TimeTravelTest.cs index d6b9945..ffe80fa 100644 --- a/MultiversalDiplomacyTests/TimeTravelTest.cs +++ b/MultiversalDiplomacyTests/TimeTravelTest.cs @@ -21,7 +21,7 @@ public class TimeTravelTest setup.ValidateOrders(MovementPhaseAdjudicator.Instance); setup.AdjudicateOrders(MovementPhaseAdjudicator.Instance); - setup = new(setup.UpdateWorld(MovementPhaseAdjudicator.Instance)); + setup.UpdateWorld(MovementPhaseAdjudicator.Instance); // Move into the past of the same timeline. setup[(1, 0)]