Skip to content
Permalink
Browse files
[FIXED JENKINS-16971] Fixed blank content for TAP files residing in s…
…ubdirectories
  • Loading branch information
kinow committed Feb 26, 2013
1 parent 79e5e61 commit e8dcf5cae68f940143d6b46119829b0e1ab3582c
Showing 4 changed files with 122 additions and 2 deletions.
@@ -109,7 +109,7 @@ public TapResult parse(FilePath[] results, AbstractBuild<?, ?> build) {
}

final TestSetMap map = new TestSetMap(
tapFile.getName(), testSet);
tapFile.getAbsolutePath(), testSet);
testSets.add(map);

if (this.outputTapToConsole) {
@@ -33,6 +33,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;

import javax.servlet.ServletOutputStream;

@@ -52,6 +53,7 @@
import org.tap4j.plugin.model.TestSetMap;
import org.tap4j.plugin.util.Constants;
import org.tap4j.plugin.util.DiagnosticUtil;
import org.tap4j.plugin.util.Util;
import org.tap4j.util.DirectiveValues;
import org.tap4j.util.StatusValues;

@@ -62,6 +64,8 @@
public class TapResult implements ModelObject, Serializable {

private static final long serialVersionUID = 4343399327336076951L;

private static final Logger LOGGER = Logger.getLogger(TapResult.class.getName());

private AbstractBuild<?, ?> build;
private List<TestSetMap> testSets;
@@ -129,7 +133,13 @@ private List<TestSetMap> filterTestSet(List<TestSetMap> testSets) {
final List<TestSetMap> filtered = new ArrayList<TestSetMap>();
for (TestSetMap testSet : testSets) {
if (testSet instanceof ParseErrorTestSetMap == false) {
filtered.add(testSet);
String rootDir = build.getRootDir().getAbsolutePath();
try {
rootDir = new File(build.getRootDir().getCanonicalPath().toString(), Constants.TAP_DIR_NAME).getAbsolutePath();
} catch (IOException e) {
LOGGER.warning(e.getMessage());
}
filtered.add(new TestSetMap(Util.normalizeFolders(rootDir, testSet.getFileName()), testSet.getTestSet()));
}
}
return filtered;
@@ -0,0 +1,57 @@
/*
* The MIT License
*
* Copyright (c) <2013> <Bruno P. Kinoshita>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package org.tap4j.plugin.util;

/**
* Utility methods used by tap-plugin.
*/
public final class Util {

private Util() {}

/**
* Normalizes a folder path in relation to the workspace path.
* <p>
* A folder that is subdirectory of workspace will return only the difference.
* It means that if the workspace is /home/workspace and the folder we want
* to normalize is /home/workspace/job-1/test.txt, then the return will be
* job-1/test.txt.
*
* @param workspace workspace path
* @param relative relative path
* @return normalized path
*/
public static String normalizeFolders(String workspace, String relative) {
workspace = workspace.replaceAll("\\\\", "\\/");
relative = relative.replaceAll("\\\\", "\\/");
if (relative.length() > workspace.length() && relative.contains(workspace)) {
String temp = relative.substring(workspace.length(), relative.length());
if (temp.startsWith("/") || temp.startsWith("\\"))
temp = temp.substring(1, temp.length());
return temp;
}
return relative;
}

}
@@ -0,0 +1,53 @@
/*
* The MIT License
*
* Copyright (c) <2013> <Bruno P. Kinoshita>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package org.tap4j.plugin.util;

import static junit.framework.Assert.assertEquals;

import org.junit.Test;


/**
* Tests for Util class.
* @see Util
*/
public class TestUtil {

private static final String UNIX_WS = "/home/workspace";
private static final String UNIX_FOLDER_1 = "/home/workspace/test/subdirectory/another/1.txt";
private static final String UNIX_FOLDER_2 = "/home/anotherfolder/test.txt";

private static final String WIN_WS = "c:\\home\\workspace";
private static final String WIN_FOLDER_1 = "c:\\home\\workspace\\test\\subdirectory\\another\\1.txt";
private static final String WIN_FOLDER_2 = "c:\\home\\anotherfolder\\test.txt";

@Test
public void testNormalizeFolders() {
assertEquals("Wrong normalization", "test/subdirectory/another/1.txt", Util.normalizeFolders(UNIX_WS, UNIX_FOLDER_1));
assertEquals("Wrong normalization", "/home/anotherfolder/test.txt", Util.normalizeFolders(UNIX_WS, UNIX_FOLDER_2));
assertEquals("Wrong normalization", "test/subdirectory/another/1.txt", Util.normalizeFolders(WIN_WS, WIN_FOLDER_1));
assertEquals("Wrong normalization", "c:/home/anotherfolder/test.txt", Util.normalizeFolders(WIN_WS, WIN_FOLDER_2));
}

}

0 comments on commit e8dcf5c

Please sign in to comment.