Merge pull request #26 from menonvarun/csv_export_fix

Fixing JENKINS-32129 and JENKINS-32202
jenkinsci · Dec 25, 2015 · d86910b · d86910b
2 parents 77749cc + ad3f040
commit d86910b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/testresultsanalyzer/TestResultsAnalyzerAction.java b/src/main/java/org/jenkinsci/plugins/testresultsanalyzer/TestResultsAnalyzerAction.java
@@ -171,11 +171,14 @@ public JSONObject getTreeResult(String noOfBuildsNeeded) {
     }
 
 	@JavaScriptMethod
-    public String getExportCSV(String timeBased) {
+    public String getExportCSV(String timeBased, String noOfBuildsNeeded) {
 		boolean isTimeBased = Boolean.parseBoolean(timeBased);
         Map<String, PackageInfo> packageResults = resultInfo.getPackageResults();
-        String buildsString = "";
-        for (int i = 0; i < builds.size(); i++) {
+		int noOfBuilds = getNoOfBuildRequired(noOfBuildsNeeded);
+		List<Integer> buildList = getBuildList(noOfBuilds);
+
+		String buildsString = "";
+        for (int i = 0; i < buildList.size(); i++) {
             buildsString += ",\"" + Integer.toString(builds.get(i)) + "\"";
         }		
         String header = "\"Package\",\"Class\",\"Test\"";
@@ -195,8 +198,8 @@ public String getExportCSV(String timeBased) {
                     String testName = tInfo.getName();
                     exportBuilder.append("\""+ packageName + "\",\"" + className + "\",\"" + testName+"\"");
 					Map<Integer, ResultData> buildPackageResults = tInfo.getBuildPackageResults();
-					for (int i = 0; i < builds.size(); i++) {
-						Integer buildNumber = builds.get(i);
+					for (int i = 0; i < buildList.size(); i++) {
+						Integer buildNumber = buildList.get(i);
 						String data = "N/A";
 						if(buildPackageResults.containsKey(buildNumber)) {
 							ResultData buildResult = buildPackageResults.get(buildNumber);

diff --git a/src/main/java/org/jenkinsci/plugins/testresultsanalyzer/result/info/ResultInfo.java b/src/main/java/org/jenkinsci/plugins/testresultsanalyzer/result/info/ResultInfo.java
@@ -21,7 +21,7 @@ public void addPackage(Integer buildNumber, TabulatedResult packageResult, Strin
 			packageInfo = new PackageInfo();
 			packageInfo.setName(packageName);
 		}
-		packageInfo.putPackageResult(buildNumber, packageResult, url + "testReport/" + packageResult.getName());
+		packageInfo.putPackageResult(buildNumber, packageResult, url + getResultUrl(packageResult) +"/" + packageResult.getName());
 		packageResults.put(packageName, packageInfo);
 	}
 
@@ -36,4 +36,13 @@ public JSONObject getJsonObject() {
 	public Map<String, PackageInfo> getPackageResults() {
 		return this.packageResults;
 	}
+
+	protected String getResultUrl(TabulatedResult result){
+		boolean isTestng = result.getClass().getName().startsWith("hudson.plugins.testng.results");
+		if(isTestng){
+			return "testngreports";
+		} else {
+			return "testReport";
+		}
+	}
 }
diff --git a/...resources/org/jenkinsci/plugins/testresultsanalyzer/TestResultsAnalyzerAction/index.jelly b/...resources/org/jenkinsci/plugins/testresultsanalyzer/TestResultsAnalyzerAction/index.jelly
@@ -144,7 +144,12 @@ var $j = jQuery.noConflict();
 	});
 
 	jQuery("#downloadCSV").click(function () {
-        remoteAction.getExportCSV(displayValues, function(t) {
+	    var noOfBuilds = "-1";
+
+        if (!jQuery("#allnoofbuilds").is(":checked")) {
+            noOfBuilds = jQuery("#noofbuilds").val();
+        }
+        remoteAction.getExportCSV(displayValues, noOfBuilds, function(t) {
             download("Test Results.csv", t.responseObject());
         })
     });