Changeset 207:27f163bf884a in IBBoard.WarFoundry.API.Tests

Timestamp:

01/31/12 14:59:15 (4 months ago)

Author:

IBBoard <dev@…>

Branch:

default

Message:

Re #379: Fix validation of requirements to check for unit

• Update checked text to match new, cleaner text

Location:

API/Objects/Requirement

Files:

• RequiresNUnitsForMUnitsRequirementTest.cs (modified) (29 diffs)
• UnitRequiresAtLeastNUnitsRequirementTest.cs (modified) (8 diffs)
• UnitRequiresNoMoreThanNOfUnitTypeRequirementTest.cs (modified) (10 diffs)

API/Objects/Requirement/RequiresNUnitsForMUnitsRequirementTest.cs

@@ -63 +63 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 "+unitType2.Name+" for every 1 "+unitType1.Name + " (would have 0 for 1)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " for every 1 × " + unitType1.Name + " (would have 0 for 1)."));
         }
 
@@ -76 +76 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 " + unitType3.Name + " for every 1 " + unitType1.Name + " (would have 0 for 1)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 × " + unitType3.Name + " for every 1 × " + unitType1.Name + " (would have 0 for 1)."));
         }
 
@@ -88 +88 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " for every 1 " + unitType1.Name + " (would have 1 for 2)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " for every 1 × " + unitType1.Name + " (would have 1 for 2)."));
         }
 
@@ -116 +116 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 " + unitType3.Name + " for every 1 " + unitType1.Name + " (would have 1 for 2)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 × " + unitType3.Name + " for every 1 × " + unitType1.Name + " (would have 1 for 2)."));
         }
 
@@ -131 +131 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " for every 1 " + unitType1.Name + " (would have 1 for 2); 1 " + unitType3.Name + " for every 1 " + unitType1.Name + " (would have 1 for 2)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " for every 1 × " + unitType1.Name + " (would have 1 for 2); 1 × " + unitType3.Name + " for every 1 × " + unitType1.Name + " (would have 1 for 2)."));
         }
 
@@ -144 +144 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " for every 1 " + unitType1.Name + " (would have 1 for 2); 1 " + unitType3.Name + " for every 1 " + unitType1.Name + " (would have 1 for 2)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " for every 1 × " + unitType1.Name + " (would have 1 for 2); 1 × " + unitType3.Name + " for every 1 × " + unitType1.Name + " (would have 1 for 2)."));
         }
 
@@ -158 +158 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " for every 2 " + unitType1.Name + " (would have 1 for 3)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " for every 2 × " + unitType1.Name + " (would have 1 for 3)."));
         }
 
@@ -170 +170 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 2 " + unitType2.Name + " for every 3 " + unitType1.Name + " (would have 1 for 1)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 2 × " + unitType2.Name + " for every 3 × " + unitType1.Name + " (would have 1 for 1)."));
         }
 
@@ -183 +183 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 2 " + unitType2.Name + " for every 3 " + unitType1.Name + " (would have 1 for 2)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 2 × " + unitType2.Name + " for every 3 × " + unitType1.Name + " (would have 1 for 2)."));
         }
 
@@ -196 +196 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 2 " + unitType2.Name + " for every 3 " + unitType1.Name + " (would have 3 for 4)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 2 × " + unitType2.Name + " for every 3 × " + unitType1.Name + " (would have 3 for 4)."));
         }
 
@@ -288 +288 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " or " + unitType3.Name + " for every 1 " + unitType1.Name + " (would have 2 for 3)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " or " + unitType3.Name + " for every 1 × " + unitType1.Name + " (would have 2 for 3)."));
         }
 
@@ -303 +303 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " or " + unitType3.Name + " for every 1 " + unitType1.Name + " (would have 2 for 3)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " or " + unitType3.Name + " for every 1 × " + unitType1.Name + " (would have 2 for 3)."));
         }
 
@@ -318 +318 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " or " + unitType3.Name + " for every 1 " + unitType1.Name + " (would have 2 for 3)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " or " + unitType3.Name + " for every 1 × " + unitType1.Name + " (would have 2 for 3)."));
         }
 
@@ -409 +409 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " or " + unitType3.Name + " for every 3 " + unitType1.Name + " (would have 2 for 7)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " or " + unitType3.Name + " for every 3 × " + unitType1.Name + " (would have 2 for 7)."));
         }
 
@@ -422 +422 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " or " + unitType3.Name + " for every 3 " + unitType1.Name + " (would have 2 for 7)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " or " + unitType3.Name + " for every 3 × " + unitType1.Name + " (would have 2 for 7)."));
         }
 
@@ -435 +435 @@
             Unit unit = CreateUnitOfType(unitType1, army);
             Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " or " + unitType3.Name + " for every 3 " + unitType1.Name + " (would have 2 for 7)."));
+            Assert.That(req.GetAllowsAddingMessage(unit.UnitType, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " or " + unitType3.Name + " for every 3 × " + unitType1.Name + " (would have 2 for 7)."));
         }
 
@@ -465 +465 @@
             RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1, unitType2);
             Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " for every 1 " + unitType1.Name + " (have 0 for 1)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " for every 1 × " + unitType1.Name + " (have 0 for 1)."));
         }
 
@@ -478 +478 @@
             req.AddUnitTypeRequirement(unitType3);
             Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType3.Name + " for every 1 " + unitType1.Name + " (have 0 for 1)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType3.Name + " for every 1 × " + unitType1.Name + " (have 0 for 1)."));
         }
 
@@ -490 +490 @@
             RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1, unitType2);
             Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " for every 1 " + unitType1.Name + " (have 1 for 2)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " for every 1 × " + unitType1.Name + " (have 1 for 2)."));
         }
 
@@ -518 +518 @@
             req.AddUnitTypeRequirement(unitType3, 1, 1);
             Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType3.Name + " for every 1 " + unitType1.Name + " (have 1 for 2)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType3.Name + " for every 1 × " + unitType1.Name + " (have 1 for 2)."));
         }
 
@@ -533 +533 @@
             req.AddUnitTypeRequirement(unitType3, 1, 1);
             Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " for every 1 " + unitType1.Name + " (have 1 for 2); 1 " + unitType3.Name + " for every 1 " + unitType1.Name + " (have 1 for 2)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " for every 1 × " + unitType1.Name + " (have 1 for 2); 1 × " + unitType3.Name + " for every 1 × " + unitType1.Name + " (have 1 for 2)."));
         }
 
@@ -546 +546 @@
             RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1, unitType2, unitType3);
             Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " for every 1 " + unitType1.Name + " (have 1 for 2); 1 " + unitType3.Name + " for every 1 " + unitType1.Name + " (have 1 for 2)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " for every 1 × " + unitType1.Name + " (have 1 for 2); 1 × " + unitType3.Name + " for every 1 × " + unitType1.Name + " (have 1 for 2)."));
         }
 
@@ -558 +558 @@
             req.AddUnitTypeRequirement(unitType2, 2, 3);
             Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 " + unitType2.Name + " for every 3 " + unitType1.Name + " (have 1 for 1)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 × " + unitType2.Name + " for every 3 × " + unitType1.Name + " (have 1 for 1)."));
         }
 
@@ -570 +570 @@
             req.AddUnitTypeRequirement(unitType2, 2, 3);
             Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 " + unitType2.Name + " for every 3 " + unitType1.Name + " (have 1 for 2)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 × " + unitType2.Name + " for every 3 × " + unitType1.Name + " (have 1 for 2)."));
         }
 
@@ -582 +582 @@
             req.AddUnitTypeRequirement(unitType2, 2, 3);
             Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 " + unitType2.Name + " for every 3 " + unitType1.Name + " (have 3 for 4)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 × " + unitType2.Name + " for every 3 × " + unitType1.Name + " (have 3 for 4)."));
         }
 
@@ -596 +596 @@
             req.AddUnitTypeRequirement(unitType2, 1, 2);
             Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " for every 2 " + unitType1.Name + " (have 1 for 3)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " for every 2 × " + unitType1.Name + " (have 1 for 3)."));
         }
 
@@ -681 +681 @@
             req.AddUnitTypeRequirement(3, unitType2, unitType3);
             Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " or " + unitType3.Name + " for every 3 " + unitType1.Name + " (have 2 for 7)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " or " + unitType3.Name + " for every 3 × " + unitType1.Name + " (have 2 for 7)."));
         }
 
@@ -693 +693 @@
             req.AddUnitTypeRequirement(3, unitType2, unitType3);
             Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " or " + unitType3.Name + " for every 3 " + unitType1.Name + " (have 2 for 7)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " or " + unitType3.Name + " for every 3 × " + unitType1.Name + " (have 2 for 7)."));
         }
 
@@ -705 +705 @@
             req.AddUnitTypeRequirement(3, unitType2, unitType3);
             Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " or " + unitType3.Name + " for every 3 " + unitType1.Name + " (have 2 for 7)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " or " + unitType3.Name + " for every 3 × " + unitType1.Name + " (have 2 for 7)."));
         }
 

API/Objects/Requirement/UnitRequiresAtLeastNUnitsRequirementTest.cs

@@ -239 +239 @@
             RequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(unitType1);
             req.AddUnitTypeRequirement(unitType2);
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so must contain: 1 × " + unitType2.Name + " (have 0)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " (have 0)."));
         }
 
@@ -249 +249 @@
             RequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(unitType1);
             req.AddUnitTypeRequirement(unitType2, 2);
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so must contain: 2 × " + unitType2.Name + " (have 0)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 × " + unitType2.Name + " (have 0)."));
         }
 
@@ -260 +260 @@
             req.AddUnitTypeRequirement(unitType2);
             req.AddUnitTypeRequirement(unitType3);
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so must contain: 1 × " + unitType2.Name + " (have 0); 1 × " + unitType3.Name + " (have 0)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " (have 0); 1 × " + unitType3.Name + " (have 0)."));
         }
 
@@ -278 +278 @@
             RequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(unitType1);
             req.AddUnitTypeRequirement(unitType2, 2);
-            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so must contain: 2 × " + unitType2.Name + " (would have 1)."));
+            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army must contain: 2 × " + unitType2.Name + " (would have 1)."));
         }
 
@@ -288 +288 @@
             req.AddUnitTypeRequirement(unitType2);
             req.AddUnitTypeRequirement(unitType3);
-            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so must contain: 1 × " + unitType3.Name + " (would have 0)."));
+            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army must contain: 1 × " + unitType3.Name + " (would have 0)."));
         }
 
@@ -298 +298 @@
             req.AddUnitTypeRequirement(unitType2);
             req.AddUnitTypeRequirement(unitType3);
-            Assert.That(req.GetAllowsAddingMessage(unitType3, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so must contain: 1 × " + unitType2.Name + " (would have 0)."));
+            Assert.That(req.GetAllowsAddingMessage(unitType3, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " (would have 0)."));
         }
 
@@ -309 +309 @@
             req.AddUnitTypeRequirement(unitType2);
             req.AddUnitTypeRequirement(unitType3);
-            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so must contain: 1 × " + unitType3.Name + " (would have 0)."));
+            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army must contain: 1 × " + unitType3.Name + " (would have 0)."));
         }
 
@@ -320 +320 @@
             req.AddUnitTypeRequirement(unitType2);
             req.AddUnitTypeRequirement(unitType3);
-            Assert.That(req.GetAllowsAddingMessage(unitType3, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so must contain: 1 × " + unitType2.Name + " (would have 0)."));
+            Assert.That(req.GetAllowsAddingMessage(unitType3, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " (would have 0)."));
         }
 

API/Objects/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementTest.cs

@@ -162 +162 @@
             RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
             req.AddUnitTypeRequirement(unitType2);
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so cannot contain more than: 0 × " + unitType2.Name + " (have 1)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType2.Name + " (have 1)."));
         }
 
@@ -175 +175 @@
             RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
             req.AddUnitTypeRequirement(unitType2, 2);
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so cannot contain more than: 2 × " + unitType2.Name + " (have 3)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army cannot contain more than: 2 × " + unitType2.Name + " (have 3)."));
         }
 
@@ -187 +187 @@
             req.AddUnitTypeRequirement(unitType2);
             req.AddUnitTypeRequirement(unitType3);
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so cannot contain more than: 0 × " + unitType2.Name + " (have 1)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType2.Name + " (have 1)."));
         }
 
@@ -199 +199 @@
             req.AddUnitTypeRequirement(unitType2);
             req.AddUnitTypeRequirement(unitType3);
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so cannot contain more than: 0 × " + unitType3.Name + " (have 1)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType3.Name + " (have 1)."));
         }
 
@@ -212 +212 @@
             req.AddUnitTypeRequirement(unitType2);
             req.AddUnitTypeRequirement(unitType3);
-            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so cannot contain more than: 0 × " + unitType2.Name + " (have 1); 0 × " + unitType3.Name + " (have 1)."));
+            Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType2.Name + " (have 1); 0 × " + unitType3.Name + " (have 1)."));
         }
 
@@ -231 +231 @@
             RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
             req.AddUnitTypeRequirement(unitType2);
-            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so cannot contain more than: 0 × " + unitType2.Name + " (would have 1)."));
+            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType2.Name + " (would have 1)."));
         }
 
@@ -243 +243 @@
             RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
             req.AddUnitTypeRequirement(unitType2, 2);
-            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so cannot contain more than: 2 × " + unitType2.Name + " (would have 3)."));
+            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army cannot contain more than: 2 × " + unitType2.Name + " (would have 3)."));
         }
 
@@ -254 +254 @@
             req.AddUnitTypeRequirement(unitType2);
             req.AddUnitTypeRequirement(unitType3);
-            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so cannot contain more than: 0 × " + unitType2.Name + " (would have 1)."));
+            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType2.Name + " (would have 1)."));
         }
 
@@ -266 +266 @@
             req.AddUnitTypeRequirement(unitType2);
             req.AddUnitTypeRequirement(unitType3);
-            Assert.That(req.GetAllowsAddingMessage(unitType3, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so cannot contain more than: 0 × " + unitType2.Name + " (would have 1); 0 × " + unitType3.Name + " (would have 1)."));
+            Assert.That(req.GetAllowsAddingMessage(unitType3, army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType2.Name + " (would have 1); 0 × " + unitType3.Name + " (would have 1)."));
         }
 
@@ -278 +278 @@
             req.AddUnitTypeRequirement(unitType2);
             req.AddUnitTypeRequirement(unitType3);
-            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so cannot contain more than: 0 × " + unitType2.Name + " (would have 1); 0 × " + unitType3.Name + " (would have 1)."));
+            Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType2.Name + " (would have 1); 0 × " + unitType3.Name + " (would have 1)."));
         }