changeset 162:12a8279f116f

Re #341: Wrong default army size * Merge branch (should use bookmarks instead for short-lived branches)
author IBBoard <dev@ibboard.co.uk>
date Sun, 21 Aug 2011 21:02:48 +0100
parents 23e7f51386fd (current diff) c28ff466d009 (diff)
children 7b90f41f27e5
files
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Sun Aug 21 21:02:48 2011 +0100
@@ -0,0 +1,5 @@
+obj/*
+bin/*
+test-results/*
+IBBoard.WarFoundry.API.Tests.suo
+IBBoard.WarFoundry.API.Tests.pidb
\ No newline at end of file
--- a/API/Savers/Xml/WarFoundryXmlFileSaverTests.cs	Sun Aug 14 01:19:12 2011 +0000
+++ b/API/Savers/Xml/WarFoundryXmlFileSaverTests.cs	Sun Aug 21 21:02:48 2011 +0100
@@ -41,12 +41,12 @@
 
 		protected override byte[] GetGameSystemContentBytes()
 		{
-			return StringManipulation.StringToBytes(@"<?xml version=""1.0"" encoding=""UTF-8""?><system xmlns=""http://ibboard.co.uk/warfoundry/system"" xmlns:cats=""http://ibboard.co.uk/warfoundry/cats"" id=""mocksystem"" name=""Mock Game System"" defaultArmySize=""0"" warn=""false"" allowAllies=""false""><categories /><sysStatsList defaultStats=""default""><sysStats id=""default"" /></sysStatsList></system>");
+			return StringManipulation.StringToBytes(@"<?xml version=""1.0"" encoding=""UTF-8""?><system xmlns=""http://ibboard.co.uk/warfoundry/system"" xmlns:cats=""http://ibboard.co.uk/warfoundry/cats"" id=""mocksystem"" name=""Mock Game System"" defaultArmySize=""1000"" warn=""true"" allowAllies=""false""><categories /><sysStatsList defaultStats=""default""><sysStats id=""default"" /></sysStatsList></system>");
 		}
 
 		protected override byte[] GetOtherGameSystemContentBytes()
 		{
-			return StringManipulation.StringToBytes(@"<?xml version=""1.0"" encoding=""UTF-8""?><system xmlns=""http://ibboard.co.uk/warfoundry/system"" xmlns:cats=""http://ibboard.co.uk/warfoundry/cats"" id=""otherSystem"" name=""Other System"" defaultArmySize=""0"" warn=""false"" allowAllies=""false""><categories /><sysStatsList defaultStats=""_"" /></system>");
+			return StringManipulation.StringToBytes(@"<?xml version=""1.0"" encoding=""UTF-8""?><system xmlns=""http://ibboard.co.uk/warfoundry/system"" xmlns:cats=""http://ibboard.co.uk/warfoundry/cats"" id=""otherSystem"" name=""Other System"" defaultArmySize=""1000"" warn=""true"" allowAllies=""false""><categories /><sysStatsList defaultStats=""_"" /></system>");
 		}
 
 		protected override byte[] GetArmyContentBytes ()
--- a/IBBoard.WarFoundry.API.Tests.csproj	Sun Aug 14 01:19:12 2011 +0000
+++ b/IBBoard.WarFoundry.API.Tests.csproj	Sun Aug 21 21:02:48 2011 +0100
@@ -105,6 +105,7 @@
     <Compile Include="API\Factories\Mock\MockRaceFactory.cs" />
     <Compile Include="API\MockRequirementFactory.cs" />
     <Compile Include="API\Factories\Requirement\Mock\MockRequirement.cs" />
+    <Compile Include="API\Savers\Xml\WarFoundryXmlFileSaverTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />