changeset 171:14d0450f295d

* Fix file path in test case to work on Linux * Switch to using XmlUnit in binary form (because license allows it)
author IBBoard <dev@ibboard.co.uk>
date Tue, 13 Sep 2011 20:49:06 +0100
parents 3a626ea2604a
children c026c02583ca
files API/Exporters/XmlSaveTest.cs IBBoard.WarFoundry.API.Tests.csproj LICENSE-XmlUnit.txt libs/xmlunit.dll
diffstat 4 files changed, 42 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/API/Exporters/XmlSaveTest.cs	Tue Sep 13 20:29:40 2011 +0100
+++ b/API/Exporters/XmlSaveTest.cs	Tue Sep 13 20:49:06 2011 +0100
@@ -19,7 +19,7 @@
 	{
         Army mockArmy;
         string outputFile = "test_output.xml";
-        string goldFile = "testdata\\xml_output.xml";
+        string goldFile = "testdata/xml_output.xml";
 
         string xslt = "<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"><xsl:output method=\"xml\" indent=\"no\" omit-xml-declaration=\"yes\"/><xsl:template match=\"/\"><testTopLevel><armyName><xsl:value-of select=\"army/name\"/></armyName></testTopLevel></xsl:template></xsl:stylesheet>";
         string goldOutput = "<testTopLevel><armyName>Mock Army</armyName></testTopLevel>";
--- a/IBBoard.WarFoundry.API.Tests.csproj	Tue Sep 13 20:29:40 2011 +0100
+++ b/IBBoard.WarFoundry.API.Tests.csproj	Tue Sep 13 20:49:06 2011 +0100
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -304,6 +304,7 @@
     <Content Include="testdata\NotARaceFile.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="libs\xmlunit.dll" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -311,6 +312,9 @@
     <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>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\IBBoard.WarFoundry.API\IBBoard.WarFoundry.API.csproj">
@@ -329,10 +333,6 @@
       <Project>{C52AFD32-B869-4E14-AACE-2846AD2CC742}</Project>
       <Name>IBBoard.NUnit</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Xmlunit\Xmlunit.csproj">
-      <Project>{E66FAEFC-4599-4AAB-A57F-0BB2554FA5B6}</Project>
-      <Name>Xmlunit</Name>
-    </ProjectReference>
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/LICENSE-XmlUnit.txt	Tue Sep 13 20:49:06 2011 +0100
@@ -0,0 +1,36 @@
+/*
+******************************************************************
+Copyright (c) 2001-2007, Jeff Martin, Tim Bacon
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of the xmlunit.sourceforge.net nor the names
+      of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written
+      permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+******************************************************************
+*/
+
Binary file libs/xmlunit.dll has changed