[FIXED JENKINS-17245]

jenkinsci · Mar 16, 2013 · 80a01b1 · 80a01b1
1 parent 876872c
commit 80a01b1
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 109 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jenkins-ci.plugins</groupId>
 		<artifactId>plugin</artifactId>
-		<version>1.399</version><!-- which version of Jenkins is this plugin built 
+		<version>1.488</version><!-- which version of Jenkins is this plugin built 
 			against? -->
 	</parent>
 
@@ -152,7 +152,7 @@
         <dependency>
             <groupId>org.tap4j</groupId>
             <artifactId>tap4j</artifactId>
-            <version>3.3</version>
+            <version>4.0.1</version>
         </dependency>
     </dependencies>
 

diff --git a/src/main/java/org/tap4j/plugin/TapParser.java b/src/main/java/org/tap4j/plugin/TapParser.java
@@ -36,7 +36,7 @@
 import org.apache.commons.io.FileUtils;
 import org.tap4j.model.TestSet;
 import org.tap4j.parser.ParserException;
-import org.tap4j.parser.Tap13YamlParser;
+import org.tap4j.parser.Tap13Parser;
 import org.tap4j.plugin.model.ParseErrorTestSetMap;
 import org.tap4j.plugin.model.TestSetMap;
 
@@ -96,11 +96,11 @@ public TapResult parse(FilePath[] results, AbstractBuild<?, ?> build) {
 				try {
 					log("Parsing TAP test result [" + tapFile + "].");
 
-					final Tap13YamlParser parser;
+					final Tap13Parser parser;
 					if(enableSubtests != null) {
-						parser = new Tap13YamlParser(enableSubtests);
+						parser = new Tap13Parser(enableSubtests);
 					} else {
-						parser = new Tap13YamlParser();
+						parser = new Tap13Parser();
 					}
 					final TestSet testSet = parser.parseFile(tapFile);
 

diff --git a/src/main/java/org/tap4j/plugin/TapProjectAction.java b/src/main/java/org/tap4j/plugin/TapProjectAction.java
@@ -27,10 +27,12 @@
 import hudson.model.AbstractProject;
 import hudson.util.ChartUtil;
 import hudson.util.DataSetBuilder;
+import hudson.util.RunList;
 
 import java.io.IOException;
 import java.util.Calendar;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 import org.jfree.chart.JFreeChart;
@@ -44,8 +46,7 @@
  * @author Bruno P. Kinoshita - http://www.kinoshita.eti.br
  * @since 1.0
  */
-public class TapProjectAction extends AbstractTapProjectAction
-{
+public class TapProjectAction extends AbstractTapProjectAction {
 
 	private AbstractProject<?, ?> project;
 
@@ -56,28 +57,23 @@ public class TapProjectAction extends AbstractTapProjectAction
 	 */
 	private transient Map<String, Integer> requestMap = new HashMap<String, Integer>();
 
-	public TapProjectAction(AbstractProject<?, ?> project)
-	{
+	public TapProjectAction(AbstractProject<?, ?> project) {
 		this.project = project;
 	}
 
-	public AbstractProject<?, ?> getProject()
-	{
+	public AbstractProject<?, ?> getProject() {
 		return this.project;
 	}
 
-	protected Class<TapBuildAction> getBuildActionClass()
-	{
+	protected Class<TapBuildAction> getBuildActionClass() {
 		return TapBuildAction.class;
 	}
 
-	public TapBuildAction getLastBuildAction()
-	{
+	public TapBuildAction getLastBuildAction() {
 		TapBuildAction action = null;
 		final AbstractBuild<?, ?> lastBuild = this.getLastBuildWithTap();
 
-		if (lastBuild != null)
-		{
+		if (lastBuild != null) {
 			action = lastBuild.getAction(TapBuildAction.class);
 		}
 
@@ -87,78 +83,59 @@ public TapBuildAction getLastBuildAction()
 	/**
 	 * @return
 	 */
-	private AbstractBuild<?, ?> getLastBuildWithTap()
-	{
+	private AbstractBuild<?, ?> getLastBuildWithTap() {
 		AbstractBuild<?, ?> lastBuild = this.project.getLastBuild();
-		while (lastBuild != null
-				&& lastBuild.getAction(TapBuildAction.class) == null)
-		{
+		while (lastBuild != null && lastBuild.getAction(TapBuildAction.class) == null) {
 			lastBuild = lastBuild.getPreviousBuild();
 		}
 		return lastBuild;
 	}
 
 	public void doIndex( final StaplerRequest request,
-			final StaplerResponse response ) throws IOException
-	{
+			final StaplerResponse response ) throws IOException {
 		AbstractBuild<?, ?> lastBuild = this.getLastBuildWithTap();
-		if (lastBuild == null)
-		{
+		if (lastBuild == null) {
 			response.sendRedirect2("nodata");
-		} else
-		{
+		} else {
 			int buildNumber = lastBuild.getNumber();
 			response.sendRedirect2(String.format("../%d/%s", buildNumber,
 					TapBuildAction.URL_NAME));
 		}
 	}
 
 	/**
-	 * Generates the graph that shows test pass/fail ratio
-	 * 
-	 * @param req
-	 *            -
-	 * @param rsp
-	 *            -
-	 * @throws IOException
-	 *             -
+	 * Generates the graph that shows test pass/fail ratio.
+	 *
+	 * @param req Stapler request
+	 * @param rsp Stapler response
+	 * @throws IOException if it fails to create the graph image and serve it
 	 */
-	public void doGraph( final StaplerRequest req, StaplerResponse rsp )
-			throws IOException
-	{
-		if (newGraphNotNeeded(req, rsp))
-		{
+	public void doGraph( final StaplerRequest req, StaplerResponse rsp ) throws IOException {
+		if (newGraphNotNeeded(req, rsp)) {
 			return;
 		}
 
 		final DataSetBuilder<String, ChartUtil.NumberOnlyBuildLabel> dataSetBuilder = new DataSetBuilder<String, ChartUtil.NumberOnlyBuildLabel>();
 
 		populateDataSetBuilder(dataSetBuilder);
-		new hudson.util.Graph(-1, getGraphWidth(), getGraphHeight())
-		{
-			protected JFreeChart createGraph()
-			{
+		new hudson.util.Graph(-1, getGraphWidth(), getGraphHeight()) {
+			protected JFreeChart createGraph() {
 				return GraphHelper.createChart(req, dataSetBuilder.build());
 			}
 		}.doPng(req, rsp);
 	}
 
-	public void doGraphMap( final StaplerRequest req, StaplerResponse rsp )
-			throws IOException
-	{
-		if (newGraphNotNeeded(req, rsp))
-		{
+	public void doGraphMap( final StaplerRequest req, StaplerResponse rsp ) throws IOException {
+		if (newGraphNotNeeded(req, rsp)) {
 			return;
 		}
 
 		final DataSetBuilder<String, ChartUtil.NumberOnlyBuildLabel> dataSetBuilder = new DataSetBuilder<String, ChartUtil.NumberOnlyBuildLabel>();
 
 		// TODO: optimize by using cache
 		populateDataSetBuilder(dataSetBuilder);
-		new hudson.util.Graph(-1, getGraphWidth(), getGraphHeight())
-		{
-			protected JFreeChart createGraph()
-			{
+		new hudson.util.Graph(-1, getGraphWidth(), getGraphHeight()) {
+			protected JFreeChart createGraph() {
 				return GraphHelper.createChart(req, dataSetBuilder.build());
 			}
 		}.doMap(req, rsp);
@@ -167,21 +144,17 @@ protected JFreeChart createGraph()
 	/**
 	 * Returns <code>true</code> if there is a graph to plot.
 	 * 
-	 * @return Value for property 'graphAvailable'.
+	 * @return value for property 'graphAvailable'
 	 */
-	public boolean isGraphActive()
-	{
+	public boolean isGraphActive() {
 		AbstractBuild<?, ?> build = getProject().getLastBuild();
 		// in order to have a graph, we must have at least two points.
 		int numPoints = 0;
-		while (numPoints < 2)
-		{
-			if (build == null)
-			{
+		while (numPoints < 2) {
+			if (build == null) {
 				return false;
 			}
-			if (build.getAction(getBuildActionClass()) != null)
-			{
+			if (build.getAction(getBuildActionClass()) != null) {
 				numPoints++;
 			}
 			build = build.getPreviousBuild();
@@ -193,32 +166,32 @@ public boolean isGraphActive()
 	 * If number of builds hasn't changed and if checkIfModified() returns true,
 	 * no need to regenerate the graph. Browser should reuse it's cached image
 	 * 
-	 * @param req
-	 * @param rsp
+	 * @param req Stapler request
+	 * @param rsp Stapler response
 	 * @return true, if new image does NOT need to be generated, false otherwise
 	 */
-	private boolean newGraphNotNeeded( final StaplerRequest req,
-			StaplerResponse rsp )
-	{
+	private boolean newGraphNotNeeded( final StaplerRequest req, StaplerResponse rsp ) {
 		Calendar t = getProject().getLastCompletedBuild().getTimestamp();
 		Integer prevNumBuilds = requestMap.get(req.getRequestURI());
-		int numBuilds = getProject().getBuilds().size();
+		int numBuilds = 0;
+		RunList<?> builds = getProject().getBuilds();
+		Iterator<?> it = builds.iterator();
+		while (it.hasNext()) {
+			it.next();
+			numBuilds += 1;
+		}
 
-		// change null to 0
 		prevNumBuilds = prevNumBuilds == null ? 0 : prevNumBuilds;
-		if (prevNumBuilds != numBuilds)
-		{
+		if (prevNumBuilds != numBuilds) {
 			requestMap.put(req.getRequestURI(), numBuilds);
 		}
 
-		if (requestMap.keySet().size() > 10)
-		{
+		if (requestMap.keySet().size() > 10) {
 			// keep map size in check
 			requestMap.clear();
 		}
 
-		if (prevNumBuilds == numBuilds && req.checkIfModified(t, rsp))
-		{
+		if (prevNumBuilds == numBuilds && req.checkIfModified(t, rsp)) {
 			/*
 			 * checkIfModified() is after '&&' because we want it evaluated only
 			 * if number of builds is different
@@ -229,18 +202,12 @@ private boolean newGraphNotNeeded( final StaplerRequest req,
 		return false;
 	}
 
-	protected void populateDataSetBuilder(
-			DataSetBuilder<String, ChartUtil.NumberOnlyBuildLabel> dataset )
-	{
+	protected void populateDataSetBuilder(DataSetBuilder<String, ChartUtil.NumberOnlyBuildLabel> dataset ) {
 
-		for (AbstractBuild<?, ?> build = getProject().getLastBuild(); build != null; build = build
-				.getPreviousBuild())
-		{
-			ChartUtil.NumberOnlyBuildLabel label = new ChartUtil.NumberOnlyBuildLabel(
-					build);
+		for (AbstractBuild<?, ?> build = getProject().getLastBuild(); build != null; build = build.getPreviousBuild()) {
+			ChartUtil.NumberOnlyBuildLabel label = new ChartUtil.NumberOnlyBuildLabel(build);
 			TapBuildAction action = build.getAction(getBuildActionClass());
-			if (action != null)
-			{
+			if (action != null) {
 				TapResult report = action.getResult();
 				report.tally();
 
@@ -259,8 +226,7 @@ protected void populateDataSetBuilder(
 	 * 
 	 * @return Value for property 'graphWidth'.
 	 */
-	public int getGraphWidth()
-	{
+	public int getGraphWidth() {
 		return 500;
 	}
 
@@ -269,8 +235,7 @@ public int getGraphWidth()
 	 * 
 	 * @return Value for property 'graphHeight'.
 	 */
-	public int getGraphHeight()
-	{
+	public int getGraphHeight() {
 		return 200;
 	}
 

diff --git a/src/main/java/org/tap4j/plugin/TapResult.java b/src/main/java/org/tap4j/plugin/TapResult.java
@@ -46,6 +46,7 @@
 import org.tap4j.model.BailOut;
 import org.tap4j.model.Comment;
 import org.tap4j.model.Directive;
+import org.tap4j.model.Plan;
 import org.tap4j.model.TestResult;
 import org.tap4j.model.TestSet;
 import org.tap4j.plugin.model.ParseErrorTestSetMap;
@@ -158,17 +159,23 @@ public void tally() {
 			List<TestResult> testResults = realTestSet.getTestResults();
 
 			total += testResults.size();
-
-			for (TestResult testResult : testResults) {
-				if (isSkipped(testResult)) {
-					skipped += 1;
-				} else if (isFailure(testResult)) {
-					failed += 1;
-				} else {
-					passed += 1;
+
+			Plan plan = realTestSet.getPlan();
+
+			if (plan.isSkip()) {
+				this.skipped = testResults.size();
+			} else {
+				for (TestResult testResult : testResults) {
+					if (isSkipped(testResult)) {
+						skipped += 1;
+					} else if (isFailure(testResult)) {
+						failed += 1;
+					} else {
+						passed += 1;
+					}
 				}
 			}
-
+			
 			this.bailOuts += realTestSet.getNumberOfBailOuts();
 		}
 	}

diff --git a/src/main/java/org/tap4j/plugin/model/TapStreamResult.java b/src/main/java/org/tap4j/plugin/model/TapStreamResult.java
@@ -177,13 +177,15 @@ public Object getDynamic(String name, StaplerRequest req, StaplerResponse rsp) {
 	 * @return
 	 */
 	private TapTestResultResult getTapTestResultResult(String name) {
-		String fileName = name.substring(0, name.lastIndexOf("-"));
-		String testNumber = name.substring(name.lastIndexOf("-")+1);
-		for(TestSetMap tsm : tapResult.getTestSets()) {
-			if(tsm.getFileName().equals(fileName)) {
-				TestSet ts = tsm.getTestSet();
-				org.tap4j.model.TestResult desired = ts.getTestResult(Integer.parseInt(testNumber));
-				return new TapTestResultResult(owner, tsm, desired, this.tapResult.getTodoIsFailure());
+		if (name != null && name.lastIndexOf("-") > 0) {
+			String fileName = name.substring(0, name.lastIndexOf("-"));
+			String testNumber = name.substring(name.lastIndexOf("-")+1);
+			for(TestSetMap tsm : tapResult.getTestSets()) {
+				if(tsm.getFileName().equals(fileName)) {
+					TestSet ts = tsm.getTestSet();
+					org.tap4j.model.TestResult desired = ts.getTestResult(Integer.parseInt(testNumber));
+					return new TapTestResultResult(owner, tsm, desired, this.tapResult.getTodoIsFailure());
+				}
 			}
 		}
 		return null;

diff --git a/src/main/resources/org/tap4j/plugin/TapResult/index.jelly b/src/main/resources/org/tap4j/plugin/TapResult/index.jelly
@@ -26,9 +26,17 @@
 				        </tr>
 				    </table>				
 
+
 					<j:forEach var="map" items="${it.testSets}">
-
-						<p>File: <span class="underline"><a href='contents?f=${map.fileName}'>${map.fileName}</a></span></p>
+
+					   <j:choose>
+						<j:when test="${map.getTestSet().getPlan().isSkip()}">
+						<p>File: <span class="underline"><a href='contents?f=${map.fileName}'>${map.fileName}</a></span> (Skipped)</p>
+						</j:when>
+						<j:otherwise>
+					    <p>File: <span class="underline"><a href='contents?f=${map.fileName}'>${map.fileName}</a></span></p>
+						</j:otherwise>
+					  </j:choose>
 
 						<table class="tap" width="100%">