# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1275764334 0
# Node ID 7f9e1fef069eb9cb1c73e96fb4657200c221fa40
# Parent  084049c8dff49e3a0bf4738ce7f594240163433d
Re #279: Create composite limit
 * Create separate tests for min and max limits (rename existing test data file)
 * Fix namespacing of limit nodes
 * Add test for nesting of composite limits
 * Add tests for empty composite causing failure

diff -r 084049c8dff4 -r 7f9e1fef069e API/Factories/Xml/WarFoundryXmlLimitParserTest.cs
--- a/API/Factories/Xml/WarFoundryXmlLimitParserTest.cs	Sat Jun 05 15:37:03 2010 +0000
+++ b/API/Factories/Xml/WarFoundryXmlLimitParserTest.cs	Sat Jun 05 18:58:54 2010 +0000
@@ -6,15 +6,16 @@
 using NUnit.Framework;
 using IBBoard.Limits;
 using NUnit.Framework.SyntaxHelpers;
+using IBBoard.IO;
 namespace IBBoard.WarFoundry.API.Factories.Xml
 {
 	[TestFixture()]
 	public class WarFoundryXmlLimitParserTest
 	{
 		[Test()]
-		public void TestCompositeLimit()
+		public void TestCompositeMaxLimit()
 		{
-			XmlElement document = SingleXmlObjectLoader.CreateDocumentElementFromFile(new FileInfo("testdata/limits/composite-limit.xml"));
+			XmlElement document = SingleXmlObjectLoader.CreateDocumentElementFromFile(new FileInfo("testdata/limits/composite-max-limit.xml"));
 			XmlElement limitElem = WarFoundryXmlFactoryUtils.SelectSingleElement(document, "//race:maxLimit/*");
 			WarFoundryXmlLimitParser parser = new WarFoundryXmlLimitParser();
 			ILimit limit = parser.GetLimitFromElement(limitElem);
@@ -26,6 +27,40 @@
 		}
 		
 		[Test()]
+		public void TestCompositeMinLimit()
+		{
+			XmlElement document = SingleXmlObjectLoader.CreateDocumentElementFromFile(new FileInfo("testdata/limits/composite-min-limit.xml"));
+			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.GetLimit(1), Is.EqualTo(1));
+			Assert.That(limit.GetLimit(5), Is.EqualTo(5));
+			Assert.That(limit.GetLimit(10), Is.EqualTo(5));
+			Assert.That(limit.GetLimit(20), Is.EqualTo(5));
+		}
+
+		[Test()]
+		public void TestNestedCompositeLimit()
+		{
+			XmlElement document = SingleXmlObjectLoader.CreateDocumentElementFromFile(new FileInfo("testdata/limits/composite-max-limit-nested.xml"));
+			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.GetLimit(1), Is.EqualTo(5));
+			Assert.That(limit.GetLimit(5), Is.EqualTo(5));
+			Assert.That(limit.GetLimit(10), Is.EqualTo(5));
+		}
+		
+		[Test()]
+		[ExpectedException(typeof(InvalidFileException))]
+		public void TestEmptyCompositeFailsValidation()
+		{
+			SingleXmlObjectLoader.CreateDocumentElementFromFile(new FileInfo("testdata/limits/empty-composite.xml"));
+		}
+		
+		[Test()]
 		public void TestAbsoluteLimit()
 		{
 			XmlElement document = SingleXmlObjectLoader.CreateDocumentElementFromFile(new FileInfo("testdata/limits/absolute-limit.xml"));
diff -r 084049c8dff4 -r 7f9e1fef069e IBBoard.WarFoundry.API.Tests.csproj
--- a/IBBoard.WarFoundry.API.Tests.csproj	Sat Jun 05 15:37:03 2010 +0000
+++ b/IBBoard.WarFoundry.API.Tests.csproj	Sat Jun 05 18:58:54 2010 +0000
@@ -134,10 +134,19 @@
     <None Include="testdata\unit-in-specified-main-category.armyx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="testdata\limits\composite-limit.xml">
+    <None Include="testdata\limits\absolute-limit.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="testdata\limits\composite-max-limit.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="testdata\limits\absolute-limit.xml">
+    <None Include="testdata\limits\composite-min-limit.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="testdata\limits\composite-max-limit-nested.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="testdata\limits\empty-composite.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff -r 084049c8dff4 -r 7f9e1fef069e testdata/limits/absolute-limit.xml
--- a/testdata/limits/absolute-limit.xml	Sat Jun 05 15:37:03 2010 +0000
+++ b/testdata/limits/absolute-limit.xml	Sat Jun 05 18:58:54 2010 +0000
@@ -5,7 +5,7 @@
 			<equipmentSlots>
 				<equipmentSlot name="slot">
 					<maxLimit>
-						<absoluteLimit limit="5"/>
+						<core:absoluteLimit limit="5"/>
 					</maxLimit>
 				</equipmentSlot>
 			</equipmentSlots>
diff -r 084049c8dff4 -r 7f9e1fef069e testdata/limits/composite-limit.xml
--- a/testdata/limits/composite-limit.xml	Sat Jun 05 15:37:03 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +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="EmpireAlt" name="Empire (Extended)" system="default" lang="en">
-	<units>
-		<unit id="Empire1" typeName="Empire General" cat="cat1" points="100" maxNum="1" maxSize="1">
-			<equipmentSlots>
-				<equipmentSlot name="slot">
-					<maxLimit>
-						<compositeMaxLimit>
-							<sizeConstrainedLimit limit="10"/>
-							<absoluteLimit limit="5"/>
-						</compositeMaxLimit>
-					</maxLimit>
-				</equipmentSlot>
-			</equipmentSlots>
-		</unit>
-	</units>
-</race>
\ No newline at end of file
diff -r 084049c8dff4 -r 7f9e1fef069e testdata/limits/composite-max-limit-nested.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testdata/limits/composite-max-limit-nested.xml	Sat Jun 05 18:58:54 2010 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<race xmlns="http://ibboard.co.uk/warfoundry/race" xmlns:core="http://ibboard.co.uk/warfoundry/core" id="EmpireAlt" name="Empire (Extended)" system="default" lang="en">
+	<units>
+		<unit id="Empire1" typeName="Empire General" cat="cat1" points="100" maxNum="1" maxSize="1">
+			<equipmentSlots>
+				<equipmentSlot name="slot">
+					<maxLimit>
+						<core:compositeMaxLimit>
+							<core:compositeMaxLimit>
+								<core:compositeMaxLimit>
+									<core:compositeMaxLimit>
+										<core:absoluteLimit limit="5"/>
+									</core:compositeMaxLimit>
+								</core:compositeMaxLimit>
+							</core:compositeMaxLimit>
+						</core:compositeMaxLimit>
+					</maxLimit>
+				</equipmentSlot>
+			</equipmentSlots>
+		</unit>
+	</units>
+</race>
\ No newline at end of file
diff -r 084049c8dff4 -r 7f9e1fef069e testdata/limits/composite-max-limit.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testdata/limits/composite-max-limit.xml	Sat Jun 05 18:58:54 2010 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<race xmlns="http://ibboard.co.uk/warfoundry/race" xmlns:core="http://ibboard.co.uk/warfoundry/core" id="EmpireAlt" name="Empire (Extended)" system="default" lang="en">
+	<units>
+		<unit id="Empire1" typeName="Empire General" cat="cat1" points="100" maxNum="1" maxSize="1">
+			<equipmentSlots>
+				<equipmentSlot name="slot">
+					<maxLimit>
+						<core:compositeMaxLimit>
+							<core:sizeConstrainedLimit limit="10"/>
+							<core:absoluteLimit limit="5"/>
+						</core:compositeMaxLimit>
+					</maxLimit>
+				</equipmentSlot>
+			</equipmentSlots>
+		</unit>
+	</units>
+</race>
\ No newline at end of file
diff -r 084049c8dff4 -r 7f9e1fef069e testdata/limits/composite-min-limit.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testdata/limits/composite-min-limit.xml	Sat Jun 05 18:58:54 2010 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<race xmlns="http://ibboard.co.uk/warfoundry/race" xmlns:core="http://ibboard.co.uk/warfoundry/core" id="EmpireAlt" name="Empire (Extended)" system="default" lang="en">
+	<units>
+		<unit id="Empire1" typeName="Empire General" cat="cat1" points="100" maxNum="1" maxSize="1">
+			<equipmentSlots>
+				<equipmentSlot name="slot">
+					<maxLimit>
+						<core:compositeMinLimit>
+							<core:sizeConstrainedLimit limit="10"/>
+							<core:absoluteLimit limit="5"/>
+						</core:compositeMinLimit>
+					</maxLimit>
+				</equipmentSlot>
+			</equipmentSlots>
+		</unit>
+	</units>
+</race>
\ No newline at end of file
diff -r 084049c8dff4 -r 7f9e1fef069e testdata/limits/empty-composite.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/testdata/limits/empty-composite.xml	Sat Jun 05 18:58:54 2010 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<race xmlns="http://ibboard.co.uk/warfoundry/race" xmlns:core="http://ibboard.co.uk/warfoundry/core" id="EmpireAlt" name="Empire (Extended)" system="default" lang="en">
+	<units>
+		<unit id="Empire1" typeName="Empire General" cat="cat1" points="100" maxNum="1" maxSize="1">
+			<equipmentSlots>
+				<equipmentSlot name="slot">
+					<maxLimit>
+						<core:compositeMaxLimit>
+						</core:compositeMaxLimit>
+					</maxLimit>
+				</equipmentSlot>
+			</equipmentSlots>
+		</unit>
+	</units>
+</race>
\ No newline at end of file