From abbe9291224f034a5c2ab14752003c4d83ff4c75 Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Thu, 15 Aug 2024 06:52:08 -0700 Subject: [PATCH] Designation -> Key --- .../Adjudicate/Decision/MovementDecisions.cs | 28 +++++++++---------- .../Adjudicate/MovementPhaseAdjudicator.cs | 26 ++++++++--------- MultiversalDiplomacy/Adjudicate/PathFinder.cs | 2 +- MultiversalDiplomacy/Model/Location.cs | 2 +- MultiversalDiplomacy/Model/Map.cs | 2 +- MultiversalDiplomacy/Model/Season.cs | 4 +-- MultiversalDiplomacy/Model/Unit.cs | 4 +-- MultiversalDiplomacy/Model/World.cs | 16 +++++------ .../Orders/SupportMoveOrder.cs | 2 +- MultiversalDiplomacyTests/MDATC_A.cs | 8 +++--- .../Model/TimelineFactoryTest.cs | 2 +- .../MovementAdjudicatorTest.cs | 8 +++--- .../SerializationTest.cs | 6 ++-- MultiversalDiplomacyTests/TestCaseBuilder.cs | 4 +-- .../TestCaseBuilderTest.cs | 4 +-- MultiversalDiplomacyTests/UnitTests.cs | 16 +++++------ 16 files changed, 67 insertions(+), 67 deletions(-) diff --git a/MultiversalDiplomacy/Adjudicate/Decision/MovementDecisions.cs b/MultiversalDiplomacy/Adjudicate/Decision/MovementDecisions.cs index 5b3e754..a85201c 100644 --- a/MultiversalDiplomacy/Adjudicate/Decision/MovementDecisions.cs +++ b/MultiversalDiplomacy/Adjudicate/Decision/MovementDecisions.cs @@ -47,7 +47,7 @@ public class MovementDecisions var submittedOrdersBySeason = orders.Cast().ToLookup(order => order.Unit.Season); foreach (var group in submittedOrdersBySeason) { - AdvanceTimeline[group.Key.Designation] = new(group.Key, group); + AdvanceTimeline[group.Key.Key] = new(group.Key, group); } // Create timeline decisions for each season potentially affected by the submitted orders. @@ -67,20 +67,20 @@ public class MovementDecisions case SupportHoldOrder supportHold: AdvanceTimeline.Ensure( - supportHold.Target.Season.Designation, - () => new(supportHold.Target.Season, world.OrderHistory[supportHold.Target.Season.Designation].Orders)); - AdvanceTimeline[supportHold.Target.Season.Designation].Orders.Add(supportHold); + supportHold.Target.Season.Key, + () => new(supportHold.Target.Season, world.OrderHistory[supportHold.Target.Season.Key].Orders)); + AdvanceTimeline[supportHold.Target.Season.Key].Orders.Add(supportHold); break; case SupportMoveOrder supportMove: AdvanceTimeline.Ensure( - supportMove.Target.Season.Designation, - () => new(supportMove.Target.Season, world.OrderHistory[supportMove.Target.Season.Designation].Orders)); - AdvanceTimeline[supportMove.Target.Season.Designation].Orders.Add(supportMove); + supportMove.Target.Season.Key, + () => new(supportMove.Target.Season, world.OrderHistory[supportMove.Target.Season.Key].Orders)); + AdvanceTimeline[supportMove.Target.Season.Key].Orders.Add(supportMove); AdvanceTimeline.Ensure( - supportMove.Season.Designation, - () => new(supportMove.Season, world.OrderHistory[supportMove.Season.Designation].Orders)); - AdvanceTimeline[supportMove.Season.Designation].Orders.Add(supportMove); + supportMove.Season.Key, + () => new(supportMove.Season, world.OrderHistory[supportMove.Season.Key].Orders)); + AdvanceTimeline[supportMove.Season.Key].Orders.Add(supportMove); break; } } @@ -92,7 +92,7 @@ public class MovementDecisions .ToList(); (Province province, string season) UnitPoint(Unit unit) - => (world.Map.GetLocation(unit.Location).Province, unit.Season.Designation); + => (world.Map.GetLocation(unit.Location).Province, unit.Season.Key); (Province province, string season) MovePoint(MoveOrder move) => (move.Province, move.Season); @@ -111,8 +111,8 @@ public class MovementDecisions && other.Province == world.Map.GetLocation(me.Unit).Province; bool AreOpposing(MoveOrder one, MoveOrder two) - => one.Season == two.Unit.Season.Designation - && two.Season == one.Unit.Season.Designation + => one.Season == two.Unit.Season.Key + && two.Season == one.Unit.Season.Key && one.Province == world.Map.GetLocation(two.Unit).Province && two.Province == world.Map.GetLocation(one.Unit).Province; @@ -173,7 +173,7 @@ public class MovementDecisions { // Ensure a hold strength decision exists for the target's destination. HoldStrength.Ensure( - (supportMove.Province, supportMove.Season.Designation), + (supportMove.Province, supportMove.Season.Key), () => new(supportMove.Province, supportMove.Season)); } } diff --git a/MultiversalDiplomacy/Adjudicate/MovementPhaseAdjudicator.cs b/MultiversalDiplomacy/Adjudicate/MovementPhaseAdjudicator.cs index 704fa0f..b8b6b9a 100644 --- a/MultiversalDiplomacy/Adjudicate/MovementPhaseAdjudicator.cs +++ b/MultiversalDiplomacy/Adjudicate/MovementPhaseAdjudicator.cs @@ -77,7 +77,7 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator // Trivial check: a unit cannot move to where it already is. AdjudicatorHelpers.InvalidateIfNotMatching( - order => !(order.Location.Designation == order.Unit.Location && order.Season == order.Unit.Season.Designation), + order => !(order.Location.Key == order.Unit.Location && order.Season == order.Unit.Season.Key), ValidationReason.DestinationMatchesOrigin, ref moveOrders, ref validationResults); @@ -138,7 +138,7 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator // Trivial check: cannot convoy a unit to its own location AdjudicatorHelpers.InvalidateIfNotMatching( order => !( - order.Location.Designation == order.Target.Location + order.Location.Key == order.Target.Location && order.Season == order.Target.Season), ValidationReason.DestinationMatchesOrigin, ref convoyOrders, @@ -337,7 +337,7 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator Season moveSeason = world.Seasons[doesMove.Order.Season]; if (doesMove.Outcome == true && createdFutures.TryGetValue(moveSeason, out Season? future)) { - Unit next = doesMove.Order.Unit.Next(doesMove.Order.Location.Designation, future); + Unit next = doesMove.Order.Unit.Next(doesMove.Order.Location.Key, future); logger.Log(3, "Advancing unit to {0}", next); createdUnits.Add(next); } @@ -366,7 +366,7 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator if (isDislodged.Outcome == false) { // Non-dislodged units continue into the future. - Unit next = order.Unit.Next(world.Map.GetLocation(order.Unit).Designation, future); + Unit next = order.Unit.Next(world.Map.GetLocation(order.Unit).Key, future); logger.Log(3, "Advancing unit to {0}", next); createdUnits.Add(next); } @@ -387,14 +387,14 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator Dictionary newHistory = []; foreach (UnitOrder unitOrder in decisions.OfType().Select(d => d.Order)) { - newHistory.Ensure(unitOrder.Unit.Season.Designation, () => new([], [], [])); - OrderHistory history = newHistory[unitOrder.Unit.Season.Designation]; + newHistory.Ensure(unitOrder.Unit.Season.Key, () => new([], [], [])); + OrderHistory history = newHistory[unitOrder.Unit.Season.Key]; // TODO does this add every order to every season?? history.Orders.Add(unitOrder); - history.IsDislodgedOutcomes[unitOrder.Unit.Designation] = dislodges[unitOrder.Unit].Outcome == true; + history.IsDislodgedOutcomes[unitOrder.Unit.Key] = dislodges[unitOrder.Unit].Outcome == true; if (unitOrder is MoveOrder moveOrder) { - history.DoesMoveOutcomes[moveOrder.Unit.Designation] = moves[moveOrder].Outcome == true; + history.DoesMoveOutcomes[moveOrder.Unit.Key] = moves[moveOrder].Outcome == true; } } @@ -493,8 +493,8 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator // The season target of a new (i.e. not previously adjudicated) and successful move always advances. IEnumerable newIncomingMoves = decision.Orders .OfType() - .Where(order => order.Season == decision.Season.Designation - && !world.OrderHistory[order.Season].DoesMoveOutcomes.ContainsKey(order.Unit.Designation)); + .Where(order => order.Season == decision.Season.Key + && !world.OrderHistory[order.Season].DoesMoveOutcomes.ContainsKey(order.Unit.Key)); foreach (MoveOrder moveOrder in newIncomingMoves) { DoesMove doesMove = decisions.DoesMove[moveOrder]; @@ -511,14 +511,14 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator // 1. The outcome of a dislodge decision is changed, // 2. The outcome of an intra-timeline move decision is changed, or // 3. The outcome of an inter-timeline move decision with that season as the destination is changed. - OrderHistory history = world.OrderHistory[decision.Season.Designation]; + OrderHistory history = world.OrderHistory[decision.Season.Key]; bool anyUnresolved = false; foreach (UnitOrder order in decision.Orders) { // TODO these aren't timeline-specific IsDislodged dislodged = decisions.IsDislodged[order.Unit]; progress |= ResolveDecision(dislodged, world, decisions, depth + 1); - if (history.IsDislodgedOutcomes.TryGetValue(order.Unit.Designation, out bool previous) + if (history.IsDislodgedOutcomes.TryGetValue(order.Unit.Key, out bool previous) && dislodged.Resolved && dislodged.Outcome != previous) { @@ -535,7 +535,7 @@ public class MovementPhaseAdjudicator : IPhaseAdjudicator { DoesMove moves = decisions.DoesMove[moveOrder]; progress |= ResolveDecision(moves, world, decisions, depth + 1); - if (history.DoesMoveOutcomes.TryGetValue(moveOrder.Unit.Designation, out bool previousMove) + if (history.DoesMoveOutcomes.TryGetValue(moveOrder.Unit.Key, out bool previousMove) && moves.Resolved && moves.Outcome != previousMove) if (moves.Resolved && moves.Outcome != previousMove) diff --git a/MultiversalDiplomacy/Adjudicate/PathFinder.cs b/MultiversalDiplomacy/Adjudicate/PathFinder.cs index 12c13e9..8d8d28d 100644 --- a/MultiversalDiplomacy/Adjudicate/PathFinder.cs +++ b/MultiversalDiplomacy/Adjudicate/PathFinder.cs @@ -69,7 +69,7 @@ public static class PathFinder // If not, add this location to the to-visit set if it isn't a coast, has a fleet, // and hasn't already been visited. if (!adjLocation.Province.Locations.Any(l => l.Type == LocationType.Land) - && fleets.ContainsKey((adjLocation.Designation, adjSeason)) + && fleets.ContainsKey((adjLocation.Key, adjSeason)) && !visited.Contains((adjLocation, adjSeason))) { toVisit.Enqueue((adjLocation, adjSeason)); diff --git a/MultiversalDiplomacy/Model/Location.cs b/MultiversalDiplomacy/Model/Location.cs index 65de76d..0e652e8 100644 --- a/MultiversalDiplomacy/Model/Location.cs +++ b/MultiversalDiplomacy/Model/Location.cs @@ -42,7 +42,7 @@ public class Location /// /// The unique name of this location in the map. /// - public string Designation => $"{this.ProvinceName}/{this.Abbreviation}"; + public string Key => $"{this.ProvinceName}/{this.Abbreviation}"; public Location(Province province, string name, string abbreviation, LocationType type) { diff --git a/MultiversalDiplomacy/Model/Map.cs b/MultiversalDiplomacy/Model/Map.cs index 0597dc4..823176d 100644 --- a/MultiversalDiplomacy/Model/Map.cs +++ b/MultiversalDiplomacy/Model/Map.cs @@ -34,7 +34,7 @@ public class Map LocationLookup = Provinces .SelectMany(province => province.Locations) - .ToDictionary(location => location.Designation); + .ToDictionary(location => location.Key); } /// diff --git a/MultiversalDiplomacy/Model/Season.cs b/MultiversalDiplomacy/Model/Season.cs index 4100517..91a4e10 100644 --- a/MultiversalDiplomacy/Model/Season.cs +++ b/MultiversalDiplomacy/Model/Season.cs @@ -35,7 +35,7 @@ public class Season(string? past, int turn, string timeline) /// The multiversal designation of this season. /// [JsonIgnore] - public string Designation => $"{this.Timeline}{this.Turn}"; + public string Key => $"{this.Timeline}{this.Turn}"; - public override string ToString() => Designation; + public override string ToString() => Key; } diff --git a/MultiversalDiplomacy/Model/Unit.cs b/MultiversalDiplomacy/Model/Unit.cs index 07ccd17..defa273 100644 --- a/MultiversalDiplomacy/Model/Unit.cs +++ b/MultiversalDiplomacy/Model/Unit.cs @@ -36,7 +36,7 @@ public class Unit /// A unique designation for this unit. /// [JsonIgnore] - public string Designation => $"{Type.ToShort()} {Season.Timeline}-{Location}@{Season.Turn}"; + public string Key => $"{Type.ToShort()} {Season.Timeline}-{Location}@{Season.Turn}"; public Unit(string? past, string location, Season season, Power power, UnitType type) { @@ -61,5 +61,5 @@ public class Unit /// Advance this unit's timeline to a new location and season. /// public Unit Next(string location, Season season) - => new(past: this.Designation, location, season, this.Power, this.Type); + => new(past: this.Key, location, season, this.Power, this.Type); } diff --git a/MultiversalDiplomacy/Model/World.cs b/MultiversalDiplomacy/Model/World.cs index 35814c4..e6effca 100644 --- a/MultiversalDiplomacy/Model/World.cs +++ b/MultiversalDiplomacy/Model/World.cs @@ -146,7 +146,7 @@ public class World Season a0 = new(past: null, Season.FIRST_TURN, timelines.NextTimeline()); return new World( map, - new() { {a0.Designation, a0} }, + new() { {a0.Key, a0} }, new([]), new([]), new(new Dictionary()), @@ -169,7 +169,7 @@ public class World previous: this, seasons: seasons == null ? this.Seasons - : new(seasons.ToDictionary(season => season.Designation)), + : new(seasons.ToDictionary(season => season.Key)), units: units == null ? this.Units : new(units.ToList()), @@ -202,7 +202,7 @@ public class World : splits.Length == 3 ? Map.GetWater(splits[2]) : Map.GetWater(splits[2], splits[3]); - Unit unit = Unit.Build(location.Designation, this.RootSeason, power, type); + Unit unit = Unit.Build(location.Key, this.RootSeason, power, type); return unit; }); return this.Update(units: units); @@ -244,8 +244,8 @@ public class World /// public Season ContinueOrFork(Season season) => GetFutures(season).Any() - ? new(season.Designation, season.Turn + 1, Timelines.NextTimeline()) - : new(season.Designation, season.Turn + 1, season.Timeline); + ? new(season.Key, season.Turn + 1, Timelines.NextTimeline()) + : new(season.Key, season.Turn + 1, season.Timeline); /// /// A standard Diplomacy game setup. @@ -271,7 +271,7 @@ public class World /// /// A season. /// The immediate futures of the season. - public IEnumerable GetFutures(Season present) => GetFutures(present.Designation); + public IEnumerable GetFutures(Season present) => GetFutures(present.Key); /// /// Returns the first season in this season's timeline. The first season is the @@ -325,7 +325,7 @@ public class World return foundUnit; } - public Unit GetUnitByDesignation(string designation) - => Units.SingleOrDefault(u => u!.Designation == designation, null) + public Unit GetUnitByKey(string designation) + => Units.SingleOrDefault(u => u!.Key == designation, null) ?? throw new KeyNotFoundException($"Unit {designation} not found"); } diff --git a/MultiversalDiplomacy/Orders/SupportMoveOrder.cs b/MultiversalDiplomacy/Orders/SupportMoveOrder.cs index 5a9fd82..c367e9f 100644 --- a/MultiversalDiplomacy/Orders/SupportMoveOrder.cs +++ b/MultiversalDiplomacy/Orders/SupportMoveOrder.cs @@ -41,6 +41,6 @@ public class SupportMoveOrder : SupportOrder public bool IsSupportFor(MoveOrder move) => this.Target == move.Unit - && this.Season.Designation == move.Season + && this.Season.Key == move.Season && this.Location == move.Location; } \ No newline at end of file diff --git a/MultiversalDiplomacyTests/MDATC_A.cs b/MultiversalDiplomacyTests/MDATC_A.cs index e28cc85..cfa4c44 100644 --- a/MultiversalDiplomacyTests/MDATC_A.cs +++ b/MultiversalDiplomacyTests/MDATC_A.cs @@ -46,12 +46,12 @@ public class TimeTravelTest Unit originalUnit = world.GetUnitAt("Mun", s0); Unit aMun0 = world.GetUnitAt("Mun", s1); Unit aTyr = world.GetUnitAt("Tyr", fork); - Assert.That(aTyr.Past, Is.EqualTo(mun1.Order.Unit.Designation)); - Assert.That(world.GetUnitByDesignation(aTyr.Past!).Past, Is.EqualTo(mun0.Order.Unit.Designation)); + Assert.That(aTyr.Past, Is.EqualTo(mun1.Order.Unit.Key)); + Assert.That(world.GetUnitByKey(aTyr.Past!).Past, Is.EqualTo(mun0.Order.Unit.Key)); // Confirm that there is a unit in Mun b1 originating from Mun a0 Unit aMun1 = world.GetUnitAt("Mun", fork); - Assert.That(aMun1.Past, Is.EqualTo(originalUnit.Designation)); + Assert.That(aMun1.Past, Is.EqualTo(originalUnit.Key)); } [Test] @@ -95,7 +95,7 @@ public class TimeTravelTest Unit tyr1 = world.GetUnitAt("Tyr", fork); Assert.That( tyr1.Past, - Is.EqualTo(mun0.Order.Unit.Designation), + Is.EqualTo(mun0.Order.Unit.Key), "Expected A Mun a0 to advance to Tyr b1"); Assert.That( world.RetreatingUnits.Count, diff --git a/MultiversalDiplomacyTests/Model/TimelineFactoryTest.cs b/MultiversalDiplomacyTests/Model/TimelineFactoryTest.cs index a804653..26d30dd 100644 --- a/MultiversalDiplomacyTests/Model/TimelineFactoryTest.cs +++ b/MultiversalDiplomacyTests/Model/TimelineFactoryTest.cs @@ -16,7 +16,7 @@ public class TimelineFactoryTest [TestCase(53, "bb")] [TestCase(77, "bz")] [TestCase(78, "ca")] - public void RoundTripTimelineDesignations(int number, string designation) + public void RoundTripTimelineKeys(int number, string designation) { Assert.That(TimelineFactory.IntToString(number), Is.EqualTo(designation), "Incorrect string"); Assert.That(TimelineFactory.StringToInt(designation), Is.EqualTo(number), "Incorrect number"); diff --git a/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs b/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs index cae7c71..240f684 100644 --- a/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs +++ b/MultiversalDiplomacyTests/MovementAdjudicatorTest.cs @@ -209,7 +209,7 @@ public class MovementAdjudicatorTest Unit u2 = updated.GetUnitAt("Mun", s2); Assert.That(updated.Units.Count, Is.EqualTo(2)); Assert.That(u2, Is.Not.EqualTo(mun1.Order.Unit)); - Assert.That(u2.Past, Is.EqualTo(mun1.Order.Unit.Designation)); + Assert.That(u2.Past, Is.EqualTo(mun1.Order.Unit.Key)); Assert.That(u2.Season, Is.EqualTo(s2)); setup[("a", 1)] @@ -229,7 +229,7 @@ public class MovementAdjudicatorTest updated = setup.UpdateWorld(); Season s3 = updated.GetSeason(s2.Timeline, s2.Turn + 1); Unit u3 = updated.GetUnitAt("Mun", s3); - Assert.That(u3.Past, Is.EqualTo(mun2.Order.Unit.Designation)); + Assert.That(u3.Past, Is.EqualTo(mun2.Order.Unit.Key)); } [Test] @@ -259,7 +259,7 @@ public class MovementAdjudicatorTest Unit u2 = updated.GetUnitAt("Tyr", s2); Assert.That(updated.Units.Count, Is.EqualTo(2)); Assert.That(u2, Is.Not.EqualTo(mun1.Order.Unit)); - Assert.That(u2.Past, Is.EqualTo(mun1.Order.Unit.Designation)); + Assert.That(u2.Past, Is.EqualTo(mun1.Order.Unit.Key)); Assert.That(u2.Season, Is.EqualTo(s2)); setup[("a", 1)] @@ -279,6 +279,6 @@ public class MovementAdjudicatorTest updated = setup.UpdateWorld(); Season s3 = updated.GetSeason(s2.Timeline, s2.Turn + 1); Unit u3 = updated.GetUnitAt("Mun", s3); - Assert.That(u3.Past, Is.EqualTo(u2.Designation)); + Assert.That(u3.Past, Is.EqualTo(u2.Key)); } } diff --git a/MultiversalDiplomacyTests/SerializationTest.cs b/MultiversalDiplomacyTests/SerializationTest.cs index 3b5ffd8..ba9da29 100644 --- a/MultiversalDiplomacyTests/SerializationTest.cs +++ b/MultiversalDiplomacyTests/SerializationTest.cs @@ -95,9 +95,9 @@ public class SerializationTest var adjudications = setup.AdjudicateOrders(); Assert.That(mun1, Is.NotCut); Console.WriteLine(string.Join(", ", adjudications.Select(a => a.ToString()))); - DoesMove mun0move = adjudications.OfType().Single(move => move.Order.Unit.Designation == mun0.Order.Unit.Designation); + DoesMove mun0move = adjudications.OfType().Single(move => move.Order.Unit.Key == mun0.Order.Unit.Key); Assert.That(mun0move.Outcome, Is.True); - IsDislodged tyr0dislodge = adjudications.OfType().Single(dis => dis.Order.Unit.Designation == tyr0.Order.Unit.Designation); + IsDislodged tyr0dislodge = adjudications.OfType().Single(dis => dis.Order.Unit.Key == tyr0.Order.Unit.Key); Assert.That(tyr0dislodge, Is.True); // Confirm that an alternate future is created. @@ -106,7 +106,7 @@ public class SerializationTest Unit tyr1 = world.GetUnitAt("Tyr", fork); Assert.That( tyr1.Past, - Is.EqualTo(mun0.Order.Unit.Designation), + Is.EqualTo(mun0.Order.Unit.Key), "Expected A Mun a0 to advance to Tyr b1"); Assert.That( world.RetreatingUnits.Count, diff --git a/MultiversalDiplomacyTests/TestCaseBuilder.cs b/MultiversalDiplomacyTests/TestCaseBuilder.cs index 5917b41..4915a3d 100644 --- a/MultiversalDiplomacyTests/TestCaseBuilder.cs +++ b/MultiversalDiplomacyTests/TestCaseBuilder.cs @@ -270,7 +270,7 @@ public class TestCaseBuilder } // Not found - Unit newUnit = Unit.Build(location.Designation, season, power, type); + Unit newUnit = Unit.Build(location.Key, season, power, type); this.World = this.World.Update(units: this.World.Units.Append(newUnit)); return newUnit; } @@ -419,7 +419,7 @@ public class TestCaseBuilder MoveOrder moveOrder = new MoveOrder( this.PowerContext.Power, this.Unit, - destSeason.Designation, + destSeason.Key, destination); this.Builder.OrderList.Add(moveOrder); return new OrderDefinedContext(this, moveOrder); diff --git a/MultiversalDiplomacyTests/TestCaseBuilderTest.cs b/MultiversalDiplomacyTests/TestCaseBuilderTest.cs index 2b3ef5f..4390bd8 100644 --- a/MultiversalDiplomacyTests/TestCaseBuilderTest.cs +++ b/MultiversalDiplomacyTests/TestCaseBuilderTest.cs @@ -40,7 +40,7 @@ class TestCaseBuilderTest Assert.That(fleetSTP.Type, Is.EqualTo(UnitType.Fleet), "Unit created with wrong type"); Assert.That( fleetSTP.Location, - Is.EqualTo(setup.World.Map.GetWater("STP", "wc").Designation), + Is.EqualTo(setup.World.Map.GetWater("STP", "wc").Key), "Unit created on wrong coast"); } @@ -128,7 +128,7 @@ class TestCaseBuilderTest "Wrong power"); Assert.That( orderMun.Order.Unit.Location, - Is.EqualTo(setup.World.Map.GetLand("Mun").Designation), + Is.EqualTo(setup.World.Map.GetLand("Mun").Key), "Wrong unit"); Assert.That( diff --git a/MultiversalDiplomacyTests/UnitTests.cs b/MultiversalDiplomacyTests/UnitTests.cs index 3090fba..f95cba9 100644 --- a/MultiversalDiplomacyTests/UnitTests.cs +++ b/MultiversalDiplomacyTests/UnitTests.cs @@ -15,24 +15,24 @@ public class UnitTests Tyr = world.Map.GetLand("Tyr"); Power pw1 = world.Map.GetPower("Austria"); Season a0 = world.RootSeason; - Unit u1 = Unit.Build(Mun.Designation, a0, pw1, UnitType.Army); + Unit u1 = Unit.Build(Mun.Key, a0, pw1, UnitType.Army); world = world.ContinueOrFork(a0, out Season a1); - Unit u2 = u1.Next(Boh.Designation, a1); + Unit u2 = u1.Next(Boh.Key, a1); _ = world.ContinueOrFork(a1, out Season a2); - Unit u3 = u2.Next(Tyr.Designation, a2); + Unit u3 = u2.Next(Tyr.Key, a2); - Assert.That(u3.Past, Is.EqualTo(u2.Designation), "Missing unit past"); - Assert.That(u2.Past, Is.EqualTo(u1.Designation), "Missing unit past"); + Assert.That(u3.Past, Is.EqualTo(u2.Key), "Missing unit past"); + Assert.That(u2.Past, Is.EqualTo(u1.Key), "Missing unit past"); Assert.That(u1.Past, Is.Null, "Unexpected unit past"); Assert.That(u1.Season, Is.EqualTo(a0), "Unexpected unit season"); Assert.That(u2.Season, Is.EqualTo(a1), "Unexpected unit season"); Assert.That(u3.Season, Is.EqualTo(a2), "Unexpected unit season"); - Assert.That(u1.Location, Is.EqualTo(Mun.Designation), "Unexpected unit location"); - Assert.That(u2.Location, Is.EqualTo(Boh.Designation), "Unexpected unit location"); - Assert.That(u3.Location, Is.EqualTo(Tyr.Designation), "Unexpected unit location"); + Assert.That(u1.Location, Is.EqualTo(Mun.Key), "Unexpected unit location"); + Assert.That(u2.Location, Is.EqualTo(Boh.Key), "Unexpected unit location"); + Assert.That(u3.Location, Is.EqualTo(Tyr.Key), "Unexpected unit location"); } } \ No newline at end of file