# HG changeset patch # User IBBoard # Date 1274296940 0 # Node ID 9d68b5dd70b39637a57073e7963c9ff39d05b2b9 # Parent d3519f38a0f49e4e6fb2d3727d7341d5287c7d0a Re #270: Add multiple categories to API * Add test for unit being in multiple categories Also: * Add assertions in other tests that unit is cached in army diff -r d3519f38a0f4 -r 9d68b5dd70b3 API/Factories/Xml/WarFoundryXmlRaceFactoryTest.cs --- a/API/Factories/Xml/WarFoundryXmlRaceFactoryTest.cs Tue May 18 19:57:44 2010 +0000 +++ b/API/Factories/Xml/WarFoundryXmlRaceFactoryTest.cs Wed May 19 19:22:20 2010 +0000 @@ -71,6 +71,7 @@ SetDefaultGameSystem(); FileInfo raceFile = new FileInfo("testdata/single-unit-race.racex"); Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), raceFile); + Assert.That(race.GetUnitType("Empire1"), Is.Not.Null); UnitType[] unitTypes = race.GetUnitTypes(race.GetCategory("cat1")); Assert.AreEqual(1, unitTypes.Length); UnitType unitType = unitTypes[0]; @@ -87,6 +88,7 @@ SetDefaultGameSystem(); FileInfo raceFile = new FileInfo("testdata/single-unit-type-referencing-race.racex"); Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), raceFile); + Assert.That(race.GetUnitType("Empire1"), Is.Not.Null); UnitType[] unitTypes = race.GetUnitTypes(race.GetCategory("cat1")); Assert.AreEqual(1, unitTypes.Length); UnitType unitType = unitTypes[0]; @@ -103,6 +105,7 @@ SetDefaultGameSystem(); FileInfo raceFile = new FileInfo("testdata/single-unit-multi-type-referencing-race.racex"); Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), raceFile); + Assert.That(race.GetUnitType("Empire1"), Is.Not.Null); UnitType[] unitTypes = race.GetUnitTypes(race.GetCategory("cat1")); Assert.AreEqual(1, unitTypes.Length); UnitType unitType = unitTypes[0]; @@ -122,6 +125,7 @@ SetDefaultGameSystem(); FileInfo raceFile = new FileInfo("testdata/single-unit-multi-type-referencing-race-with-override.racex"); Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), raceFile); + Assert.That(race.GetUnitType("Empire1"), Is.Not.Null); UnitType[] unitTypes = race.GetUnitTypes(race.GetCategory("cat1")); Assert.AreEqual(1, unitTypes.Length); UnitType unitType = unitTypes[0]; @@ -140,6 +144,7 @@ SetDefaultGameSystem(); FileInfo raceFile = new FileInfo("testdata/single-unit-no-stats-race.racex"); Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), raceFile); + Assert.That(race.GetUnitType("Empire1"), Is.Not.Null); UnitType[] unitTypes = race.GetUnitTypes(race.GetCategory("cat1")); Assert.AreEqual(1, unitTypes.Length); UnitType unitType = unitTypes[0]; @@ -199,6 +204,25 @@ Assert.That(unitType.Categories, Has.Member(category)); Assert.That(unitType.Categories, Has.Member(race.GetCategory("cat2"))); } + + [Test()] + public void TestSingleUnitArmyWithMultipleCategoriesIsInEachCategory() + { + SetDefaultGameSystem(); + FileInfo raceFile = new FileInfo("testdata/single-unit-two-categories.racex"); + Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), raceFile); + UnitType unitType = race.GetUnitType("Empire1"); + Assert.That(unitType.Categories.Length, Is.EqualTo(2)); + Category cat1 = race.GetCategory("cat1"); + Category cat2 = race.GetCategory("cat2"); + Assert.That(unitType.MainCategory, Is.EqualTo(cat1)); + Assert.That(unitType.Categories, Has.Member(cat1)); + 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, Is.All.EqualTo(unitType)); + } private static void SetDefaultGameSystem() { diff -r d3519f38a0f4 -r 9d68b5dd70b3 IBBoard.WarFoundry.API.Tests.csproj --- a/IBBoard.WarFoundry.API.Tests.csproj Tue May 18 19:57:44 2010 +0000 +++ b/IBBoard.WarFoundry.API.Tests.csproj Wed May 19 19:22:20 2010 +0000 @@ -121,6 +121,9 @@ PreserveNewest + + PreserveNewest + diff -r d3519f38a0f4 -r 9d68b5dd70b3 testdata/single-unit-two-categories.racex --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/testdata/single-unit-two-categories.racex Wed May 19 19:22:20 2010 +0000 @@ -0,0 +1,22 @@ + + + + + + 4 + 6 + 6 + 4 + 4 + 3 + 6 + 4 + 9 + + + + + + + + \ No newline at end of file