Mercurial > repos > IBDev-IBBoard.WarFoundry.API.Tests

changeset 238:e173c5512067

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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 wrap: on
line diff
--- a/API/AbstractWarFoundryLoaderTests.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/AbstractWarFoundryLoaderTests.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -2,7 +2,6 @@
 using NUnit.Framework;
 using IBBoard.WarFoundry.MockObjects;
 using System.Collections.Generic;
-using NUnit.Framework.SyntaxHelpers;
 using System.IO;
 using IBBoard.WarFoundry.API.Loading;
 
--- a/API/Commands/EditArmyCommandTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Commands/EditArmyCommandTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects;
 using IBBoard.WarFoundry.API.Objects.Mock;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace IBBoard.WarFoundry.API.Commands
 {
--- a/API/Commands/RemoveUnitCommandTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Commands/RemoveUnitCommandTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.WarFoundry.API.Objects.Mock;
 
 
@@ -37,14 +36,14 @@
 			Unit unit2 = new Unit(containedType, army.GetCategory(containedType.MainCategory));
 			army.AddUnit(unit2);
 			unit1.AddContainedUnit(unit2);
-			Assert.That(army.GetUnits(), Has.Length(2));
+			Assert.That(army.GetUnits(), Has.Length.EqualTo(2));
 			RemoveUnitCommand cmd = new RemoveUnitCommand(unit1);
 			cmd.Execute();
-			Assert.That(army.GetUnits(), Has.Length(0));
+			Assert.That(army.GetUnits(), Has.Length.EqualTo(0));
 			cmd.Undo();			
-			Assert.That(army.GetUnits(), Has.Length(2));
+			Assert.That(army.GetUnits(), Has.Length.EqualTo(2));
 			cmd.Redo();
-			Assert.That(army.GetUnits(), Has.Length(0));
+			Assert.That(army.GetUnits(), Has.Length.EqualTo(0));
 		}
 	}
 }
--- a/API/Factories/AbstractNativeWarFoundryFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Factories/AbstractNativeWarFoundryFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -5,7 +5,6 @@
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Factories.Mock;
 using System.Diagnostics;
-using NUnit.Framework.SyntaxHelpers;
 using System.IO;
 using IBBoard.WarFoundry.API.Objects;
 using System.Collections.Generic;
@@ -48,11 +47,11 @@
 		{
 			FileSearchingWarFoundryFactory factory = new FileSearchingWarFoundryFactory();
 			FileInfo file = new FileInfo("testdata/multifile-zips/Test-OSX-style.system");
-			Assert.That(factory.GetGameSystemZipEntries(file), Has.Count(3));
-			Assert.That(factory.GetRaceZipEntries(file), Has.Count(3));
-			Assert.That(factory.GetArmyZipEntries(file), Has.Count(3));
+			Assert.That(factory.GetGameSystemZipEntries(file), Has.Count.EqualTo(3));
+			Assert.That(factory.GetRaceZipEntries(file), Has.Count.EqualTo(3));
+			Assert.That(factory.GetArmyZipEntries(file), Has.Count.EqualTo(3));
 			ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(new LoadableFileObject(file));
-			Assert.That(objs, Has.Count(0));
+			Assert.That(objs, Has.Count.EqualTo(0));
 		}
 	}
 }
--- a/API/Factories/Requirement/UnitRequiresAtLeastNUnitsRequirementFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Factories/Requirement/UnitRequiresAtLeastNUnitsRequirementFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects.Mock;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.WarFoundry.API.Objects;
 using IBBoard.WarFoundry.API.Objects.Requirement;
 using IBBoard.WarFoundry.API.Factories.Mock;
--- a/API/Factories/Requirement/UnitRequiresNParentModelsForMUnitsRequirementFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Factories/Requirement/UnitRequiresNParentModelsForMUnitsRequirementFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects.Mock;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.WarFoundry.API.Objects;
 using IBBoard.WarFoundry.API.Objects.Requirement;
 using IBBoard.WarFoundry.API.Factories.Mock;
--- a/API/Factories/Requirement/UnitRequiresNUnitsForMUnitsRequirementFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Factories/Requirement/UnitRequiresNUnitsForMUnitsRequirementFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects.Mock;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.WarFoundry.API.Objects;
 using IBBoard.WarFoundry.API.Objects.Requirement;
 using IBBoard.WarFoundry.API.Factories.Mock;
--- a/API/Factories/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Factories/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects.Mock;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.WarFoundry.API.Objects;
 using IBBoard.WarFoundry.API.Objects.Requirement;
 using IBBoard.WarFoundry.API.Factories.Mock;
--- a/API/Factories/Xml/WarFoundryXmlArmyParserTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Factories/Xml/WarFoundryXmlArmyParserTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -5,7 +5,6 @@
 using IBBoard.WarFoundry.API.Objects;
 using NUnit.Framework;
 using System.IO;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace IBBoard.WarFoundry.API.Factories.Xml
 {
--- a/API/Factories/Xml/WarFoundryXmlFactoryTests.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Factories/Xml/WarFoundryXmlFactoryTests.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -3,7 +3,6 @@
 using System.IO;
 using System.Collections.Generic;
 using IBBoard.WarFoundry.API.Objects;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.WarFoundry.API.Loading;
 
 namespace IBBoard.WarFoundry.API.Factories.Xml
@@ -21,7 +20,7 @@
 			{
 				loader.RegisterFactory(factory);
 				ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(new LoadableFileObject("testdata/multifile-zips/Test.system"));
-				Assert.That(objs, Has.Count(2));
+				Assert.That(objs, Has.Count.EqualTo(2));
 				int raceCount = 0;
 				int systemCount = 0;
 				
@@ -56,7 +55,7 @@
 			try
 			{
 				ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(new LoadableFileObject("testdata/multifile-zips/Test.race"));
-				Assert.That(objs, Has.Count(2));
+				Assert.That(objs, Has.Count.EqualTo(2));
 				int raceCount = 0;
 				int systemCount = 0;
 				
@@ -91,7 +90,7 @@
 			try
 			{
 				ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(new LoadableFileObject("testdata/multifile-zips/Multipack.system"));
-				Assert.That(objs, Has.Count(4));
+				Assert.That(objs, Has.Count.EqualTo(4));
 				int raceCount = 0;
 				int systemCount = 0;
 				
@@ -124,7 +123,7 @@
 			FixedGameSystemWarFoundryLoader fixedLoader = new FixedGameSystemWarFoundryLoader(system);
 			WarFoundryLoader.SetDefault(fixedLoader);
 			ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(new LoadableResourceObject(typeof(WarFoundryLoader).Assembly, "IBBoard.WarFoundry.data.Empire.race"));
-			Assert.That(objs, Has.Count(1));
+			Assert.That(objs, Has.Count.EqualTo(1));
 			IEnumerator<IWarFoundryObject> enumerator = objs.GetEnumerator();
 			enumerator.MoveNext();
 			Assert.That(enumerator.Current, Is.TypeOf(typeof(Race)));
@@ -135,7 +134,7 @@
 		{
 			WarFoundryXmlFactory factory = WarFoundryXmlFactory.GetFactory();
 			ICollection<IWarFoundryObject> objs = factory.CreateObjectsFromFile(new LoadableResourceObject(typeof(WarFoundryLoader).Assembly, "IBBoard.WarFoundry.data.SampleSystem.system"));
-			Assert.That(objs, Has.Count(1));
+			Assert.That(objs, Has.Count.EqualTo(1));
 			IEnumerator<IWarFoundryObject> enumerator = objs.GetEnumerator();
 			enumerator.MoveNext();
 			Assert.That(enumerator.Current, Is.TypeOf(typeof(GameSystem)));
--- a/API/Factories/Xml/WarFoundryXmlFactoryUtilTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Factories/Xml/WarFoundryXmlFactoryUtilTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -7,7 +7,6 @@
 using System.Xml.Schema;
 using IBBoard.IO;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace IBBoard.WarFoundry.API.Factories.Xml
 {
@@ -56,7 +55,7 @@
 			catch (InvalidFileException ex)
 			{
 				Exception innerException = ex.InnerException;
-				Assert.That(innerException, Is.InstanceOfType(typeof(XmlSchemaValidationException)));
+				Assert.That(innerException, Is.InstanceOf(typeof(XmlSchemaValidationException)));
 			}
 		}
 	}
--- a/API/Factories/Xml/WarFoundryXmlLimitParserTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Factories/Xml/WarFoundryXmlLimitParserTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -5,7 +5,6 @@
 using System.Xml;
 using NUnit.Framework;
 using IBBoard.Limits;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.IO;
 namespace IBBoard.WarFoundry.API.Factories.Xml
 {
@@ -19,7 +18,7 @@
 			XmlElement limitElem = WarFoundryXmlFactoryUtils.SelectSingleElement(document, "//race:maxLimit/*");
 			WarFoundryXmlLimitParser parser = new WarFoundryXmlLimitParser();
 			ILimit limit = parser.GetLimitFromElement(limitElem);
-			Assert.That(limit, Is.InstanceOfType(typeof(CompositeMaximumLimit)));
+			Assert.That(limit, Is.InstanceOf(typeof(CompositeMaximumLimit)));
 			Assert.That(limit.GetLimit(1), Is.EqualTo(5));
 			Assert.That(limit.GetLimit(5), Is.EqualTo(5));
 			Assert.That(limit.GetLimit(10), Is.EqualTo(10));
@@ -33,7 +32,7 @@
 			XmlElement limitElem = WarFoundryXmlFactoryUtils.SelectSingleElement(document, "//race:maxLimit/*");
 			WarFoundryXmlLimitParser parser = new WarFoundryXmlLimitParser();
 			ILimit limit = parser.GetLimitFromElement(limitElem);
-			Assert.That(limit, Is.InstanceOfType(typeof(CompositeMinimumLimit)));
+			Assert.That(limit, Is.InstanceOf(typeof(CompositeMinimumLimit)));
 			Assert.That(limit.GetLimit(1), Is.EqualTo(1));
 			Assert.That(limit.GetLimit(5), Is.EqualTo(5));
 			Assert.That(limit.GetLimit(10), Is.EqualTo(5));
@@ -47,7 +46,7 @@
 			XmlElement limitElem = WarFoundryXmlFactoryUtils.SelectSingleElement(document, "//race:maxLimit/*");
 			WarFoundryXmlLimitParser parser = new WarFoundryXmlLimitParser();
 			ILimit limit = parser.GetLimitFromElement(limitElem);
-			Assert.That(limit, Is.InstanceOfType(typeof(CompositeMaximumLimit)));
+			Assert.That(limit, Is.InstanceOf(typeof(CompositeMaximumLimit)));
 			Assert.That(limit.GetLimit(1), Is.EqualTo(5));
 			Assert.That(limit.GetLimit(5), Is.EqualTo(5));
 			Assert.That(limit.GetLimit(10), Is.EqualTo(5));
@@ -67,7 +66,7 @@
 			XmlElement limitElem = WarFoundryXmlFactoryUtils.SelectSingleElement(document, "//race:maxLimit/*");
 			WarFoundryXmlLimitParser parser = new WarFoundryXmlLimitParser();
 			ILimit limit = parser.GetLimitFromElement(limitElem);
-			Assert.That(limit, Is.InstanceOfType(typeof(AbsoluteNumericLimit)));
+			Assert.That(limit, Is.InstanceOf(typeof(AbsoluteNumericLimit)));
 			Assert.That(limit.GetLimit(1), Is.EqualTo(5));
 			Assert.That(limit.GetLimit(5), Is.EqualTo(5));
 			Assert.That(limit.GetLimit(10), Is.EqualTo(5));
--- a/API/Factories/Xml/WarFoundryXmlRaceFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Factories/Xml/WarFoundryXmlRaceFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -9,7 +9,6 @@
 using IBBoard.IO;
 using IBBoard.WarFoundry.API.Objects;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.WarFoundry.API.Objects.Requirement;
 using IBBoard.WarFoundry.API.Factories.Requirement;
 using IBBoard.WarFoundry.API.Loading;
@@ -145,7 +144,7 @@
 			FileInfo raceFile = new FileInfo("testdata/xml-race-factory/valid-contained-unit-reference.racex");
 			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), raceFile);
 			UnitType unitType = race.GetUnitType("Empire1");
-			Assert.That(unitType.ContainedUnitTypes, Has.Length(1));
+			Assert.That(unitType.ContainedUnitTypes, Has.Length.EqualTo(1));
 		}
 
 		[Test()]
@@ -332,7 +331,7 @@
 			Assert.That(unitType.Categories, Has.Member(cat2));
 			Assert.That(race.GetUnitTypes(cat1), Is.All.EqualTo(unitType));
 			UnitType[] unitTypesCat2 = race.GetUnitTypes(cat2);
-			Assert.That(unitTypesCat2, Has.Length(1));
+			Assert.That(unitTypesCat2, Has.Length.EqualTo(1));
 			Assert.That(unitTypesCat2, Is.All.EqualTo(unitType));
 		}
 
@@ -341,7 +340,7 @@
 		{
 			SetDefaultGameSystem();
 			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-race-factory/valid-categories.racex"));
-			Assert.That(race.Categories, Has.Length(5));
+			Assert.That(race.Categories, Has.Length.EqualTo(5));
 		}
 
 		[Test()]
@@ -355,7 +354,7 @@
 		{
 			SetDefaultGameSystem();
 			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-race-factory/extended-requirements.racex"));
-			Assert.That(race.Categories, Has.Length(5));
+			Assert.That(race.Categories, Has.Length.EqualTo(5));
 		}
 
 		[Test()]
@@ -364,7 +363,7 @@
 			SetDefaultGameSystem();
 			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-race-factory/simple-requirement.racex"));
 			UnitType unitType = race.GetUnitType("Empire1");
-			Assert.That(unitType.GetRequirements(), Has.Length(1));
+			Assert.That(unitType.GetRequirements(), Has.Length.EqualTo(1));
 		}
 
 		[Test()]
@@ -373,7 +372,7 @@
 			SetDefaultGameSystem();
 			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-race-factory/simple-requirement.racex"));
 			UnitType unitType = race.GetUnitType("Empire1");
-			Assert.That(unitType.GetRequirements()[0], Is.InstanceOfType(typeof(UnitRequiresAtLeastNUnitsRequirement)));
+			Assert.That(unitType.GetRequirements()[0], Is.InstanceOf(typeof(UnitRequiresAtLeastNUnitsRequirement)));
 		}
 
 		[Test]
@@ -382,7 +381,7 @@
 			SetDefaultGameSystem();
 			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-race-factory/cyclic.racex"));
 			UnitType unitType = race.GetUnitType("Empire1");
-			Assert.That(unitType.GetRequirements()[0], Is.InstanceOfType(typeof(UnitRequiresNoMoreThanNOfUnitTypeRequirement)));
+			Assert.That(unitType.GetRequirements()[0], Is.InstanceOf(typeof(UnitRequiresNoMoreThanNOfUnitTypeRequirement)));
 		}
 
 		[Test]
@@ -392,7 +391,7 @@
 			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-race-factory/with-contained-only-unit.racex"));
 			Assert.That(race.GetUnitType("Empire2"), Is.Not.Null);
 			UnitType unitType1 = race.GetUnitType("Empire1");
-			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Length(1));
+			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Length.EqualTo(1));
 			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Member(unitType1));
 		}
 
@@ -404,7 +403,7 @@
 			Assert.That(race.GetUnitType("Empire2"), Is.Not.Null);
 			UnitType unitType1 = race.GetUnitType("Empire1");
 			UnitType unitType3 = race.GetUnitType("Empire3");
-			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Length(2));
+			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Length.EqualTo(2));
 			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Member(unitType1));
 			Assert.That(race.GetUnitTypes(race.GetCategory("cat1")), Has.Member(unitType3));
 		}
@@ -422,7 +421,7 @@
 			catch (InvalidFileException ex)
 			{
 				Exception innerException = ex.InnerException;
-				Assert.That(innerException, Is.InstanceOfType(typeof(XmlSchemaValidationException)));
+				Assert.That(innerException, Is.InstanceOf(typeof(XmlSchemaValidationException)));
 			}
 		}
 		
--- a/API/Factories/Xml/WarFoundryXmlSystemFactoryTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Factories/Xml/WarFoundryXmlSystemFactoryTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -6,7 +6,6 @@
 using NUnit.Framework;
 using System.IO;
 using IBBoard.WarFoundry.API.Objects;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.IO;
 using System.Xml.Schema;
 using IBBoard.WarFoundry.API.Loading;
@@ -21,7 +20,7 @@
 		{
 			ILoadableObject repackFile = new LoadableFileObject("testdata/zip-format/Repack.system");
 			Assert.That(WarFoundryXmlFactory.GetFactory().CanHandleFileAsGameSystem(repackFile), Is.True);
-			Assert.That(WarFoundryXmlFactory.GetFactory().CreateObjectsFromFile(repackFile), Has.Count(1));
+			Assert.That(WarFoundryXmlFactory.GetFactory().CreateObjectsFromFile(repackFile), Has.Count.EqualTo(1));
 		}
 
 		[Test()]
@@ -40,7 +39,7 @@
 		{
 			GameSystem system = SingleXmlObjectLoader.LoadGameSystemFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-system-factory/valid-default-stats-one-stats-set.systemx"));
 			Assert.That(system.StandardSystemStatsID, Is.EqualTo("defaultStats"));
-			Assert.That(system.SystemStats, Has.Length(1));
+			Assert.That(system.SystemStats, Has.Length.EqualTo(1));
 		}
 
 		[Test()]
@@ -48,7 +47,7 @@
 		{
 			GameSystem system = SingleXmlObjectLoader.LoadGameSystemFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-system-factory/valid-default-stats-multiple-stats-set.systemx"));
 			Assert.That(system.StandardSystemStatsID, Is.EqualTo("defaultStats"));
-			Assert.That(system.SystemStats, Has.Length(2));
+			Assert.That(system.SystemStats, Has.Length.EqualTo(2));
 		}
 
 		[Test()]
@@ -67,7 +66,7 @@
 		public void TestValidCategoriesLoadsCorrectly()
 		{
 			GameSystem system = SingleXmlObjectLoader.LoadGameSystemFromXML(WarFoundryXmlFactory.GetFactory(), new FileInfo("testdata/xml-system-factory/valid-categories.systemx"));
-			Assert.That(system.Categories, Has.Length(5));
+			Assert.That(system.Categories, Has.Length.EqualTo(5));
 		}
 
 		[Test()]
@@ -108,7 +107,7 @@
 			catch (InvalidFileException ex)
 			{
 				Exception innerException = ex.InnerException;
-				Assert.That(innerException, Is.InstanceOfType(typeof(XmlSchemaValidationException)));
+				Assert.That(innerException, Is.InstanceOf(typeof(XmlSchemaValidationException)));
 			}
 		}
 	}
--- a/API/Objects/ArmyCategoryTests.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/ArmyCategoryTests.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -6,7 +6,6 @@
 using IBBoard.WarFoundry.API.Objects.Mock;
 using IBBoard.WarFoundry.API.Objects.Requirement;
 using IBBoard.WarFoundry.API.Objects.Requirement.Mock;
-using NUnit.Framework.SyntaxHelpers;
 
 
 namespace IBBoard.WarFoundry.API.Objects
@@ -54,7 +53,7 @@
 			army.AddUnit(unit2);
 			unit1.AddContainedUnit(unit2);
 			ArmyCategory category = army.GetCategory(MockCategory.GetCategory());
-			Assert.That(category.GetUnits(), Has.Length(2));
+			Assert.That(category.GetUnits(), Has.Length.EqualTo(2));
 			Assert.That(category.GetUnits(), Has.Member(unit1));
 			Assert.That(category.GetUnits(), Has.Member(unit2));
 		}
@@ -69,7 +68,7 @@
 			army.AddUnit(unit2);
 			unit1.AddContainedUnit(unit2);
 			ArmyCategory category = army.GetCategory(MockCategory.GetCategory());
-			Assert.That(category.GetMainUnits(), Has.Length(1));
+			Assert.That(category.GetMainUnits(), Has.Length.EqualTo(1));
 			Assert.That(category.GetMainUnits(), Has.Member(unit1));
 		}
 	}
--- a/API/Objects/ArmyTests.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/ArmyTests.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects.Requirement.Mock;
-using NUnit.Framework.SyntaxHelpers;
 using System.Collections.Generic;
 using IBBoard.WarFoundry.API.Objects.Requirement;
 using IBBoard.WarFoundry.API.Objects.Mock;
@@ -45,7 +44,7 @@
 		{
 			Army army = new Army(mockRace, "Test", 1000);
 			ICollection<IRequirement> requirements = army.GetRequirements();
-			Assert.That(requirements, Has.Count(3));
+			Assert.That(requirements, Has.Count.EqualTo(3));
 			Assert.That(requirements, Has.Member(unitType1Requirement));
 			Assert.That(requirements, Has.Member(unitType2Requirement));
 			Assert.That(requirements, Has.Member(unitType3Requirement));
@@ -56,7 +55,7 @@
 		{
 			Army army = new Army(mockRace, "Test", 1000);
 			ICollection<IRequirement> requirements = army.GetAddingUnitRequirements(unitType1);
-			Assert.That(requirements, Has.Count(1));
+			Assert.That(requirements, Has.Count.EqualTo(1));
 			Assert.That(requirements, Has.Member(unitType1Requirement));
 		}
 
@@ -66,7 +65,7 @@
 			Army army = new Army(mockRace, "Test", 1000);
 			army.AddUnit(new Unit(unitType1, army.GetCategory(unitType1.MainCategory)));
 			ICollection<IRequirement> requirements = army.GetAddingUnitRequirements(unitType2);
-			Assert.That(requirements, Has.Count(2));
+			Assert.That(requirements, Has.Count.EqualTo(2));
 			Assert.That(requirements, Has.Member(unitType1Requirement));
 			Assert.That(requirements, Has.Member(unitType2Requirement));
 		}
--- a/API/Objects/GameSystemTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/GameSystemTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -1,7 +1,6 @@
 using System;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Factories;
-using NUnit.Framework.SyntaxHelpers;
 using System.Reflection;
 using IBBoard.NUnit;
 
--- a/API/Objects/RaceTests.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/RaceTests.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects.Mock;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.WarFoundry.API.Objects.Requirement;
 using System.Collections.Generic;
 using IBBoard.NUnit;
@@ -19,7 +18,7 @@
 		[Test()]
 		public void TestRaceWithNoUnitTypesHasNoRequirements()
 		{
-			Assert.That(new MockRace().GetRequirements(), Has.Count(0));
+			Assert.That(new MockRace().GetRequirements(), Has.Count.EqualTo(0));
 		}
 
 		[Test()]
@@ -27,7 +26,7 @@
 		{
 			MockRace race = new MockRace();
 			race.AddUnitType(new MockUnitType());
-			Assert.That(race.GetRequirements(), Has.Count(0));
+			Assert.That(race.GetRequirements(), Has.Count.EqualTo(0));
 		}
 
 		[Test()]
@@ -39,7 +38,7 @@
 			unitType.AddRequirement(unitRequirement);
 			race.AddUnitType(unitType);
 			ICollection<IRequirement> raceRequirements = race.GetRequirements();
-			Assert.That(raceRequirements, Has.Count(1));
+			Assert.That(raceRequirements, Has.Count.EqualTo(1));
 			Assert.That(raceRequirements, Has.All.EqualTo(unitRequirement));
 		}
 
@@ -58,7 +57,7 @@
 			unitType2.AddRequirement(unitRequirement3);
 			race.AddUnitType(unitType2);
 			ICollection<IRequirement> raceRequirements = race.GetRequirements();
-			Assert.That(raceRequirements, Has.Count(3));
+			Assert.That(raceRequirements, Has.Count.EqualTo(3));
 			Assert.That(raceRequirements, Has.Member(unitRequirement1));
 			Assert.That(raceRequirements, Has.Member(unitRequirement2));
 			Assert.That(raceRequirements, Has.Member(unitRequirement3));
@@ -73,7 +72,7 @@
 			MockContainedUnitType unitType2 = new MockContainedUnitType("type2", "Type 2");
 			race.AddUnitType(unitType2);
 			unitType1.AddContainedUnitType(unitType2);
-			Assert.That(race.GetUnitTypes(MockCategory.GetCategory()), Has.Length(1));
+			Assert.That(race.GetUnitTypes(MockCategory.GetCategory()), Has.Length.EqualTo(1));
 			Assert.That(race.GetUnitTypes(MockCategory.GetCategory()), Has.Member(unitType1));
 		}
 
--- a/API/Objects/Requirement/AbstractUnitRequirementTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/Requirement/AbstractUnitRequirementTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -3,7 +3,6 @@
 // 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.
 using System;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.NUnit;
 using System.Collections.Generic;
 
--- a/API/Objects/Requirement/RaceRequiresAtLeastNUnitsRequirementTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/Requirement/RaceRequiresAtLeastNUnitsRequirementTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects.Mock;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace IBBoard.WarFoundry.API.Objects.Requirement
 {
--- a/API/Objects/Requirement/RaceRequiresNoMoreThanNUnitsRequirementTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/Requirement/RaceRequiresNoMoreThanNUnitsRequirementTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects.Mock;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace IBBoard.WarFoundry.API.Objects.Requirement
 {
--- a/API/Objects/Requirement/RequirementHandlerTests.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/Requirement/RequirementHandlerTests.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -5,7 +5,6 @@
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects.Mock;
 using IBBoard.WarFoundry.API.Objects;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.WarFoundry.API.Objects.Requirement.Mock;
 using System.Collections.Generic;
 
@@ -181,7 +180,7 @@
 			Army army = new Army(race, "test", 1000);
 			ICollection<string> failureMessages;
 			RequirementHandler.ValidateArmy(army, out failureMessages);
-			Assert.That(failureMessages, Has.Count(2));
+			Assert.That(failureMessages, Has.Count.EqualTo(2));
 		}
 
 		[Test()]
@@ -197,7 +196,7 @@
 			Army army = new Army(race, "test", 1000);
 			ICollection<string> failureMessages;
 			RequirementHandler.AllowsAdding(mockUnitType, army, out failureMessages);
-			Assert.That(failureMessages, Has.Count(2));
+			Assert.That(failureMessages, Has.Count.EqualTo(2));
 		}
 	}
 }
--- a/API/Objects/Requirement/UnitRequiresAtLeastNUnitsRequirementTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/Requirement/UnitRequiresAtLeastNUnitsRequirementTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects.Mock;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace IBBoard.WarFoundry.API.Objects.Requirement
 {
--- a/API/Objects/Requirement/UnitRequiresNParentModelsForMUnitsRequirementTests.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/Requirement/UnitRequiresNParentModelsForMUnitsRequirementTests.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -3,7 +3,6 @@
 // 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.
 using System;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.WarFoundry.API.Objects.Requirement.Context;
 using System.Collections.Generic;
 
--- a/API/Objects/Requirement/UnitRequiresNUnitsForMUnitsRequirementTests.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/Requirement/UnitRequiresNUnitsForMUnitsRequirementTests.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects.Mock;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace IBBoard.WarFoundry.API.Objects.Requirement
 {
--- a/API/Objects/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/Requirement/UnitRequiresNoMoreThanNOfUnitTypeRequirementTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using System;
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Objects.Mock;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace IBBoard.WarFoundry.API.Objects.Requirement
 {
--- a/API/Objects/Requirement/ValidationTests.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/Requirement/ValidationTests.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -3,7 +3,6 @@
 // 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.
 using System;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace IBBoard.WarFoundry.API.Objects.Requirement
 {
--- a/API/Objects/UnitEquipmentLimitTests.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/UnitEquipmentLimitTests.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -5,7 +5,6 @@
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Factories;
 using IBBoard.Limits;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.WarFoundry.API.Util;
 using IBBoard.CustomMath;
 
--- a/API/Objects/UnitEquipmentNumericSelectionTests.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/UnitEquipmentNumericSelectionTests.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -6,7 +6,6 @@
 using IBBoard.WarFoundry.API.Util;
 using IBBoard.WarFoundry.API.Factories;
 using IBBoard.Limits;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace IBBoard.WarFoundry.API.Objects
 {
--- a/API/Objects/UnitEquipmentRatioSelectionTests.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/UnitEquipmentRatioSelectionTests.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -6,7 +6,6 @@
 using IBBoard.WarFoundry.API.Util;
 using IBBoard.WarFoundry.API.Factories;
 using IBBoard.Limits;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace IBBoard.WarFoundry.API.Objects
 {
--- a/API/Objects/UnitTypeTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Objects/UnitTypeTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -4,7 +4,6 @@
 using IBBoard.WarFoundry.API.Objects.Mock;
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
-using NUnit.Framework.SyntaxHelpers;
 using IBBoard.WarFoundry.API.Objects.Requirement;
 using System.Reflection;
 using IBBoard.NUnit;
@@ -54,9 +53,9 @@
 		{
 			UnitType unitType = new UnitType("unittype1", "Swordsmen", new MockRace());
 			UnitRequiresAtLeastNUnitsRequirement req = new UnitRequiresAtLeastNUnitsRequirement(unitType);
-			Assert.That(unitType.GetRequirements(), Has.Length(0));
+			Assert.That(unitType.GetRequirements(), Has.Length.EqualTo(0));
 			unitType.AddRequirement(req);
-			Assert.That(unitType.GetRequirements(), Has.Length(1));
+			Assert.That(unitType.GetRequirements(), Has.Length.EqualTo(1));
 		}
 
 		[Test]
@@ -66,7 +65,7 @@
 			UnitType unitType = new UnitType("unittype1", "Swordsmen", mockRace);
 			unitType.MinNumber = 1;
 			unitType.MaxNumber = 2;
-			Assert.That(unitType.GetRequirements(), Has.Length(2));
+			Assert.That(unitType.GetRequirements(), Has.Length.EqualTo(2));
 			RaceRequiresNoMoreThanNUnitsRequirement maxLimit = new RaceRequiresNoMoreThanNUnitsRequirement(mockRace);
 			maxLimit.AddUnitTypeRequirement(unitType, 2);
 			Assert.That(unitType.GetRequirements(), Has.Member(maxLimit));
--- a/API/Savers/IWarFoundryFileSaverTests.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Savers/IWarFoundryFileSaverTests.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -6,7 +6,6 @@
 using IBBoard.WarFoundry.API.Objects.Mock;
 using ICSharpCode.SharpZipLib.Zip;
 using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
 using ICSharpCode.SharpZipLib.Core;
 using IBBoard.IO;
 using IBBoard.WarFoundry.API.Factories;
@@ -87,7 +86,7 @@
 				enumerator.MoveNext();
 				ZipEntry current = (ZipEntry)enumerator.Current;
 				Assert.That(current.Name, Is.EqualTo(GetEntryName(obj)));
-				Assert.That(current.Name, Text.EndsWith(GetFileExtensionForType(obj)));
+				Assert.That(current.Name, Is.StringEnding(GetFileExtensionForType(obj)));
 				file.Close();
 			}
 			finally
--- a/API/Util/UnitEquipmentUtilTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/Util/UnitEquipmentUtilTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -8,7 +8,6 @@
 using IBBoard.Limits;
 using IBBoard.WarFoundry.API.Objects;
 using IBBoard.WarFoundry.API.Objects.Mock;
-using NUnit.Framework.SyntaxHelpers;
 
 namespace IBBoard.WarFoundry.API.Util
 {
--- a/API/WarFoundryLoaderTest.cs	Tue Nov 06 20:58:48 2012 +0000
+++ b/API/WarFoundryLoaderTest.cs	Sun Apr 28 19:32:38 2013 +0100
@@ -7,7 +7,6 @@
 using NUnit.Framework;
 using IBBoard.WarFoundry.API.Factories.Mock;
 using IBBoard.WarFoundry.API.Objects;
-using NUnit.Framework.SyntaxHelpers;
 using System.Collections.Generic;
 using IBBoard.WarFoundry.API.Factories.Xml;
 using IBBoard.WarFoundry.API.Factories.Requirement;
@@ -47,7 +46,7 @@
 			DefaultWarFoundryLoader loader = new DefaultWarFoundryLoader();
 			loader.RegisterFactory(WarFoundryXmlFactory.GetFactory());
 			ICollection<IWarFoundryObject> objs = loader.LoadFile(new FileInfo("testdata/Test.system"));
-			Assert.That(objs, Has.Count(1));
+			Assert.That(objs, Has.Count.EqualTo(1));
 		}
 
 		[Test()]
@@ -98,9 +97,9 @@
 
 			try
 			{
-				Assert.That(loader.GetGameSystems(), Has.Length(1));
+				Assert.That(loader.GetGameSystems(), Has.Length.EqualTo(1));
 				GameSystem gameSystem = loader.GetGameSystems()[0];
-				Assert.That(loader.GetRaces(gameSystem), Has.Length(1));
+				Assert.That(loader.GetRaces(gameSystem), Has.Length.EqualTo(1));
 			}
 			finally
 			{
--- a/IBBoard.WarFoundry.API.Tests.csproj	Tue Nov 06 20:58:48 2012 +0000
+++ b/IBBoard.WarFoundry.API.Tests.csproj	Sun Apr 28 19:32:38 2013 +0100
@@ -340,12 +340,12 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
-    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
     <Reference Include="xmlunit">
       <HintPath>libs\xmlunit.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\IBBoard.WarFoundry.API\IBBoard.WarFoundry.API.csproj">