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

changeset 63:a9163f8dfba1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re #290: Migrate to using key/keyref definitions instead of ID/IDREF type * Move invalid equipment slot data file to sub-folder * Add test for valid equipment slot (currently null-refs and fails)
author IBBoard <dev@ibboard.co.uk>
date Sat, 03 Jul 2010 19:54:42 +0000
parents ef8950a5f4cb
children 6f638d6f400f
files API/Factories/Xml/WarFoundryXmlRaceFactoryTest.cs IBBoard.WarFoundry.API.Tests.csproj testdata/single-unit-with-invalid-equipment-slot-reference.racex testdata/xml-race-factory/single-unit-with-invalid-equipment-slot-reference.racex testdata/xml-race-factory/single-unit-with-valid-equipment-slot-reference.racex
diffstat 5 files changed, 76 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/API/Factories/Xml/WarFoundryXmlRaceFactoryTest.cs	Sat Jun 19 19:30:58 2010 +0000
+++ b/API/Factories/Xml/WarFoundryXmlRaceFactoryTest.cs	Sat Jul 03 19:54:42 2010 +0000
@@ -128,7 +128,7 @@
 		public void TestCompleteLoadingOnRaceWithIncorrectEquipmentSlotErrors()
 		{
 			SetDefaultGameSystem();
-			FileInfo raceFile = new FileInfo("testdata/single-unit-with-invalid-equipment-slot-reference.racex");
+			FileInfo raceFile = new FileInfo("testdata/xml-race-factory/single-unit-with-invalid-equipment-slot-reference.racex");
 			
 			try
 			{
@@ -144,6 +144,17 @@
 		}
 
 		[Test()]
+		public void TestCompleteLoadingOnRaceWithCorrectEquipmentSlotLoads()
+		{
+			SetDefaultGameSystem();
+			FileInfo raceFile = new FileInfo("testdata/xml-race-factory/single-unit-with-valid-equipment-slot-reference.racex");
+			Race race = SingleXmlObjectLoader.LoadRaceFromXML(WarFoundryXmlFactory.GetFactory(), raceFile);
+			UnitType unitType = race.GetUnitType("General");
+			UnitEquipmentItem unitEquipmentItem = unitType.GetEquipmentItem("equip1");
+			Assert.That(unitEquipmentItem.SlotName, Is.EqualTo("slot1"));
+		}
+
+		[Test()]
 		public void TestCompleteLoadingOnRaceWithIncorrectEquipmentIDError()
 		{
 			SetDefaultGameSystem();
--- a/IBBoard.WarFoundry.API.Tests.csproj	Sat Jun 19 19:30:58 2010 +0000
+++ b/IBBoard.WarFoundry.API.Tests.csproj	Sat Jul 03 19:54:42 2010 +0000
@@ -143,9 +143,6 @@
     <None Include="WarFoundryTests.nunit">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="testdata\single-unit-with-invalid-equipment-slot-reference.racex">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="testdata\invalid-contained-unit-reference.racex">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -176,6 +173,12 @@
     <None Include="testdata\xml-race-factory\existing-member-type.racex">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="testdata\xml-race-factory\single-unit-with-invalid-equipment-slot-reference.racex">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="testdata\xml-race-factory\single-unit-with-valid-equipment-slot-reference.racex">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, PublicKeyToken=1b03e6acf1164f73">
--- a/testdata/single-unit-with-invalid-equipment-slot-reference.racex	Sat Jun 19 19:30:58 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<race xmlns="http://ibboard.co.uk/warfoundry/race" xmlns:core="http://ibboard.co.uk/warfoundry/core" id="Empire" name="Empire" system="nonexistant">
-	<units>
-		<unit id="Empire1" typeName="Empire General" cat="cat1" points="100" maxNum="1" maxSize="1">
-			<stats>
-				<stat name="M">4</stat>
-				<stat name="WS">6</stat>
-				<stat name="BS">6</stat>
-				<stat name="S">4</stat>
-				<stat name="T">4</stat>
-				<stat name="W">3</stat>
-				<stat name="I">6</stat>
-				<stat name="A">4</stat>
-				<stat name="Ld">9</stat>
-			</stats>
-			<equipmentSlots>
-				<equipmentSlot name="slot1"/>
-			</equipmentSlots>
-			<unitEquipment>
-				<unitEquipmentItem id="equip1" equipmentSlot="slot2"/>
-			</unitEquipment>
-		</unit>
-	</units>
-	<equipment>
-		<equipmentItem id="equip1" name="sword" cost="1"/>
-	</equipment>
-</race>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testdata/xml-race-factory/single-unit-with-invalid-equipment-slot-reference.racex	Sat Jul 03 19:54:42 2010 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<race xmlns="http://ibboard.co.uk/warfoundry/race" xmlns:core="http://ibboard.co.uk/warfoundry/core" id="Empire" name="Empire" system="nonexistant">
+	<units>
+		<unit id="Empire1" typeName="Empire General" cat="cat1" points="100" maxNum="1" maxSize="1">
+			<stats>
+				<stat name="M">4</stat>
+				<stat name="WS">6</stat>
+				<stat name="BS">6</stat>
+				<stat name="S">4</stat>
+				<stat name="T">4</stat>
+				<stat name="W">3</stat>
+				<stat name="I">6</stat>
+				<stat name="A">4</stat>
+				<stat name="Ld">9</stat>
+			</stats>
+			<equipmentSlots>
+				<equipmentSlot name="slot1"/>
+			</equipmentSlots>
+			<unitEquipment>
+				<unitEquipmentItem id="equip1" equipmentSlot="slot2"/>
+			</unitEquipment>
+		</unit>
+	</units>
+	<equipment>
+		<equipmentItem id="equip1" name="sword" cost="1"/>
+	</equipment>
+</race>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testdata/xml-race-factory/single-unit-with-valid-equipment-slot-reference.racex	Sat Jul 03 19:54:42 2010 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<race xmlns="http://ibboard.co.uk/warfoundry/race" xmlns:core="http://ibboard.co.uk/warfoundry/core" id="Empire" name="Empire" system="nonexistant">
+	<units>
+		<unit id="Empire1" typeName="Empire General" cat="cat1" points="100" maxNum="1" maxSize="1">
+			<stats>
+				<stat name="M">4</stat>
+				<stat name="WS">6</stat>
+				<stat name="BS">6</stat>
+				<stat name="S">4</stat>
+				<stat name="T">4</stat>
+				<stat name="W">3</stat>
+				<stat name="I">6</stat>
+				<stat name="A">4</stat>
+				<stat name="Ld">9</stat>
+			</stats>
+			<equipmentSlots>
+				<equipmentSlot name="slot1">
+					<maxLimit>
+						<core:absoluteLimit limit="1" />
+					</maxLimit>
+				</equipmentSlot>
+			</equipmentSlots>
+			<unitEquipment>
+				<unitEquipmentItem id="equip1" equipmentSlot="slot1"/>
+			</unitEquipment>
+		</unit>
+	</units>
+	<equipment>
+		<equipmentItem id="equip1" name="sword" cost="1"/>
+	</equipment>
+</race>
\ No newline at end of file