changeset 207:27f163bf884a

Re #379: Fix validation of requirements to check for unit * Update checked text to match new, cleaner text
author IBBoard <dev@ibboard.co.uk>
date Tue, 31 Jan 2012 20:59:15 +0000
parents 78ba834cb1f7
children c323770e61c2
files API/Objects/Requirement/RequiresNUnitsForMUnitsRequirementTest.cs API/Objects/Requirement/UnitRequiresAtLeastNUnitsRequirementTest.cs API/Objects/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementTest.cs
diffstat 3 files changed, 50 insertions(+), 50 deletions(-) [+]
line diff
     1.1 --- a/API/Objects/Requirement/RequiresNUnitsForMUnitsRequirementTest.cs	Sun Jan 29 20:03:44 2012 +0000
     1.2 +++ b/API/Objects/Requirement/RequiresNUnitsForMUnitsRequirementTest.cs	Tue Jan 31 20:59:15 2012 +0000
     1.3 @@ -62,7 +62,7 @@
     1.4  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1, unitType2);
     1.5  			Unit unit = CreateUnitOfType(unitType1, army);
     1.6  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
     1.7 -			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)."));
     1.8 +			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)."));
     1.9  		}
    1.10  
    1.11  		[Test()]
    1.12 @@ -75,7 +75,7 @@
    1.13  			req.AddUnitTypeRequirement(unitType3);
    1.14  			Unit unit = CreateUnitOfType(unitType1, army);
    1.15  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
    1.16 -			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)."));
    1.17 +			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)."));
    1.18  		}
    1.19  
    1.20  		[Test()]
    1.21 @@ -87,7 +87,7 @@
    1.22  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1, unitType2);
    1.23  			Unit unit = CreateUnitOfType(unitType1, army);
    1.24  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
    1.25 -			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.26 +			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.27  		}
    1.28  
    1.29  		[Test()]
    1.30 @@ -115,7 +115,7 @@
    1.31  			req.AddUnitTypeRequirement(unitType3, 1, 1);
    1.32  			Unit unit = CreateUnitOfType(unitType1, army);
    1.33  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
    1.34 -			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)."));
    1.35 +			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)."));
    1.36  		}
    1.37  
    1.38  		[Test()]
    1.39 @@ -130,7 +130,7 @@
    1.40  			req.AddUnitTypeRequirement(unitType3, 1, 1);
    1.41  			Unit unit = CreateUnitOfType(unitType1, army);
    1.42  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
    1.43 -			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)."));
    1.44 +			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)."));
    1.45  		}
    1.46  
    1.47  		[Test()]
    1.48 @@ -143,7 +143,7 @@
    1.49  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1, unitType2, unitType3);
    1.50  			Unit unit = CreateUnitOfType(unitType1, army);
    1.51  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
    1.52 -			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)."));
    1.53 +			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)."));
    1.54  		}
    1.55  
    1.56  		[Test()]
    1.57 @@ -157,7 +157,7 @@
    1.58  			req.AddUnitTypeRequirement(unitType2, 1, 2);
    1.59  			Unit unit = CreateUnitOfType(unitType1, army);
    1.60  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
    1.61 -			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)."));
    1.62 +			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)."));
    1.63  		}
    1.64  
    1.65  		[Test()]
    1.66 @@ -169,7 +169,7 @@
    1.67  			req.AddUnitTypeRequirement(unitType2, 2, 3);
    1.68  			Unit unit = CreateUnitOfType(unitType1, army);
    1.69  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
    1.70 -			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)."));
    1.71 +			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)."));
    1.72  		}
    1.73  
    1.74  		[Test()]
    1.75 @@ -182,7 +182,7 @@
    1.76  			req.AddUnitTypeRequirement(unitType2, 2, 3);
    1.77  			Unit unit = CreateUnitOfType(unitType1, army);
    1.78  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
    1.79 -			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)."));
    1.80 +			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)."));
    1.81  		}
    1.82  
    1.83  		[Test()]
    1.84 @@ -195,7 +195,7 @@
    1.85  			req.AddUnitTypeRequirement(unitType2, 2, 3);
    1.86  			Unit unit = CreateUnitOfType(unitType1, army);
    1.87  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
    1.88 -			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)."));
    1.89 +			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)."));
    1.90  		}
    1.91  
    1.92  		[Test()]
    1.93 @@ -287,7 +287,7 @@
    1.94  			req.AddUnitTypeRequirement(unitType2, unitType3);
    1.95  			Unit unit = CreateUnitOfType(unitType1, army);
    1.96  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
    1.97 -			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)."));
    1.98 +			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)."));
    1.99  		}
   1.100  
   1.101  		[Test()]
   1.102 @@ -302,7 +302,7 @@
   1.103  			req.AddUnitTypeRequirement(unitType2, unitType3);
   1.104  			Unit unit = CreateUnitOfType(unitType1, army);
   1.105  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
   1.106 -			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)."));
   1.107 +			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)."));
   1.108  		}
   1.109  
   1.110  		[Test()]
   1.111 @@ -317,7 +317,7 @@
   1.112  			req.AddUnitTypeRequirement(unitType2, unitType3);
   1.113  			Unit unit = CreateUnitOfType(unitType1, army);
   1.114  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
   1.115 -			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)."));
   1.116 +			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)."));
   1.117  		}
   1.118  
   1.119  		[Test()]
   1.120 @@ -408,7 +408,7 @@
   1.121  			req.AddUnitTypeRequirement(3, unitType2, unitType3);
   1.122  			Unit unit = CreateUnitOfType(unitType1, army);
   1.123  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
   1.124 -			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)."));
   1.125 +			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)."));
   1.126  		}
   1.127  
   1.128  		[Test()]
   1.129 @@ -421,7 +421,7 @@
   1.130  			req.AddUnitTypeRequirement(3, unitType2, unitType3);
   1.131  			Unit unit = CreateUnitOfType(unitType1, army);
   1.132  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
   1.133 -			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)."));
   1.134 +			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)."));
   1.135  		}
   1.136  
   1.137  		[Test()]
   1.138 @@ -434,7 +434,7 @@
   1.139  			req.AddUnitTypeRequirement(3, unitType2, unitType3);
   1.140  			Unit unit = CreateUnitOfType(unitType1, army);
   1.141  			Assert.That(req.AllowsAdding(unit, army), Is.EqualTo(Validation.Failed));
   1.142 -			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)."));
   1.143 +			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)."));
   1.144  		}
   1.145  
   1.146  		[Test()]
   1.147 @@ -464,7 +464,7 @@
   1.148  			AddUnitOfTypeToArmy(unitType1, army);
   1.149  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1, unitType2);
   1.150  			Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
   1.151 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " for every 1 " + unitType1.Name + " (have 0 for 1)."));
   1.152 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " for every 1 × " + unitType1.Name + " (have 0 for 1)."));
   1.153  		}
   1.154  
   1.155  		[Test()]
   1.156 @@ -477,7 +477,7 @@
   1.157  			req.AddUnitTypeRequirement(unitType2);
   1.158  			req.AddUnitTypeRequirement(unitType3);
   1.159  			Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
   1.160 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType3.Name + " for every 1 " + unitType1.Name + " (have 0 for 1)."));
   1.161 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType3.Name + " for every 1 × " + unitType1.Name + " (have 0 for 1)."));
   1.162  		}
   1.163  
   1.164  		[Test()]
   1.165 @@ -489,7 +489,7 @@
   1.166  			AddUnitOfTypeToArmy(unitType1, army);
   1.167  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1, unitType2);
   1.168  			Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
   1.169 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " for every 1 " + unitType1.Name + " (have 1 for 2)."));
   1.170 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " for every 1 × " + unitType1.Name + " (have 1 for 2)."));
   1.171  		}
   1.172  
   1.173  		[Test()]
   1.174 @@ -517,7 +517,7 @@
   1.175  			req.AddUnitTypeRequirement(unitType2, 1, 2);
   1.176  			req.AddUnitTypeRequirement(unitType3, 1, 1);
   1.177  			Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
   1.178 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType3.Name + " for every 1 " + unitType1.Name + " (have 1 for 2)."));
   1.179 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType3.Name + " for every 1 × " + unitType1.Name + " (have 1 for 2)."));
   1.180  		}
   1.181  
   1.182  		[Test()]
   1.183 @@ -532,7 +532,7 @@
   1.184  			req.AddUnitTypeRequirement(unitType2, 1, 1);
   1.185  			req.AddUnitTypeRequirement(unitType3, 1, 1);
   1.186  			Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
   1.187 -			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)."));
   1.188 +			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)."));
   1.189  		}
   1.190  
   1.191  		[Test()]
   1.192 @@ -545,7 +545,7 @@
   1.193  			AddUnitOfTypeToArmy(unitType1, army);
   1.194  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1, unitType2, unitType3);
   1.195  			Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
   1.196 -			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)."));
   1.197 +			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)."));
   1.198  		}
   1.199  
   1.200  		[Test()]
   1.201 @@ -557,7 +557,7 @@
   1.202  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1);
   1.203  			req.AddUnitTypeRequirement(unitType2, 2, 3);
   1.204  			Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
   1.205 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 " + unitType2.Name + " for every 3 " + unitType1.Name + " (have 1 for 1)."));
   1.206 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 × " + unitType2.Name + " for every 3 × " + unitType1.Name + " (have 1 for 1)."));
   1.207  		}
   1.208  
   1.209  		[Test()]
   1.210 @@ -569,7 +569,7 @@
   1.211  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1);
   1.212  			req.AddUnitTypeRequirement(unitType2, 2, 3);
   1.213  			Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
   1.214 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 " + unitType2.Name + " for every 3 " + unitType1.Name + " (have 1 for 2)."));
   1.215 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 × " + unitType2.Name + " for every 3 × " + unitType1.Name + " (have 1 for 2)."));
   1.216  		}
   1.217  
   1.218  		[Test()]
   1.219 @@ -581,7 +581,7 @@
   1.220  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1);
   1.221  			req.AddUnitTypeRequirement(unitType2, 2, 3);
   1.222  			Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
   1.223 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 " + unitType2.Name + " for every 3 " + unitType1.Name + " (have 3 for 4)."));
   1.224 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 × " + unitType2.Name + " for every 3 × " + unitType1.Name + " (have 3 for 4)."));
   1.225  		}
   1.226  
   1.227  		[Test()]
   1.228 @@ -595,7 +595,7 @@
   1.229  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1);
   1.230  			req.AddUnitTypeRequirement(unitType2, 1, 2);
   1.231  			Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
   1.232 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 " + unitType2.Name + " for every 2 " + unitType1.Name + " (have 1 for 3)."));
   1.233 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " for every 2 × " + unitType1.Name + " (have 1 for 3)."));
   1.234  		}
   1.235  
   1.236  		[Test()]
   1.237 @@ -680,7 +680,7 @@
   1.238  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1);
   1.239  			req.AddUnitTypeRequirement(3, unitType2, unitType3);
   1.240  			Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
   1.241 -			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)."));
   1.242 +			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)."));
   1.243  		}
   1.244  
   1.245  		[Test()]
   1.246 @@ -692,7 +692,7 @@
   1.247  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1);
   1.248  			req.AddUnitTypeRequirement(3, unitType2, unitType3);
   1.249  			Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
   1.250 -			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)."));
   1.251 +			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)."));
   1.252  		}
   1.253  
   1.254  		[Test()]
   1.255 @@ -704,7 +704,7 @@
   1.256  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType1);
   1.257  			req.AddUnitTypeRequirement(3, unitType2, unitType3);
   1.258  			Assert.That(req.ValidatesArmy(army), Is.EqualTo(Validation.Failed));
   1.259 -			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)."));
   1.260 +			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)."));
   1.261  		}
   1.262  
   1.263  		private static void AddUnitsOfTypeToArmy(int count, UnitType unitType, Army army)
   1.264 @@ -725,21 +725,21 @@
   1.265  			return new Unit(unitType, army.GetCategory(unitType.MainCategory));
   1.266  		}
   1.267  
   1.268 -		public override RequiresNUnitsForMUnitsRequirement GetObject()
   1.269 +		public override RequiresNUnitsForMUnitsRequirement GetObject()
   1.270  		{
   1.271  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType3);
   1.272  			req.AddUnitTypeRequirement(unitType1, 2, 3);
   1.273  			return req;
   1.274  		}
   1.275  
   1.276 -		public override RequiresNUnitsForMUnitsRequirement GetSameObject()
   1.277 +		public override RequiresNUnitsForMUnitsRequirement GetSameObject()
   1.278  		{
   1.279  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType3);
   1.280  			req.AddUnitTypeRequirement(unitType1, 2, 3);
   1.281  			return req;
   1.282  		}
   1.283  
   1.284 -		public override RequiresNUnitsForMUnitsRequirement GetDifferentObject()
   1.285 +		public override RequiresNUnitsForMUnitsRequirement GetDifferentObject()
   1.286  		{
   1.287  			RequiresNUnitsForMUnitsRequirement req = new RequiresNUnitsForMUnitsRequirement(unitType3);
   1.288  			DummyWarFoundryFactory factory = new DummyWarFoundryFactory();
     2.1 --- a/API/Objects/Requirement/UnitRequiresAtLeastNUnitsRequirementTest.cs	Sun Jan 29 20:03:44 2012 +0000
     2.2 +++ b/API/Objects/Requirement/UnitRequiresAtLeastNUnitsRequirementTest.cs	Tue Jan 31 20:59:15 2012 +0000
     2.3 @@ -238,7 +238,7 @@
     2.4  			AddUnitOfTypeToArmy(unitType1, army);
     2.5  			RequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(unitType1);
     2.6  			req.AddUnitTypeRequirement(unitType2);
     2.7 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so must contain: 1 × " + unitType2.Name + " (have 0)."));
     2.8 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " (have 0)."));
     2.9  		}
    2.10  
    2.11  		[Test]
    2.12 @@ -248,7 +248,7 @@
    2.13  			AddUnitOfTypeToArmy(unitType1, army);
    2.14  			RequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(unitType1);
    2.15  			req.AddUnitTypeRequirement(unitType2, 2);
    2.16 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so must contain: 2 × " + unitType2.Name + " (have 0)."));
    2.17 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 2 × " + unitType2.Name + " (have 0)."));
    2.18  		}
    2.19  
    2.20  		[Test]
    2.21 @@ -259,7 +259,7 @@
    2.22  			RequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(unitType1);
    2.23  			req.AddUnitTypeRequirement(unitType2);
    2.24  			req.AddUnitTypeRequirement(unitType3);
    2.25 -			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)."));
    2.26 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " (have 0); 1 × " + unitType3.Name + " (have 0)."));
    2.27  		}
    2.28  
    2.29  		[Test]
    2.30 @@ -277,7 +277,7 @@
    2.31  			Army army = new Army(mockRace, "Test", 1000);
    2.32  			RequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(unitType1);
    2.33  			req.AddUnitTypeRequirement(unitType2, 2);
    2.34 -			Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so must contain: 2 × " + unitType2.Name + " (would have 1)."));
    2.35 +			Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army must contain: 2 × " + unitType2.Name + " (would have 1)."));
    2.36  		}
    2.37  
    2.38  		[Test]
    2.39 @@ -287,7 +287,7 @@
    2.40  			RequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(unitType1);
    2.41  			req.AddUnitTypeRequirement(unitType2);
    2.42  			req.AddUnitTypeRequirement(unitType3);
    2.43 -			Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so must contain: 1 × " + unitType3.Name + " (would have 0)."));
    2.44 +			Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army must contain: 1 × " + unitType3.Name + " (would have 0)."));
    2.45  		}
    2.46  
    2.47  		[Test]
    2.48 @@ -297,7 +297,7 @@
    2.49  			RequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(unitType1);
    2.50  			req.AddUnitTypeRequirement(unitType2);
    2.51  			req.AddUnitTypeRequirement(unitType3);
    2.52 -			Assert.That(req.GetAllowsAddingMessage(unitType3, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so must contain: 1 × " + unitType2.Name + " (would have 0)."));
    2.53 +			Assert.That(req.GetAllowsAddingMessage(unitType3, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " (would have 0)."));
    2.54  		}
    2.55  
    2.56  		[Test]
    2.57 @@ -308,7 +308,7 @@
    2.58  			RequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(unitType1);
    2.59  			req.AddUnitTypeRequirement(unitType2);
    2.60  			req.AddUnitTypeRequirement(unitType3);
    2.61 -			Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so must contain: 1 × " + unitType3.Name + " (would have 0)."));
    2.62 +			Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army must contain: 1 × " + unitType3.Name + " (would have 0)."));
    2.63  		}
    2.64  
    2.65  		[Test]
    2.66 @@ -319,7 +319,7 @@
    2.67  			RequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(unitType1);
    2.68  			req.AddUnitTypeRequirement(unitType2);
    2.69  			req.AddUnitTypeRequirement(unitType3);
    2.70 -			Assert.That(req.GetAllowsAddingMessage(unitType3, army), Is.EqualTo("Army would contain " + unitType1.Name + " and so must contain: 1 × " + unitType2.Name + " (would have 0)."));
    2.71 +			Assert.That(req.GetAllowsAddingMessage(unitType3, army), Is.EqualTo("Army must contain: 1 × " + unitType2.Name + " (would have 0)."));
    2.72  		}
    2.73  
    2.74  		private static void AddUnitOfTypeToArmy(UnitType unitType, Army army)
     3.1 --- a/API/Objects/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementTest.cs	Sun Jan 29 20:03:44 2012 +0000
     3.2 +++ b/API/Objects/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementTest.cs	Tue Jan 31 20:59:15 2012 +0000
     3.3 @@ -161,7 +161,7 @@
     3.4  			AddUnitOfTypeToArmy(unitType2, army);
     3.5  			RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
     3.6  			req.AddUnitTypeRequirement(unitType2);
     3.7 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so cannot contain more than: 0 × " + unitType2.Name + " (have 1)."));
     3.8 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType2.Name + " (have 1)."));
     3.9  		}
    3.10  
    3.11  		[Test]
    3.12 @@ -174,7 +174,7 @@
    3.13  			AddUnitOfTypeToArmy(unitType2, army);
    3.14  			RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
    3.15  			req.AddUnitTypeRequirement(unitType2, 2);
    3.16 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so cannot contain more than: 2 × " + unitType2.Name + " (have 3)."));
    3.17 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army cannot contain more than: 2 × " + unitType2.Name + " (have 3)."));
    3.18  		}
    3.19  
    3.20  		[Test]
    3.21 @@ -186,7 +186,7 @@
    3.22  			RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
    3.23  			req.AddUnitTypeRequirement(unitType2);
    3.24  			req.AddUnitTypeRequirement(unitType3);
    3.25 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so cannot contain more than: 0 × " + unitType2.Name + " (have 1)."));
    3.26 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType2.Name + " (have 1)."));
    3.27  		}
    3.28  
    3.29  		[Test]
    3.30 @@ -198,7 +198,7 @@
    3.31  			RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
    3.32  			req.AddUnitTypeRequirement(unitType2);
    3.33  			req.AddUnitTypeRequirement(unitType3);
    3.34 -			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army contains " + unitType1.Name + " and so cannot contain more than: 0 × " + unitType3.Name + " (have 1)."));
    3.35 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType3.Name + " (have 1)."));
    3.36  		}
    3.37  
    3.38  		[Test]
    3.39 @@ -211,7 +211,7 @@
    3.40  			RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
    3.41  			req.AddUnitTypeRequirement(unitType2);
    3.42  			req.AddUnitTypeRequirement(unitType3);
    3.43 -			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)."));
    3.44 +			Assert.That(req.GetValidationMessage(army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType2.Name + " (have 1); 0 × " + unitType3.Name + " (have 1)."));
    3.45  		}
    3.46  
    3.47  		[Test]
    3.48 @@ -230,7 +230,7 @@
    3.49  			AddUnitOfTypeToArmy(unitType1, army);
    3.50  			RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
    3.51  			req.AddUnitTypeRequirement(unitType2);
    3.52 -			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)."));
    3.53 +			Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType2.Name + " (would have 1)."));
    3.54  		}
    3.55  
    3.56  		[Test]
    3.57 @@ -242,7 +242,7 @@
    3.58  			AddUnitOfTypeToArmy(unitType2, army);
    3.59  			RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
    3.60  			req.AddUnitTypeRequirement(unitType2, 2);
    3.61 -			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)."));
    3.62 +			Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army cannot contain more than: 2 × " + unitType2.Name + " (would have 3)."));
    3.63  		}
    3.64  
    3.65  		[Test]
    3.66 @@ -253,7 +253,7 @@
    3.67  			RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
    3.68  			req.AddUnitTypeRequirement(unitType2);
    3.69  			req.AddUnitTypeRequirement(unitType3);
    3.70 -			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)."));
    3.71 +			Assert.That(req.GetAllowsAddingMessage(unitType2, army), Is.EqualTo("Army cannot contain more than: 0 × " + unitType2.Name + " (would have 1)."));
    3.72  		}
    3.73  
    3.74  		[Test]
    3.75 @@ -265,7 +265,7 @@
    3.76  			RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
    3.77  			req.AddUnitTypeRequirement(unitType2);
    3.78  			req.AddUnitTypeRequirement(unitType3);
    3.79 -			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)."));
    3.80 +			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)."));
    3.81  		}
    3.82  
    3.83  		[Test]
    3.84 @@ -277,7 +277,7 @@
    3.85  			RequiresNoMoreThanNOfUnitTypeRequirement req = new UnitRequiresNoMoreThanNOfUnitTypeRequirement(unitType1);
    3.86  			req.AddUnitTypeRequirement(unitType2);
    3.87  			req.AddUnitTypeRequirement(unitType3);
    3.88 -			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)."));
    3.89 +			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)."));
    3.90  		}
    3.91  
    3.92  		private static void AddUnitOfTypeToArmy(UnitType unitType, Army army)