JBEHAVE-655: a comment before "Scenario" ends up as package name in j…

…behave-plugin-jenkins always use testcase/@path instead of @title this way we get package.file.story as title, which matches the normal junit results with package.classname.methodname
alexlehm · Feb 25, 2012 · 31bf5eb · 31bf5eb
1 parent 3d22f27
commit 31bf5eb
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 16 deletions.
diff --git a/jbehave-hudson-plugin/src/main/resources/org/jbehave/hudson/jbehave-3.x-to-junit-1.0.xsl b/jbehave-hudson-plugin/src/main/resources/org/jbehave/hudson/jbehave-3.x-to-junit-1.0.xsl
@@ -4,14 +4,7 @@
 	<xsl:output method="xml" indent="yes" />
 
 	<xsl:variable name="storyTitle">
-	    	<xsl:choose>
-	    		<xsl:when test="string(//story/@title)">
-	    			<xsl:value-of select="//story/@title" />
-	    		</xsl:when>
-	    		<xsl:otherwise>
-	    			<xsl:value-of select="//story/@path" />
-	    		</xsl:otherwise>
-	    	</xsl:choose>
+	    <xsl:value-of select="//story/@path" />
 	 </xsl:variable>
 
 	<xsl:template match="/">

diff --git a/jbehave-hudson-plugin/src/test/java/org/jbehave/hudson/ReportTransformBehaviour.java b/jbehave-hudson-plugin/src/test/java/org/jbehave/hudson/ReportTransformBehaviour.java
@@ -150,6 +150,13 @@ public void transformFilterStoryReport() throws FileNotFoundException, Throwable
         assertEquals("0", engine.evaluate(TESTCASE_FAILURE, document));
     }
 
+    @Test
+    public void testsuiteNameTitle() throws FileNotFoundException, Throwable {
+        runStories("title.story");
+        Document document = tranformReport("title.xml");
+        assertEquals("title.story", engine.evaluate(TESTSUITE_NAME_ATTRIBUTE, document));
+    }
+
     private void runStories(String... storyPaths) {
         StoryReporterBuilder storyReporterBuilder = new StoryReporterBuilder().withDefaultFormats()
                 .withCodeLocation(CodeLocations.codeLocationFromClass(ReportTransformBehaviour.class))

diff --git a/jbehave-hudson-plugin/src/test/resources/title.story b/jbehave-hudson-plugin/src/test/resources/title.story
@@ -0,0 +1,7 @@
+This story has a lengthy introduction text to exhibit
+a jenkins xunit plugin problem with the title 
+
+Scenario: Something
+
+When I do something
+
diff --git a/jbehave-jenkins-plugin/src/main/resources/org/jbehave/jenkins/jbehave-3.x-to-junit-1.0.xsl b/jbehave-jenkins-plugin/src/main/resources/org/jbehave/jenkins/jbehave-3.x-to-junit-1.0.xsl
@@ -4,14 +4,7 @@
 	<xsl:output method="xml" indent="yes" />
 
 	<xsl:variable name="storyTitle">
-	    	<xsl:choose>
-	    		<xsl:when test="string(//story/@title)">
-	    			<xsl:value-of select="//story/@title" />
-	    		</xsl:when>
-	    		<xsl:otherwise>
-	    			<xsl:value-of select="//story/@path" />
-	    		</xsl:otherwise>
-	    	</xsl:choose>
+	    <xsl:value-of select="//story/@path" />
 	 </xsl:variable>
 
 	<xsl:template match="/">

diff --git a/jbehave-jenkins-plugin/src/test/java/org/jbehave/jenkins/ReportTransformBehaviour.java b/jbehave-jenkins-plugin/src/test/java/org/jbehave/jenkins/ReportTransformBehaviour.java
@@ -150,6 +150,13 @@ public void transformFilterStoryReport() throws FileNotFoundException, Throwable
         assertEquals("0", engine.evaluate(TESTCASE_FAILURE, document));
     }
 
+    @Test
+    public void testsuiteNameTitle() throws FileNotFoundException, Throwable {
+        runStories("title.story");
+        Document document = tranformReport("title.xml");
+        assertEquals("title.story", engine.evaluate(TESTSUITE_NAME_ATTRIBUTE, document));
+    }
+
     private void runStories(String... storyPaths) {
         StoryReporterBuilder storyReporterBuilder = new StoryReporterBuilder().withDefaultFormats()
                 .withCodeLocation(CodeLocations.codeLocationFromClass(ReportTransformBehaviour.class))

diff --git a/jbehave-jenkins-plugin/src/test/resources/title.story b/jbehave-jenkins-plugin/src/test/resources/title.story
@@ -0,0 +1,7 @@
+This story has a lengthy introduction text to exhibit
+a jenkins/hudson xunit plugin problem with the title 
+
+Scenario: Something
+
+When I do something
+