Upgrade to xunit.net 1.9. Also use single build.bat to build, test an…

…d nuget-pack.
andrewdavey · Feb 11, 2012 · 8c75f38 · 8c75f38
1 parent b318855
commit 8c75f38
Show file tree

Hide file tree

Showing 21 changed files with 227 additions and 58 deletions.
diff --git a/build-nuget.bat b/build-nuget.bat
diff --git a/build.bat b/build.bat
@@ -7,9 +7,21 @@ if exist build\bin. (
 )
 
 %msbuild% src\Cassette.UnitTests\Cassette.UnitTests.csproj /p:Configuration=Release /p:OutDir=..\..\build\bin\
-
 %msbuild% src\Cassette.IntegrationTests\Cassette.IntegrationTests.csproj /p:Configuration=Release /p:OutDir=..\..\build\bin\
-
 %msbuild% src\Cassette.Web\Cassette.Web.csproj /p:Configuration=Release /p:OutDir=..\..\build\bin\
+%msbuild% src\Cassette.Views\Cassette.Views.csproj /p:Configuration=Release /p:OutDir=..\..\build\bin\
+
+
+
+tools\xunit.console.clr4.x86.exe build\bin\Cassette.UnitTests.dll /noshadow
+tools\xunit.console.clr4.x86.exe build\bin\Cassette.IntegrationTests.dll /noshadow
+
+if exist build\nuget. (
+	del /S /Q build\nuget 
+) else (
+	mkdir build\nuget
+)
 
-%msbuild% src\Cassette.Views\Cassette.Views.csproj /p:Configuration=Release /p:OutDir=..\..\build\bin\
+nuget pack -Build src\Cassette\Cassette.csproj -Symbols -OutputDirectory build\nuget -Prop Configuration=Release
+nuget pack -Build src\Cassette.Views\Cassette.Views.csproj -Symbols -OutputDirectory build\nuget -Prop Configuration=Release
+nuget pack -Build src\Cassette.Web\Cassette.Web.csproj -Symbols -OutputDirectory build\nuget -Prop Configuration=Release
diff --git a/test.bat b/test.bat
diff --git a/tools/HTML.xslt b/tools/HTML.xslt
@@ -40,43 +40,41 @@
                 </script>
             </head>
             <body>
-                <xsl:apply-templates/>
+                <h3 class="divided"><b>Assemblies Run</b></h3>
+                <xsl:apply-templates select="//assembly"/>
+
+                <h3 class="divided"><b>Summary</b></h3>
+                <div>
+                    Tests run: <a href="#all"><b><xsl:value-of select="sum(//assembly/@total)"/></b></a> &#160;
+                    Failures: <a href="#failures"><b><xsl:value-of select="sum(//assembly/@failed)"/></b></a>,
+                    Skipped: <a href="#skipped"><b><xsl:value-of select="sum(//assembly/@skipped)"/></b></a>,
+                    Run time: <b><xsl:value-of select="sum(//assembly/@time)"/>s</b>
+                </div>
+                <xsl:if test="//assembly/class/test[@result='Fail']">
+                    <br />
+                    <h2><a name="failures"></a>Failed tests</h2>
+                    <xsl:apply-templates select="//assembly/class/test[@result='Fail']"><xsl:sort select="@name"/></xsl:apply-templates>
+                </xsl:if>
+                <xsl:if test="//assembly/class/failure">
+                    <br />
+                    <h2><a name="failures"></a>Failed fixtures</h2>
+                    <xsl:apply-templates select="//assembly/class/failure"><xsl:sort select="../@name"/></xsl:apply-templates>
+                </xsl:if>
+                <xsl:if test="//assembly/@skipped > 0">
+                    <br />
+                    <h2><a name="skipped"></a>Skipped tests</h2>
+                    <xsl:apply-templates select="//assembly/class/test[@result='Skip']"><xsl:sort select="@name"/></xsl:apply-templates>
+                </xsl:if>
+                <br />
+                <h2><a name="all"></a>All tests</h2>
+                <h5>Click test class name to expand/collapse test details</h5>
+                <xsl:apply-templates select="//assembly/class"><xsl:sort select="@name"/></xsl:apply-templates>
             </body>
         </html>
     </xsl:template>
 
-    <xsl:template match="assemblies">
-        <xsl:apply-templates/>
-    </xsl:template>
-
     <xsl:template match="assembly">
-        <h3 class="divided"><b>Results for <xsl:value-of select="@name"/></b></h3>
+        <div><xsl:value-of select="@name"/></div>
-        <div>
-            Tests run: <a href="#all"><b><xsl:value-of select="@total"/></b></a> &#160;
-            Failures: <a href="#failures"><b><xsl:value-of select="@failed"/></b></a>,
-            Skipped: <a href="#skipped"><b><xsl:value-of select="@skipped"/></b></a>,
-            Run time: <b><xsl:value-of select="@time"/>s</b>
-        </div>
-        <xsl:if test="class/test[@result='Fail']">
-            <br />
-            <h2><a name="failures"></a>Failed tests</h2>
-            <xsl:apply-templates select="class/test[@result='Fail']"><xsl:sort select="@name"/></xsl:apply-templates>
-        </xsl:if>
-        <xsl:if test="class/failure">
-            <br />
-            <h2><a name="failures"></a>Failed fixtures</h2>
-            <xsl:apply-templates select="class/failure"><xsl:sort select="../@name"/></xsl:apply-templates>
-        </xsl:if>
-        <xsl:if test="@skipped > 0">
-            <br />
-            <h2><a name="skipped"></a>Skipped tests</h2>
-            <xsl:apply-templates select="class/test[@result='Skip']"><xsl:sort select="@name"/></xsl:apply-templates>
-        </xsl:if>
-        <br />
-        <h2><a name="all"></a>All tests</h2>
-        <h5>Click test class name to expand/collapse test details</h5>
-        <xsl:apply-templates select="class"><xsl:sort select="@name"/></xsl:apply-templates>
-        <br /><h5>Results generated <xsl:value-of select="@run-date"/> at <xsl:value-of select="@run-time"/></h5>
     </xsl:template>
 
     <xsl:template match="test">
@@ -109,8 +107,8 @@
         <h3>
             <span class="timing"><xsl:value-of select="@time"/>s</span>
             <span class="clickable">
-                <xsl:attribute name="onclick">ToggleClass('class<xsl:value-of select="position()"/>')</xsl:attribute>
+                <xsl:attribute name="onclick">ToggleClass('class<xsl:value-of select="generate-id()"/>')</xsl:attribute>
-                <xsl:attribute name="ondblclick">ToggleClass('class<xsl:value-of select="position()"/>')</xsl:attribute>
+                <xsl:attribute name="ondblclick">ToggleClass('class<xsl:value-of select="generate-id()"/>')</xsl:attribute>
                 <xsl:if test="@failed > 0"><span class="failure">&#x2718;</span></xsl:if>
                 <xsl:if test="@failed = 0"><span class="success">&#x2714;</span></xsl:if>
                 &#160;<xsl:value-of select="@name"/>
@@ -120,7 +118,7 @@
         </h3>
         <div class="indent">
             <xsl:if test="@failed = 0"><xsl:attribute name="style">display: none;</xsl:attribute></xsl:if>
-            <xsl:attribute name="id">class<xsl:value-of select="position()"/></xsl:attribute>
+            <xsl:attribute name="id">class<xsl:value-of select="generate-id()"/></xsl:attribute>
             <xsl:apply-templates select="test"><xsl:sort select="@name"/></xsl:apply-templates>
         </div>
     </xsl:template>

diff --git a/tools/xunit.console.clr4.exe b/tools/xunit.console.clr4.exe
diff --git a/tools/xunit.console.clr4.x86.exe b/tools/xunit.console.clr4.x86.exe
diff --git a/tools/xunit.console.exe b/tools/xunit.console.exe
diff --git a/tools/xunit.console.x86.exe b/tools/xunit.console.x86.exe
diff --git a/tools/xunit.dll b/tools/xunit.dll
diff --git a/tools/xunit.extensions.dll b/tools/xunit.extensions.dll
diff --git a/tools/xunit.extensions.xml b/tools/xunit.extensions.xml
diff --git a/tools/xunit.gui.clr4.exe b/tools/xunit.gui.clr4.exe
diff --git a/tools/xunit.gui.clr4.x86.exe b/tools/xunit.gui.clr4.x86.exe
diff --git a/tools/xunit.gui.exe b/tools/xunit.gui.exe
diff --git a/tools/xunit.gui.x86.exe b/tools/xunit.gui.x86.exe
diff --git a/tools/xunit.installer.exe b/tools/xunit.installer.exe
diff --git a/tools/xunit.runner.msbuild.dll b/tools/xunit.runner.msbuild.dll
diff --git a/tools/xunit.runner.tdnet.dll b/tools/xunit.runner.tdnet.dll
diff --git a/tools/xunit.runner.utility.dll b/tools/xunit.runner.utility.dll
diff --git a/tools/xunit.runner.utility.xml b/tools/xunit.runner.utility.xml