changeset 238:e173c5512067

* Update to v2.6 of NUnit and new syntax/API changes
author IBBoard <dev@ibboard.co.uk>
date Sun, 28 Apr 2013 19:32:38 +0100
parents 833f72be715a
children 370bec16a364
files API/AbstractWarFoundryLoaderTests.cs API/Commands/EditArmyCommandTest.cs API/Commands/RemoveUnitCommandTest.cs API/Factories/AbstractNativeWarFoundryFactoryTest.cs API/Factories/Requirement/UnitRequiresAtLeastNUnitsRequirementFactoryTest.cs API/Factories/Requirement/UnitRequiresNParentModelsForMUnitsRequirementFactoryTest.cs API/Factories/Requirement/UnitRequiresNUnitsForMUnitsRequirementFactoryTest.cs API/Factories/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementFactoryTest.cs API/Factories/Xml/WarFoundryXmlArmyParserTest.cs API/Factories/Xml/WarFoundryXmlFactoryTests.cs API/Factories/Xml/WarFoundryXmlFactoryUtilTest.cs API/Factories/Xml/WarFoundryXmlLimitParserTest.cs API/Factories/Xml/WarFoundryXmlRaceFactoryTest.cs API/Factories/Xml/WarFoundryXmlSystemFactoryTest.cs API/Objects/ArmyCategoryTests.cs API/Objects/ArmyTests.cs API/Objects/GameSystemTest.cs API/Objects/RaceTests.cs API/Objects/Requirement/AbstractUnitRequirementTest.cs API/Objects/Requirement/RaceRequiresAtLeastNUnitsRequirementTest.cs API/Objects/Requirement/RaceRequiresNoMoreThanNUnitsRequirementTest.cs API/Objects/Requirement/RequirementHandlerTests.cs API/Objects/Requirement/UnitRequiresAtLeastNUnitsRequirementTest.cs API/Objects/Requirement/UnitRequiresNParentModelsForMUnitsRequirementTests.cs API/Objects/Requirement/UnitRequiresNUnitsForMUnitsRequirementTests.cs API/Objects/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementTest.cs API/Objects/Requirement/ValidationTests.cs API/Objects/UnitEquipmentLimitTests.cs API/Objects/UnitEquipmentNumericSelectionTests.cs API/Objects/UnitEquipmentRatioSelectionTests.cs API/Objects/UnitTypeTest.cs API/Savers/IWarFoundryFileSaverTests.cs API/Util/UnitEquipmentUtilTest.cs API/WarFoundryLoaderTest.cs IBBoard.WarFoundry.API.Tests.csproj
diffstat 35 files changed, 55 insertions(+), 89 deletions(-) [+]
line diff
     1.1 --- a/API/AbstractWarFoundryLoaderTests.cs	Tue Nov 06 20:58:48 2012 +0000
     1.2 +++ b/API/AbstractWarFoundryLoaderTests.cs	Sun Apr 28 19:32:38 2013 +0100
     1.3 @@ -2,7 +2,6 @@
     1.4  using NUnit.Framework;
     1.5  using IBBoard.WarFoundry.MockObjects;
     1.6  using System.Collections.Generic;
     1.7 -using NUnit.Framework.SyntaxHelpers;
     1.8  using System.IO;
     1.9  using IBBoard.WarFoundry.API.Loading;
    1.10  
     2.1 --- a/API/Commands/EditArmyCommandTest.cs	Tue Nov 06 20:58:48 2012 +0000
     2.2 +++ b/API/Commands/EditArmyCommandTest.cs	Sun Apr 28 19:32:38 2013 +0100
     2.3 @@ -4,7 +4,6 @@
     2.4  using NUnit.Framework;
     2.5  using IBBoard.WarFoundry.API.Objects;
     2.6  using IBBoard.WarFoundry.API.Objects.Mock;
     2.7 -using NUnit.Framework.SyntaxHelpers;
     2.8  
     2.9  namespace IBBoard.WarFoundry.API.Commands
    2.10  {
     3.1 --- a/API/Commands/RemoveUnitCommandTest.cs	Tue Nov 06 20:58:48 2012 +0000
     3.2 +++ b/API/Commands/RemoveUnitCommandTest.cs	Sun Apr 28 19:32:38 2013 +0100
     3.3 @@ -4,7 +4,6 @@
     3.4  using System;
     3.5  using NUnit.Framework;
     3.6  using IBBoard.WarFoundry.API.Objects;
     3.7 -using NUnit.Framework.SyntaxHelpers;
     3.8  using IBBoard.WarFoundry.API.Objects.Mock;
     3.9  
    3.10  
    3.11 @@ -37,14 +36,14 @@
    3.12  			Unit unit2 = new Unit(containedType, army.GetCategory(containedType.MainCategory));
    3.13  			army.AddUnit(unit2);
    3.14  			unit1.AddContainedUnit(unit2);
    3.15 -			Assert.That(army.GetUnits(), Has.Length(2));
    3.16 +			Assert.That(army.GetUnits(), Has.Length.EqualTo(2));
    3.17  			RemoveUnitCommand cmd = new RemoveUnitCommand(unit1);
    3.18  			cmd.Execute();
    3.19 -			Assert.That(army.GetUnits(), Has.Length(0));
    3.20 +			Assert.That(army.GetUnits(), Has.Length.EqualTo(0));
    3.21  			cmd.Undo();			
    3.22 -			Assert.That(army.GetUnits(), Has.Length(2));
    3.23 +			Assert.That(army.GetUnits(), Has.Length.EqualTo(2));
    3.24  			cmd.Redo();
    3.25 -			Assert.That(army.GetUnits(), Has.Length(0));
    3.26 +			Assert.That(army.GetUnits(), Has.Length.EqualTo(0));
    3.27  		}
    3.28  	}
    3.29  }
     4.1 --- a/API/Factories/AbstractNativeWarFoundryFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
     4.2 +++ b/API/Factories/AbstractNativeWarFoundryFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
     4.3 @@ -5,7 +5,6 @@
     4.4  using NUnit.Framework;
     4.5  using IBBoard.WarFoundry.API.Factories.Mock;
     4.6  using System.Diagnostics;
     4.7 -using NUnit.Framework.SyntaxHelpers;
     4.8  using System.IO;
     4.9  using IBBoard.WarFoundry.API.Objects;
    4.10  using System.Collections.Generic;
    4.11 @@ -48,11 +47,11 @@
    4.12  		{
    4.13  			FileSearchingWarFoundryFactory factory = new FileSearchingWarFoundryFactory();
    4.14  			FileInfo file = new FileInfo("testdata/multifile-zips/Test-OSX-style.system");
    4.15 -			Assert.That(factory.GetGameSystemZipEntries(file), Has.Count(3));
    4.16 -			Assert.That(factory.GetRaceZipEntries(file), Has.Count(3));
    4.17 -			Assert.That(factory.GetArmyZipEntries(file), Has.Count(3));
    4.18 +			Assert.That(factory.GetGameSystemZipEntries(file), Has.Count.EqualTo(3));
    4.19 +			Assert.That(factory.GetRaceZipEntries(file), Has.Count.EqualTo(3));
    4.20 +			Assert.That(factory.GetArmyZipEntries(file), Has.Count.EqualTo(3));
    4.21  			ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(new LoadableFileObject(file));
    4.22 -			Assert.That(objs, Has.Count(0));
    4.23 +			Assert.That(objs, Has.Count.EqualTo(0));
    4.24  		}
    4.25  	}
    4.26  }
     5.1 --- a/API/Factories/Requirement/UnitRequiresAtLeastNUnitsRequirementFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
     5.2 +++ b/API/Factories/Requirement/UnitRequiresAtLeastNUnitsRequirementFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
     5.3 @@ -4,7 +4,6 @@
     5.4  using System;
     5.5  using NUnit.Framework;
     5.6  using IBBoard.WarFoundry.API.Objects.Mock;
     5.7 -using NUnit.Framework.SyntaxHelpers;
     5.8  using IBBoard.WarFoundry.API.Objects;
     5.9  using IBBoard.WarFoundry.API.Objects.Requirement;
    5.10  using IBBoard.WarFoundry.API.Factories.Mock;
     6.1 --- a/API/Factories/Requirement/UnitRequiresNParentModelsForMUnitsRequirementFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
     6.2 +++ b/API/Factories/Requirement/UnitRequiresNParentModelsForMUnitsRequirementFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
     6.3 @@ -4,7 +4,6 @@
     6.4  using System;
     6.5  using NUnit.Framework;
     6.6  using IBBoard.WarFoundry.API.Objects.Mock;
     6.7 -using NUnit.Framework.SyntaxHelpers;
     6.8  using IBBoard.WarFoundry.API.Objects;
     6.9  using IBBoard.WarFoundry.API.Objects.Requirement;
    6.10  using IBBoard.WarFoundry.API.Factories.Mock;
     7.1 --- a/API/Factories/Requirement/UnitRequiresNUnitsForMUnitsRequirementFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
     7.2 +++ b/API/Factories/Requirement/UnitRequiresNUnitsForMUnitsRequirementFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
     7.3 @@ -4,7 +4,6 @@
     7.4  using System;
     7.5  using NUnit.Framework;
     7.6  using IBBoard.WarFoundry.API.Objects.Mock;
     7.7 -using NUnit.Framework.SyntaxHelpers;
     7.8  using IBBoard.WarFoundry.API.Objects;
     7.9  using IBBoard.WarFoundry.API.Objects.Requirement;
    7.10  using IBBoard.WarFoundry.API.Factories.Mock;
     8.1 --- a/API/Factories/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
     8.2 +++ b/API/Factories/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
     8.3 @@ -4,7 +4,6 @@
     8.4  using System;
     8.5  using NUnit.Framework;
     8.6  using IBBoard.WarFoundry.API.Objects.Mock;
     8.7 -using NUnit.Framework.SyntaxHelpers;
     8.8  using IBBoard.WarFoundry.API.Objects;
     8.9  using IBBoard.WarFoundry.API.Objects.Requirement;
    8.10  using IBBoard.WarFoundry.API.Factories.Mock;
     9.1 --- a/API/Factories/Xml/WarFoundryXmlArmyParserTest.cs	Tue Nov 06 20:58:48 2012 +0000
     9.2 +++ b/API/Factories/Xml/WarFoundryXmlArmyParserTest.cs	Sun Apr 28 19:32:38 2013 +0100
     9.3 @@ -5,7 +5,6 @@
     9.4  using IBBoard.WarFoundry.API.Objects;
     9.5  using NUnit.Framework;
     9.6  using System.IO;
     9.7 -using NUnit.Framework.SyntaxHelpers;
     9.8  
     9.9  namespace IBBoard.WarFoundry.API.Factories.Xml
    9.10  {
    10.1 --- a/API/Factories/Xml/WarFoundryXmlFactoryTests.cs	Tue Nov 06 20:58:48 2012 +0000
    10.2 +++ b/API/Factories/Xml/WarFoundryXmlFactoryTests.cs	Sun Apr 28 19:32:38 2013 +0100
    10.3 @@ -3,7 +3,6 @@
    10.4  using System.IO;
    10.5  using System.Collections.Generic;
    10.6  using IBBoard.WarFoundry.API.Objects;
    10.7 -using NUnit.Framework.SyntaxHelpers;
    10.8  using IBBoard.WarFoundry.API.Loading;
    10.9  
   10.10  namespace IBBoard.WarFoundry.API.Factories.Xml
   10.11 @@ -21,7 +20,7 @@
   10.12  			{
   10.13  				loader.RegisterFactory(factory);
   10.14  				ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(new LoadableFileObject("testdata/multifile-zips/Test.system"));
   10.15 -				Assert.That(objs, Has.Count(2));
   10.16 +				Assert.That(objs, Has.Count.EqualTo(2));
   10.17  				int raceCount = 0;
   10.18  				int systemCount = 0;
   10.19  				
   10.20 @@ -56,7 +55,7 @@
   10.21  			try
   10.22  			{
   10.23  				ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(new LoadableFileObject("testdata/multifile-zips/Test.race"));
   10.24 -				Assert.That(objs, Has.Count(2));
   10.25 +				Assert.That(objs, Has.Count.EqualTo(2));
   10.26  				int raceCount = 0;
   10.27  				int systemCount = 0;
   10.28  				
   10.29 @@ -91,7 +90,7 @@
   10.30  			try
   10.31  			{
   10.32  				ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(new LoadableFileObject("testdata/multifile-zips/Multipack.system"));
   10.33 -				Assert.That(objs, Has.Count(4));
   10.34 +				Assert.That(objs, Has.Count.EqualTo(4));
   10.35  				int raceCount = 0;
   10.36  				int systemCount = 0;
   10.37  				
   10.38 @@ -124,7 +123,7 @@
   10.39  			FixedGameSystemWarFoundryLoader fixedLoader = new FixedGameSystemWarFoundryLoader(system);
   10.40  			WarFoundryLoader.SetDefault(fixedLoader);
   10.41  			ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(new LoadableResourceObject(typeof(WarFoundryLoader).Assembly, "IBBoard.WarFoundry.data.Empire.race"));
   10.42 -			Assert.That(objs, Has.Count(1));
   10.43 +			Assert.That(objs, Has.Count.EqualTo(1));
   10.44  			IEnumerator<IWarFoundryObject> enumerator = objs.GetEnumerator();
   10.45  			enumerator.MoveNext();
   10.46  			Assert.That(enumerator.Current, Is.TypeOf(typeof(Race)));
   10.47 @@ -135,7 +134,7 @@
   10.48  		{
   10.49  			WarFoundryXmlFactory factory = WarFoundryXmlFactory.GetFactory();
   10.50  			ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(new LoadableResourceObject(typeof(WarFoundryLoader).Assembly, "IBBoard.WarFoundry.data.SampleSystem.system"));
   10.51 -			Assert.That(objs, Has.Count(1));
   10.52 +			Assert.That(objs, Has.Count.EqualTo(1));
   10.53  			IEnumerator<IWarFoundryObject> enumerator = objs.GetEnumerator();
   10.54  			enumerator.MoveNext();
   10.55  			Assert.That(enumerator.Current, Is.TypeOf(typeof(GameSystem)));
    11.1 --- a/API/Factories/Xml/WarFoundryXmlFactoryUtilTest.cs	Tue Nov 06 20:58:48 2012 +0000
    11.2 +++ b/API/Factories/Xml/WarFoundryXmlFactoryUtilTest.cs	Sun Apr 28 19:32:38 2013 +0100
    11.3 @@ -7,7 +7,6 @@
    11.4  using System.Xml.Schema;
    11.5  using IBBoard.IO;
    11.6  using NUnit.Framework;
    11.7 -using NUnit.Framework.SyntaxHelpers;
    11.8  
    11.9  namespace IBBoard.WarFoundry.API.Factories.Xml
   11.10  {
   11.11 @@ -56,7 +55,7 @@
   11.12  			catch (InvalidFileException ex)
   11.13  			{
   11.14  				Exception innerException = ex.InnerException;
   11.15 -				Assert.That(innerException, Is.InstanceOfType(typeof(XmlSchemaValidationException)));
   11.16 +				Assert.That(innerException, Is.InstanceOf(typeof(XmlSchemaValidationException)));
   11.17  			}
   11.18  		}
   11.19  	}
    12.1 --- a/API/Factories/Xml/WarFoundryXmlLimitParserTest.cs	Tue Nov 06 20:58:48 2012 +0000
    12.2 +++ b/API/Factories/Xml/WarFoundryXmlLimitParserTest.cs	Sun Apr 28 19:32:38 2013 +0100
    12.3 @@ -5,7 +5,6 @@
    12.4  using System.Xml;
    12.5  using NUnit.Framework;
    12.6  using IBBoard.Limits;
    12.7 -using NUnit.Framework.SyntaxHelpers;
    12.8  using IBBoard.IO;
    12.9  namespace IBBoard.WarFoundry.API.Factories.Xml
   12.10  {
   12.11 @@ -19,7 +18,7 @@
   12.12  			XmlElement limitElem = WarFoundryXmlFactoryUtils.SelectSingleElement(document, "//race:maxLimit/*");
   12.13  			WarFoundryXmlLimitParser parser = new WarFoundryXmlLimitParser();
   12.14  			ILimit limit = parser.GetLimitFromElement(limitElem);
   12.15 -			Assert.That(limit, Is.InstanceOfType(typeof(CompositeMaximumLimit)));
   12.16 +			Assert.That(limit, Is.InstanceOf(typeof(CompositeMaximumLimit)));
   12.17  			Assert.That(limit.GetLimit(1), Is.EqualTo(5));
   12.18  			Assert.That(limit.GetLimit(5), Is.EqualTo(5));
   12.19  			Assert.That(limit.GetLimit(10), Is.EqualTo(10));
   12.20 @@ -33,7 +32,7 @@
   12.21  			XmlElement limitElem = WarFoundryXmlFactoryUtils.SelectSingleElement(document, "//race:maxLimit/*");
   12.22  			WarFoundryXmlLimitParser parser = new WarFoundryXmlLimitParser();
   12.23  			ILimit limit = parser.GetLimitFromElement(limitElem);
   12.24 -			Assert.That(limit, Is.InstanceOfType(typeof(CompositeMinimumLimit)));
   12.25 +			Assert.That(limit, Is.InstanceOf(typeof(CompositeMinimumLimit)));
   12.26  			Assert.That(limit.GetLimit(1), Is.EqualTo(1));
   12.27  			Assert.That(limit.GetLimit(5), Is.EqualTo(5));
   12.28  			Assert.That(limit.GetLimit(10), Is.EqualTo(5));
   12.29 @@ -47,7 +46,7 @@
   12.30  			XmlElement limitElem = WarFoundryXmlFactoryUtils.SelectSingleElement(document, "//race:maxLimit/*");
   12.31  			WarFoundryXmlLimitParser parser = new WarFoundryXmlLimitParser();
   12.32  			ILimit limit = parser.GetLimitFromElement(limitElem);
   12.33 -			Assert.That(limit, Is.InstanceOfType(typeof(CompositeMaximumLimit)));
   12.34 +			Assert.That(limit, Is.InstanceOf(typeof(CompositeMaximumLimit)));
   12.35  			Assert.That(limit.GetLimit(1), Is.EqualTo(5));
   12.36  			Assert.That(limit.GetLimit(5), Is.EqualTo(5));
   12.37  			Assert.That(limit.GetLimit(10), Is.EqualTo(5));
   12.38 @@ -67,7 +66,7 @@
   12.39  			XmlElement limitElem = WarFoundryXmlFactoryUtils.SelectSingleElement(document, "//race:maxLimit/*");
   12.40  			WarFoundryXmlLimitParser parser = new WarFoundryXmlLimitParser();
   12.41  			ILimit limit = parser.GetLimitFromElement(limitElem);
   12.42 -			Assert.That(limit, Is.InstanceOfType(typeof(AbsoluteNumericLimit)));
   12.43 +			Assert.That(limit, Is.InstanceOf(typeof(AbsoluteNumericLimit)));
   12.44  			Assert.That(limit.GetLimit(1), Is.EqualTo(5));
   12.45  			Assert.That(limit.GetLimit(5), Is.EqualTo(5));
   12.46  			Assert.That(limit.GetLimit(10), Is.EqualTo(5));
    13.1 --- a/API/Factories/Xml/WarFoundryXmlRaceFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
    13.2 +++ b/API/Factories/Xml/WarFoundryXmlRaceFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
    13.3 @@ -9,7 +9,6 @@
    13.4  using IBBoard.IO;
    13.5  using IBBoard.WarFoundry.API.Objects;
    13.6  using NUnit.Framework;
    13.7 -using NUnit.Framework.SyntaxHelpers;
    13.8  using IBBoard.WarFoundry.API.Objects.Requirement;
    13.9  using IBBoard.WarFoundry.API.Factories.Requirement;
   13.10  using IBBoard.WarFoundry.API.Loading;
   13.11 @@ -145,7 +144,7 @@
   13.12  			FileInfo raceFile = new FileInfo("testdata/xml-race-factory/valid-contained-unit-reference.racex");
   13.13  			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), raceFile);
   13.14  			UnitType unitType = race.GetUnitType("Empire1");
   13.15 -			Assert.That(unitType.ContainedUnitTypes, Has.Length(1));
   13.16 +			Assert.That(unitType.ContainedUnitTypes, Has.Length.EqualTo(1));
   13.17  		}
   13.18  
   13.19  		[Test()]
   13.20 @@ -332,7 +331,7 @@
   13.21  			Assert.That(unitType.Categories, Has.Member(cat2));
   13.22  			Assert.That(race.GetUnitTypes(cat1), Is.All.EqualTo(unitType));
   13.23  			UnitType[] unitTypesCat2 = race.GetUnitTypes(cat2);
   13.24 -			Assert.That(unitTypesCat2, Has.Length(1));
   13.25 +			Assert.That(unitTypesCat2, Has.Length.EqualTo(1));
   13.26  			Assert.That(unitTypesCat2, Is.All.EqualTo(unitType));
   13.27  		}
   13.28  
   13.29 @@ -341,7 +340,7 @@
   13.30  		{
   13.31  			SetDefaultGameSystem();
   13.32  			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-race-factory/valid-categories.racex"));
   13.33 -			Assert.That(race.Categories, Has.Length(5));
   13.34 +			Assert.That(race.Categories, Has.Length.EqualTo(5));
   13.35  		}
   13.36  
   13.37  		[Test()]
   13.38 @@ -355,7 +354,7 @@
   13.39  		{
   13.40  			SetDefaultGameSystem();
   13.41  			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-race-factory/extended-requirements.racex"));
   13.42 -			Assert.That(race.Categories, Has.Length(5));
   13.43 +			Assert.That(race.Categories, Has.Length.EqualTo(5));
   13.44  		}
   13.45  
   13.46  		[Test()]
   13.47 @@ -364,7 +363,7 @@
   13.48  			SetDefaultGameSystem();
   13.49  			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-race-factory/simple-requirement.racex"));
   13.50  			UnitType unitType = race.GetUnitType("Empire1");
   13.51 -			Assert.That(unitType.GetRequirements(), Has.Length(1));
   13.52 +			Assert.That(unitType.GetRequirements(), Has.Length.EqualTo(1));
   13.53  		}
   13.54  
   13.55  		[Test()]
   13.56 @@ -373,7 +372,7 @@
   13.57  			SetDefaultGameSystem();
   13.58  			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-race-factory/simple-requirement.racex"));
   13.59  			UnitType unitType = race.GetUnitType("Empire1");
   13.60 -			Assert.That(unitType.GetRequirements()[0], Is.InstanceOfType(typeof(UnitRequiresAtLeastNUnitsRequirement)));
   13.61 +			Assert.That(unitType.GetRequirements()[0], Is.InstanceOf(typeof(UnitRequiresAtLeastNUnitsRequirement)));
   13.62  		}
   13.63  
   13.64  		[Test]
   13.65 @@ -382,7 +381,7 @@
   13.66  			SetDefaultGameSystem();
   13.67  			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-race-factory/cyclic.racex"));
   13.68  			UnitType unitType = race.GetUnitType("Empire1");
   13.69 -			Assert.That(unitType.GetRequirements()[0], Is.InstanceOfType(typeof(UnitRequiresNoMoreThanNOfUnitTypeRequirement)));
   13.70 +			Assert.That(unitType.GetRequirements()[0], Is.InstanceOf(typeof(UnitRequiresNoMoreThanNOfUnitTypeRequirement)));
   13.71  		}
   13.72  
   13.73  		[Test]
   13.74 @@ -392,7 +391,7 @@
   13.75  			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-race-factory/with-contained-only-unit.racex"));
   13.76  			Assert.That(race.GetUnitType("Empire2"), Is.Not.Null);
   13.77  			UnitType unitType1 = race.GetUnitType("Empire1");
   13.78 -			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Length(1));
   13.79 +			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Length.EqualTo(1));
   13.80  			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Member(unitType1));
   13.81  		}
   13.82  
   13.83 @@ -404,7 +403,7 @@
   13.84  			Assert.That(race.GetUnitType("Empire2"), Is.Not.Null);
   13.85  			UnitType unitType1 = race.GetUnitType("Empire1");
   13.86  			UnitType unitType3 = race.GetUnitType("Empire3");
   13.87 -			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Length(2));
   13.88 +			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Length.EqualTo(2));
   13.89  			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Member(unitType1));
   13.90  			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Member(unitType3));
   13.91  		}
   13.92 @@ -422,7 +421,7 @@
   13.93  			catch (InvalidFileException ex)
   13.94  			{
   13.95  				Exception innerException = ex.InnerException;
   13.96 -				Assert.That(innerException, Is.InstanceOfType(typeof(XmlSchemaValidationException)));
   13.97 +				Assert.That(innerException, Is.InstanceOf(typeof(XmlSchemaValidationException)));
   13.98  			}
   13.99  		}
  13.100  		
    14.1 --- a/API/Factories/Xml/WarFoundryXmlSystemFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
    14.2 +++ b/API/Factories/Xml/WarFoundryXmlSystemFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
    14.3 @@ -6,7 +6,6 @@
    14.4  using NUnit.Framework;
    14.5  using System.IO;
    14.6  using IBBoard.WarFoundry.API.Objects;
    14.7 -using NUnit.Framework.SyntaxHelpers;
    14.8  using IBBoard.IO;
    14.9  using System.Xml.Schema;
   14.10  using IBBoard.WarFoundry.API.Loading;
   14.11 @@ -21,7 +20,7 @@
   14.12  		{
   14.13  			ILoadableObject repackFile = new LoadableFileObject("testdata/zip-format/Repack.system");
   14.14  			Assert.That(WarFoundryXmlFactory.GetFactory().CanHandleFileAsGameSystem(repackFile), Is.True);
   14.15 -			Assert.That(WarFoundryXmlFactory.GetFactory().CreateObjectsFromFile(repackFile), Has.Count(1));
   14.16 +			Assert.That(WarFoundryXmlFactory.GetFactory().CreateObjectsFromFile(repackFile), Has.Count.EqualTo(1));
   14.17  		}
   14.18  
   14.19  		[Test()]
   14.20 @@ -40,7 +39,7 @@
   14.21  		{
   14.22  			GameSystem system = SingleXmlObjectLoader.LoadGameSystemFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-system-factory/valid-default-stats-one-stats-set.systemx"));
   14.23  			Assert.That(system.StandardSystemStatsID, Is.EqualTo("defaultStats"));
   14.24 -			Assert.That(system.SystemStats, Has.Length(1));
   14.25 +			Assert.That(system.SystemStats, Has.Length.EqualTo(1));
   14.26  		}
   14.27  
   14.28  		[Test()]
   14.29 @@ -48,7 +47,7 @@
   14.30  		{
   14.31  			GameSystem system = SingleXmlObjectLoader.LoadGameSystemFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-system-factory/valid-default-stats-multiple-stats-set.systemx"));
   14.32  			Assert.That(system.StandardSystemStatsID, Is.EqualTo("defaultStats"));
   14.33 -			Assert.That(system.SystemStats, Has.Length(2));
   14.34 +			Assert.That(system.SystemStats, Has.Length.EqualTo(2));
   14.35  		}
   14.36  
   14.37  		[Test()]
   14.38 @@ -67,7 +66,7 @@
   14.39  		public void TestValidCategoriesLoadsCorrectly()
   14.40  		{
   14.41  			GameSystem system = SingleXmlObjectLoader.LoadGameSystemFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-system-factory/valid-categories.systemx"));
   14.42 -			Assert.That(system.Categories, Has.Length(5));
   14.43 +			Assert.That(system.Categories, Has.Length.EqualTo(5));
   14.44  		}
   14.45  
   14.46  		[Test()]
   14.47 @@ -108,7 +107,7 @@
   14.48  			catch (InvalidFileException ex)
   14.49  			{
   14.50  				Exception innerException = ex.InnerException;
   14.51 -				Assert.That(innerException, Is.InstanceOfType(typeof(XmlSchemaValidationException)));
   14.52 +				Assert.That(innerException, Is.InstanceOf(typeof(XmlSchemaValidationException)));
   14.53  			}
   14.54  		}
   14.55  	}
    15.1 --- a/API/Objects/ArmyCategoryTests.cs	Tue Nov 06 20:58:48 2012 +0000
    15.2 +++ b/API/Objects/ArmyCategoryTests.cs	Sun Apr 28 19:32:38 2013 +0100
    15.3 @@ -6,7 +6,6 @@
    15.4  using IBBoard.WarFoundry.API.Objects.Mock;
    15.5  using IBBoard.WarFoundry.API.Objects.Requirement;
    15.6  using IBBoard.WarFoundry.API.Objects.Requirement.Mock;
    15.7 -using NUnit.Framework.SyntaxHelpers;
    15.8  
    15.9  
   15.10  namespace IBBoard.WarFoundry.API.Objects
   15.11 @@ -54,7 +53,7 @@
   15.12  			army.AddUnit(unit2);
   15.13  			unit1.AddContainedUnit(unit2);
   15.14  			ArmyCategory category = army.GetCategory(MockCategory.GetCategory());
   15.15 -			Assert.That(category.GetUnits(), Has.Length(2));
   15.16 +			Assert.That(category.GetUnits(), Has.Length.EqualTo(2));
   15.17  			Assert.That(category.GetUnits(), Has.Member(unit1));
   15.18  			Assert.That(category.GetUnits(), Has.Member(unit2));
   15.19  		}
   15.20 @@ -69,7 +68,7 @@
   15.21  			army.AddUnit(unit2);
   15.22  			unit1.AddContainedUnit(unit2);
   15.23  			ArmyCategory category = army.GetCategory(MockCategory.GetCategory());
   15.24 -			Assert.That(category.GetMainUnits(), Has.Length(1));
   15.25 +			Assert.That(category.GetMainUnits(), Has.Length.EqualTo(1));
   15.26  			Assert.That(category.GetMainUnits(), Has.Member(unit1));
   15.27  		}
   15.28  	}
    16.1 --- a/API/Objects/ArmyTests.cs	Tue Nov 06 20:58:48 2012 +0000
    16.2 +++ b/API/Objects/ArmyTests.cs	Sun Apr 28 19:32:38 2013 +0100
    16.3 @@ -4,7 +4,6 @@
    16.4  using System;
    16.5  using NUnit.Framework;
    16.6  using IBBoard.WarFoundry.API.Objects.Requirement.Mock;
    16.7 -using NUnit.Framework.SyntaxHelpers;
    16.8  using System.Collections.Generic;
    16.9  using IBBoard.WarFoundry.API.Objects.Requirement;
   16.10  using IBBoard.WarFoundry.API.Objects.Mock;
   16.11 @@ -45,7 +44,7 @@
   16.12  		{
   16.13  			Army army = new Army(mockRace, "Test", 1000);
   16.14  			ICollection<IRequirement> requirements = army.GetRequirements();
   16.15 -			Assert.That(requirements, Has.Count(3));
   16.16 +			Assert.That(requirements, Has.Count.EqualTo(3));
   16.17  			Assert.That(requirements, Has.Member(unitType1Requirement));
   16.18  			Assert.That(requirements, Has.Member(unitType2Requirement));
   16.19  			Assert.That(requirements, Has.Member(unitType3Requirement));
   16.20 @@ -56,7 +55,7 @@
   16.21  		{
   16.22  			Army army = new Army(mockRace, "Test", 1000);
   16.23  			ICollection<IRequirement> requirements = army.GetAddingUnitRequirements(unitType1);
   16.24 -			Assert.That(requirements, Has.Count(1));
   16.25 +			Assert.That(requirements, Has.Count.EqualTo(1));
   16.26  			Assert.That(requirements, Has.Member(unitType1Requirement));
   16.27  		}
   16.28  
   16.29 @@ -66,7 +65,7 @@
   16.30  			Army army = new Army(mockRace, "Test", 1000);
   16.31  			army.AddUnit(new Unit(unitType1, army.GetCategory(unitType1.MainCategory)));
   16.32  			ICollection<IRequirement> requirements = army.GetAddingUnitRequirements(unitType2);
   16.33 -			Assert.That(requirements, Has.Count(2));
   16.34 +			Assert.That(requirements, Has.Count.EqualTo(2));
   16.35  			Assert.That(requirements, Has.Member(unitType1Requirement));
   16.36  			Assert.That(requirements, Has.Member(unitType2Requirement));
   16.37  		}
    17.1 --- a/API/Objects/GameSystemTest.cs	Tue Nov 06 20:58:48 2012 +0000
    17.2 +++ b/API/Objects/GameSystemTest.cs	Sun Apr 28 19:32:38 2013 +0100
    17.3 @@ -1,7 +1,6 @@
    17.4  using System;
    17.5  using NUnit.Framework;
    17.6  using IBBoard.WarFoundry.API.Factories;
    17.7 -using NUnit.Framework.SyntaxHelpers;
    17.8  using System.Reflection;
    17.9  using IBBoard.NUnit;
   17.10  
    18.1 --- a/API/Objects/RaceTests.cs	Tue Nov 06 20:58:48 2012 +0000
    18.2 +++ b/API/Objects/RaceTests.cs	Sun Apr 28 19:32:38 2013 +0100
    18.3 @@ -4,7 +4,6 @@
    18.4  using System;
    18.5  using NUnit.Framework;
    18.6  using IBBoard.WarFoundry.API.Objects.Mock;
    18.7 -using NUnit.Framework.SyntaxHelpers;
    18.8  using IBBoard.WarFoundry.API.Objects.Requirement;
    18.9  using System.Collections.Generic;
   18.10  using IBBoard.NUnit;
   18.11 @@ -19,7 +18,7 @@
   18.12  		[Test()]
   18.13  		public void TestRaceWithNoUnitTypesHasNoRequirements()
   18.14  		{
   18.15 -			Assert.That(new MockRace().GetRequirements(), Has.Count(0));
   18.16 +			Assert.That(new MockRace().GetRequirements(), Has.Count.EqualTo(0));
   18.17  		}
   18.18  
   18.19  		[Test()]
   18.20 @@ -27,7 +26,7 @@
   18.21  		{
   18.22  			MockRace race = new MockRace();
   18.23  			race.AddUnitType(new MockUnitType());
   18.24 -			Assert.That(race.GetRequirements(), Has.Count(0));
   18.25 +			Assert.That(race.GetRequirements(), Has.Count.EqualTo(0));
   18.26  		}
   18.27  
   18.28  		[Test()]
   18.29 @@ -39,7 +38,7 @@
   18.30  			unitType.AddRequirement(unitRequirement);
   18.31  			race.AddUnitType(unitType);
   18.32  			ICollection<IRequirement> raceRequirements = race.GetRequirements();
   18.33 -			Assert.That(raceRequirements, Has.Count(1));
   18.34 +			Assert.That(raceRequirements, Has.Count.EqualTo(1));
   18.35  			Assert.That(raceRequirements, Has.All.EqualTo(unitRequirement));
   18.36  		}
   18.37  
   18.38 @@ -58,7 +57,7 @@
   18.39  			unitType2.AddRequirement(unitRequirement3);
   18.40  			race.AddUnitType(unitType2);
   18.41  			ICollection<IRequirement> raceRequirements = race.GetRequirements();
   18.42 -			Assert.That(raceRequirements, Has.Count(3));
   18.43 +			Assert.That(raceRequirements, Has.Count.EqualTo(3));
   18.44  			Assert.That(raceRequirements, Has.Member(unitRequirement1));
   18.45  			Assert.That(raceRequirements, Has.Member(unitRequirement2));
   18.46  			Assert.That(raceRequirements, Has.Member(unitRequirement3));
   18.47 @@ -73,7 +72,7 @@
   18.48  			MockContainedUnitType unitType2 = new MockContainedUnitType("type2", "Type 2");
   18.49  			race.AddUnitType(unitType2);
   18.50  			unitType1.AddContainedUnitType(unitType2);
   18.51 -			Assert.That(race.GetUnitTypes(MockCategory.GetCategory()), Has.Length(1));
   18.52 +			Assert.That(race.GetUnitTypes(MockCategory.GetCategory()), Has.Length.EqualTo(1));
   18.53  			Assert.That(race.GetUnitTypes(MockCategory.GetCategory()), Has.Member(unitType1));
   18.54  		}
   18.55  
    19.1 --- a/API/Objects/Requirement/AbstractUnitRequirementTest.cs	Tue Nov 06 20:58:48 2012 +0000
    19.2 +++ b/API/Objects/Requirement/AbstractUnitRequirementTest.cs	Sun Apr 28 19:32:38 2013 +0100
    19.3 @@ -3,7 +3,6 @@
    19.4  // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
    19.5  using System;
    19.6  using NUnit.Framework;
    19.7 -using NUnit.Framework.SyntaxHelpers;
    19.8  using IBBoard.NUnit;
    19.9  using System.Collections.Generic;
   19.10  
    20.1 --- a/API/Objects/Requirement/RaceRequiresAtLeastNUnitsRequirementTest.cs	Tue Nov 06 20:58:48 2012 +0000
    20.2 +++ b/API/Objects/Requirement/RaceRequiresAtLeastNUnitsRequirementTest.cs	Sun Apr 28 19:32:38 2013 +0100
    20.3 @@ -4,7 +4,6 @@
    20.4  using System;
    20.5  using NUnit.Framework;
    20.6  using IBBoard.WarFoundry.API.Objects.Mock;
    20.7 -using NUnit.Framework.SyntaxHelpers;
    20.8  
    20.9  namespace IBBoard.WarFoundry.API.Objects.Requirement
   20.10  {
    21.1 --- a/API/Objects/Requirement/RaceRequiresNoMoreThanNUnitsRequirementTest.cs	Tue Nov 06 20:58:48 2012 +0000
    21.2 +++ b/API/Objects/Requirement/RaceRequiresNoMoreThanNUnitsRequirementTest.cs	Sun Apr 28 19:32:38 2013 +0100
    21.3 @@ -4,7 +4,6 @@
    21.4  using System;
    21.5  using NUnit.Framework;
    21.6  using IBBoard.WarFoundry.API.Objects.Mock;
    21.7 -using NUnit.Framework.SyntaxHelpers;
    21.8  
    21.9  namespace IBBoard.WarFoundry.API.Objects.Requirement
   21.10  {
    22.1 --- a/API/Objects/Requirement/RequirementHandlerTests.cs	Tue Nov 06 20:58:48 2012 +0000
    22.2 +++ b/API/Objects/Requirement/RequirementHandlerTests.cs	Sun Apr 28 19:32:38 2013 +0100
    22.3 @@ -5,7 +5,6 @@
    22.4  using NUnit.Framework;
    22.5  using IBBoard.WarFoundry.API.Objects.Mock;
    22.6  using IBBoard.WarFoundry.API.Objects;
    22.7 -using NUnit.Framework.SyntaxHelpers;
    22.8  using IBBoard.WarFoundry.API.Objects.Requirement.Mock;
    22.9  using System.Collections.Generic;
   22.10  
   22.11 @@ -181,7 +180,7 @@
   22.12  			Army army = new Army(race, "test", 1000);
   22.13  			ICollection<string> failureMessages;
   22.14  			RequirementHandler.ValidateArmy(army, out failureMessages);
   22.15 -			Assert.That(failureMessages, Has.Count(2));
   22.16 +			Assert.That(failureMessages, Has.Count.EqualTo(2));
   22.17  		}
   22.18  
   22.19  		[Test()]
   22.20 @@ -197,7 +196,7 @@
   22.21  			Army army = new Army(race, "test", 1000);
   22.22  			ICollection<string> failureMessages;
   22.23  			RequirementHandler.AllowsAdding(mockUnitType, army, out failureMessages);
   22.24 -			Assert.That(failureMessages, Has.Count(2));
   22.25 +			Assert.That(failureMessages, Has.Count.EqualTo(2));
   22.26  		}
   22.27  	}
   22.28  }
    23.1 --- a/API/Objects/Requirement/UnitRequiresAtLeastNUnitsRequirementTest.cs	Tue Nov 06 20:58:48 2012 +0000
    23.2 +++ b/API/Objects/Requirement/UnitRequiresAtLeastNUnitsRequirementTest.cs	Sun Apr 28 19:32:38 2013 +0100
    23.3 @@ -4,7 +4,6 @@
    23.4  using System;
    23.5  using NUnit.Framework;
    23.6  using IBBoard.WarFoundry.API.Objects.Mock;
    23.7 -using NUnit.Framework.SyntaxHelpers;
    23.8  
    23.9  namespace IBBoard.WarFoundry.API.Objects.Requirement
   23.10  {
    24.1 --- a/API/Objects/Requirement/UnitRequiresNParentModelsForMUnitsRequirementTests.cs	Tue Nov 06 20:58:48 2012 +0000
    24.2 +++ b/API/Objects/Requirement/UnitRequiresNParentModelsForMUnitsRequirementTests.cs	Sun Apr 28 19:32:38 2013 +0100
    24.3 @@ -3,7 +3,6 @@
    24.4  // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
    24.5  using System;
    24.6  using NUnit.Framework;
    24.7 -using NUnit.Framework.SyntaxHelpers;
    24.8  using IBBoard.WarFoundry.API.Objects.Requirement.Context;
    24.9  using System.Collections.Generic;
   24.10  
    25.1 --- a/API/Objects/Requirement/UnitRequiresNUnitsForMUnitsRequirementTests.cs	Tue Nov 06 20:58:48 2012 +0000
    25.2 +++ b/API/Objects/Requirement/UnitRequiresNUnitsForMUnitsRequirementTests.cs	Sun Apr 28 19:32:38 2013 +0100
    25.3 @@ -4,7 +4,6 @@
    25.4  using System;
    25.5  using NUnit.Framework;
    25.6  using IBBoard.WarFoundry.API.Objects.Mock;
    25.7 -using NUnit.Framework.SyntaxHelpers;
    25.8  
    25.9  namespace IBBoard.WarFoundry.API.Objects.Requirement
   25.10  {
    26.1 --- a/API/Objects/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementTest.cs	Tue Nov 06 20:58:48 2012 +0000
    26.2 +++ b/API/Objects/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementTest.cs	Sun Apr 28 19:32:38 2013 +0100
    26.3 @@ -4,7 +4,6 @@
    26.4  using System;
    26.5  using NUnit.Framework;
    26.6  using IBBoard.WarFoundry.API.Objects.Mock;
    26.7 -using NUnit.Framework.SyntaxHelpers;
    26.8  
    26.9  namespace IBBoard.WarFoundry.API.Objects.Requirement
   26.10  {
    27.1 --- a/API/Objects/Requirement/ValidationTests.cs	Tue Nov 06 20:58:48 2012 +0000
    27.2 +++ b/API/Objects/Requirement/ValidationTests.cs	Sun Apr 28 19:32:38 2013 +0100
    27.3 @@ -3,7 +3,6 @@
    27.4  // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
    27.5  using System;
    27.6  using NUnit.Framework;
    27.7 -using NUnit.Framework.SyntaxHelpers;
    27.8  
    27.9  namespace IBBoard.WarFoundry.API.Objects.Requirement
   27.10  {
    28.1 --- a/API/Objects/UnitEquipmentLimitTests.cs	Tue Nov 06 20:58:48 2012 +0000
    28.2 +++ b/API/Objects/UnitEquipmentLimitTests.cs	Sun Apr 28 19:32:38 2013 +0100
    28.3 @@ -5,7 +5,6 @@
    28.4  using NUnit.Framework;
    28.5  using IBBoard.WarFoundry.API.Factories;
    28.6  using IBBoard.Limits;
    28.7 -using NUnit.Framework.SyntaxHelpers;
    28.8  using IBBoard.WarFoundry.API.Util;
    28.9  using IBBoard.CustomMath;
   28.10  
    29.1 --- a/API/Objects/UnitEquipmentNumericSelectionTests.cs	Tue Nov 06 20:58:48 2012 +0000
    29.2 +++ b/API/Objects/UnitEquipmentNumericSelectionTests.cs	Sun Apr 28 19:32:38 2013 +0100
    29.3 @@ -6,7 +6,6 @@
    29.4  using IBBoard.WarFoundry.API.Util;
    29.5  using IBBoard.WarFoundry.API.Factories;
    29.6  using IBBoard.Limits;
    29.7 -using NUnit.Framework.SyntaxHelpers;
    29.8  
    29.9  namespace IBBoard.WarFoundry.API.Objects
   29.10  {
    30.1 --- a/API/Objects/UnitEquipmentRatioSelectionTests.cs	Tue Nov 06 20:58:48 2012 +0000
    30.2 +++ b/API/Objects/UnitEquipmentRatioSelectionTests.cs	Sun Apr 28 19:32:38 2013 +0100
    30.3 @@ -6,7 +6,6 @@
    30.4  using IBBoard.WarFoundry.API.Util;
    30.5  using IBBoard.WarFoundry.API.Factories;
    30.6  using IBBoard.Limits;
    30.7 -using NUnit.Framework.SyntaxHelpers;
    30.8  
    30.9  namespace IBBoard.WarFoundry.API.Objects
   30.10  {
    31.1 --- a/API/Objects/UnitTypeTest.cs	Tue Nov 06 20:58:48 2012 +0000
    31.2 +++ b/API/Objects/UnitTypeTest.cs	Sun Apr 28 19:32:38 2013 +0100
    31.3 @@ -4,7 +4,6 @@
    31.4  using IBBoard.WarFoundry.API.Objects.Mock;
    31.5  using NUnit.Framework;
    31.6  using NUnit.Framework.Constraints;
    31.7 -using NUnit.Framework.SyntaxHelpers;
    31.8  using IBBoard.WarFoundry.API.Objects.Requirement;
    31.9  using System.Reflection;
   31.10  using IBBoard.NUnit;
   31.11 @@ -54,9 +53,9 @@
   31.12  		{
   31.13  			UnitType unitType = new UnitType("unittype1", "Swordsmen", new MockRace());
   31.14  			UnitRequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(unitType);
   31.15 -			Assert.That(unitType.GetRequirements(), Has.Length(0));
   31.16 +			Assert.That(unitType.GetRequirements(), Has.Length.EqualTo(0));
   31.17  			unitType.AddRequirement(req);
   31.18 -			Assert.That(unitType.GetRequirements(), Has.Length(1));
   31.19 +			Assert.That(unitType.GetRequirements(), Has.Length.EqualTo(1));
   31.20  		}
   31.21  
   31.22  		[Test]
   31.23 @@ -66,7 +65,7 @@
   31.24  			UnitType unitType = new UnitType("unittype1", "Swordsmen", mockRace);
   31.25  			unitType.MinNumber = 1;
   31.26  			unitType.MaxNumber = 2;
   31.27 -			Assert.That(unitType.GetRequirements(), Has.Length(2));
   31.28 +			Assert.That(unitType.GetRequirements(), Has.Length.EqualTo(2));
   31.29  			RaceRequiresNoMoreThanNUnitsRequirement maxLimit = new RaceRequiresNoMoreThanNUnitsRequirement(mockRace);
   31.30  			maxLimit.AddUnitTypeRequirement(unitType, 2);
   31.31  			Assert.That(unitType.GetRequirements(), Has.Member(maxLimit));
    32.1 --- a/API/Savers/IWarFoundryFileSaverTests.cs	Tue Nov 06 20:58:48 2012 +0000
    32.2 +++ b/API/Savers/IWarFoundryFileSaverTests.cs	Sun Apr 28 19:32:38 2013 +0100
    32.3 @@ -6,7 +6,6 @@
    32.4  using IBBoard.WarFoundry.API.Objects.Mock;
    32.5  using ICSharpCode.SharpZipLib.Zip;
    32.6  using NUnit.Framework;
    32.7 -using NUnit.Framework.SyntaxHelpers;
    32.8  using ICSharpCode.SharpZipLib.Core;
    32.9  using IBBoard.IO;
   32.10  using IBBoard.WarFoundry.API.Factories;
   32.11 @@ -87,7 +86,7 @@
   32.12  				enumerator.MoveNext();
   32.13  				ZipEntry current = (ZipEntry)enumerator.Current;
   32.14  				Assert.That(current.Name, Is.EqualTo(GetEntryName(obj)));
   32.15 -				Assert.That(current.Name, Text.EndsWith(GetFileExtensionForType(obj)));
   32.16 +				Assert.That(current.Name, Is.StringEnding(GetFileExtensionForType(obj)));
   32.17  				file.Close();
   32.18  			}
   32.19  			finally
    33.1 --- a/API/Util/UnitEquipmentUtilTest.cs	Tue Nov 06 20:58:48 2012 +0000
    33.2 +++ b/API/Util/UnitEquipmentUtilTest.cs	Sun Apr 28 19:32:38 2013 +0100
    33.3 @@ -8,7 +8,6 @@
    33.4  using IBBoard.Limits;
    33.5  using IBBoard.WarFoundry.API.Objects;
    33.6  using IBBoard.WarFoundry.API.Objects.Mock;
    33.7 -using NUnit.Framework.SyntaxHelpers;
    33.8  
    33.9  namespace IBBoard.WarFoundry.API.Util
   33.10  {
    34.1 --- a/API/WarFoundryLoaderTest.cs	Tue Nov 06 20:58:48 2012 +0000
    34.2 +++ b/API/WarFoundryLoaderTest.cs	Sun Apr 28 19:32:38 2013 +0100
    34.3 @@ -7,7 +7,6 @@
    34.4  using NUnit.Framework;
    34.5  using IBBoard.WarFoundry.API.Factories.Mock;
    34.6  using IBBoard.WarFoundry.API.Objects;
    34.7 -using NUnit.Framework.SyntaxHelpers;
    34.8  using System.Collections.Generic;
    34.9  using IBBoard.WarFoundry.API.Factories.Xml;
   34.10  using IBBoard.WarFoundry.API.Factories.Requirement;
   34.11 @@ -47,7 +46,7 @@
   34.12  			DefaultWarFoundryLoader loader = new DefaultWarFoundryLoader();
   34.13  			loader.RegisterFactory(WarFoundryXmlFactory.GetFactory());
   34.14  			ICollection<IWarFoundryObject> objs = loader.LoadFile(new FileInfo("testdata/Test.system"));
   34.15 -			Assert.That(objs, Has.Count(1));
   34.16 +			Assert.That(objs, Has.Count.EqualTo(1));
   34.17  		}
   34.18  
   34.19  		[Test()]
   34.20 @@ -98,9 +97,9 @@
   34.21  
   34.22  			try
   34.23  			{
   34.24 -				Assert.That(loader.GetGameSystems(), Has.Length(1));
   34.25 +				Assert.That(loader.GetGameSystems(), Has.Length.EqualTo(1));
   34.26  				GameSystem gameSystem = loader.GetGameSystems()[0];
   34.27 -				Assert.That(loader.GetRaces(gameSystem), Has.Length(1));
   34.28 +				Assert.That(loader.GetRaces(gameSystem), Has.Length.EqualTo(1));
   34.29  			}
   34.30  			finally
   34.31  			{
    35.1 --- a/IBBoard.WarFoundry.API.Tests.csproj	Tue Nov 06 20:58:48 2012 +0000
    35.2 +++ b/IBBoard.WarFoundry.API.Tests.csproj	Sun Apr 28 19:32:38 2013 +0100
    35.3 @@ -340,12 +340,12 @@
    35.4    <ItemGroup>
    35.5      <Reference Include="System" />
    35.6      <Reference Include="System.Xml" />
    35.7 -    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
    35.8 -      <SpecificVersion>False</SpecificVersion>
    35.9 -    </Reference>
   35.10      <Reference Include="xmlunit">
   35.11        <HintPath>libs\xmlunit.dll</HintPath>
   35.12      </Reference>
   35.13 +    <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
   35.14 +      <Private>False</Private>
   35.15 +    </Reference>
   35.16    </ItemGroup>
   35.17    <ItemGroup>
   35.18      <ProjectReference Include="..\IBBoard.WarFoundry.API\IBBoard.WarFoundry.API.csproj">