Index: jsunit-to-junit.xsl
===================================================================
--- jsunit-to-junit.xsl	(revision 26100)
+++ jsunit-to-junit.xsl	(working copy)
@@ -1,51 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-    xmlns:lxslt="http://xml.apache.org/xslt"
-    xmlns:redirect="http://xml.apache.org/xalan/redirect"
-    xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
-    extension-element-prefixes="redirect">
-	<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
-	<xsl:template match="browserResult">
-		<testsuites>
-			<xsl:variable name="numberOfTests" select="count(descendant::testCase)" />
-			<xsl:variable name="numberOfFailures" select="count(descendant::failure)" />
-			<xsl:variable name="totalTime" select='format-number(sum(descendant::testCase/@time), "#.###")' />
-			<testsuite failures="{$numberOfFailures}" errors="0" hostname="" id="" name="JsUnit Tests" package="" tests="{$numberOfTests}" time="{$totalTime}">
-				<properties>
-					<xsl:for-each select="properties/property">
-						<property name="{@name}" value="{@value}" />
-					</xsl:for-each>
-				</properties>
-				<xsl:for-each select="testCases/testCase">
-				<xsl:variable name="reversedCN">
-					<xsl:call-template name="reverse-string">
-						<xsl:with-param name="s" select="@name"/>
-					</xsl:call-template>
-				</xsl:variable>
-				<xsl:variable name="classname">
-					<xsl:call-template name="reverse-string">
-						<xsl:with-param name="s" select="substring-before($reversedCN,'/')"/>
-					</xsl:call-template>
-				</xsl:variable>
-					<testcase classname="JSUnit.{substring-before($classname, '.html')}" name="{substring-after(@name,'.html:')}" time="{@time}">
-						<xsl:if test="failure">
-							<failure>
-								<xsl:value-of select="failure" />
-							</failure>
-						</xsl:if>
-					</testcase>
-				</xsl:for-each>
-			</testsuite>
-		</testsuites>
-	</xsl:template>
-	<xsl:template name="reverse-string">
-		<xsl:param name="s" select="''" />
-		<xsl:variable name="l" select="string-length($s)" />
-		<xsl:value-of select="substring($s, $l, 1)" />
-		<xsl:if test="$l &gt; 0">
-			<xsl:call-template name="reverse-string">
-				<xsl:with-param name="s" select="substring($s, 1, $l - 1)" />
-			</xsl:call-template>
-		</xsl:if>
-	</xsl:template>
+                xmlns:lxslt="http://xml.apache.org/xslt"
+                xmlns:redirect="http://xml.apache.org/xalan/redirect"
+                xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
+                extension-element-prefixes="redirect">
+    <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
+    <xsl:template match="browserResult">
+        <xsl:variable name="browser" select="browser/displayName" />
+        <testsuites>
+            <xsl:variable name="numberOfTests" select="count(descendant::testCaseResult)" />
+            <xsl:variable name="numberOfErrors" select="count(descendant::error)" />
+            <xsl:variable name="numberOfFailures" select="count(descendant::failure)" />
+            <xsl:variable name="hostName" select="properties/property[@name = 'remoteAddress']/@value" />
+            <xsl:variable name="testSuiteName" select="properties/property[@name = 'testPage']/@value" />
+            <xsl:variable name="totalTime" select='format-number(sum(descendant::testCaseResult/@time), "#.###")' />
+            <testsuite errors="{$numberOfErrors}" failures="{$numberOfFailures}" hostname="{$hostName}" name="{$browser}.{$testSuiteName}" tests="{$numberOfTests}" time="{$totalTime}">
+                <xsl:copy-of select="properties" /> <!-- copy all properties -->
+                <xsl:for-each select="testCaseResults/testCaseResult">
+                    <xsl:variable name="classname">
+                        <xsl:call-template name="get-classname">
+                            <xsl:with-param name="testname" select="substring-before(@name,'.html:')"/>
+                        </xsl:call-template>
+                    </xsl:variable>
+                    <testcase classname="JsUnit.{$browser}.{$classname}" name="{substring-after(@name,'.html:')}" time="{@time}">
+                        <xsl:copy-of select="*" /> <!-- copy all failures and errors -->
+                    </testcase>
+                </xsl:for-each>
+            </testsuite>
+        </testsuites>
+    </xsl:template>
+
+    <!-- recursively strips slashes from the beginning until none are left -->
+    <xsl:template name="get-classname">
+        <xsl:param name="testname" />
+        <xsl:choose>
+            <xsl:when test="contains($testname, '/')">
+                <xsl:call-template name="get-classname">
+                    <xsl:with-param name="testname" select="substring-after($testname, '/')" />
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$testname" />
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 </xsl:stylesheet>
\ No newline at end of file