diff --git a/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ErrorTracker.java b/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ErrorTracker.java
deleted file mode 100644
index 5d2c0573cccf3253f268409ee3a508ef2f59df9c..0000000000000000000000000000000000000000
--- a/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ErrorTracker.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wtp.releng.tools;
-
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.io.File;
-
-import java.util.Vector;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * @version 1.0
- * @author
- */
-public class ErrorTracker {
-
- // List of test logs expected at end of build
- private Vector testLogs = new Vector();
-
-
- // Platforms keyed on
- private Hashtable platforms = new Hashtable();
- private Hashtable logFiles = new Hashtable();
- private Hashtable typesMap = new Hashtable();
- private Vector typesList = new Vector();
-
- public void loadFile(String fileName) {
- DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder parser=null;
- try {
- parser = docBuilderFactory.newDocumentBuilder();
- } catch (ParserConfigurationException e1) {
- e1.printStackTrace();
- }
- try {
- if (parser != null) {
- Document document = parser.parse(fileName);
- NodeList elements = document.getElementsByTagName("platform");
- int elementCount = elements.getLength();
- for (int i = 0; i < elementCount; i++) {
- PlatformStatus aPlatform = new PlatformStatus((Element) elements.item(i));
- //System.out.println("ID: " + aPlatform.getId());
- platforms.put(aPlatform.getId(), aPlatform);
-
- Node zipType = elements.item(i).getParentNode();
- String zipTypeName = (String) zipType.getAttributes().getNamedItem("name").getNodeValue();
-
- Vector aVector = (Vector) typesMap.get(zipTypeName);
- if (aVector == null) {
- typesList.add(zipTypeName);
- aVector = new Vector();
- typesMap.put(zipTypeName, aVector);
- }
- aVector.add(aPlatform.getId());
-
- }
-
- NodeList effectedFiles = document.getElementsByTagName("effectedFile");
- int effectedFilesCount = effectedFiles.getLength();
- for (int i = 0; i < effectedFilesCount; i++) {
- Node anEffectedFile = effectedFiles.item(i);
- Node logFile = anEffectedFile.getParentNode();
- String logFileName = (String) logFile.getAttributes().getNamedItem("name").getNodeValue();
- logFileName=convertPathDelimiters(logFileName);
- String effectedFileID = (String) anEffectedFile.getAttributes().getNamedItem("id").getNodeValue();
- //System.out.println(logFileName);
- Vector aVector = (Vector) logFiles.get(logFileName);
- if (aVector == null) {
- aVector = new Vector();
- logFiles.put(logFileName, aVector);
-
- }
- PlatformStatus ps=(PlatformStatus) platforms.get(effectedFileID);
- if (ps!=null)
- aVector.addElement(ps);
- }
-
- // store a list of the test logs expected after testing
- NodeList testLogList = document.getElementsByTagName("logFile");
- int testLogCount = testLogList.getLength();
- for (int i = 0; i < testLogCount; i++) {
-
- Node testLog = testLogList.item(i);
- String testLogName = (String) testLog.getAttributes().getNamedItem("name").getNodeValue();
- Node typeNode=testLog.getAttributes().getNamedItem("type");
- String type="test";
- if (typeNode!=null){
- type = typeNode.getNodeValue();
- }
- if (testLogName.endsWith(".xml")&&type.equals("test")){
- testLogs.add(testLogName);
- //System.out.println(testLogName);
- }
-
- }
-
-
- }
-
-
-
- } catch (IOException e) {
- System.out.println("IOException: " + fileName);
- // e.printStackTrace();
-
- } catch (SAXException e) {
- System.out.println("SAXException: " + fileName);
- e.printStackTrace();
-
- }
- }
-
- public void registerError(String fileName) {
- // System.out.println("Found an error in: " + fileName);
- if (logFiles.containsKey(fileName)) {
- Vector aVector = (Vector) logFiles.get(fileName);
- for (int i = 0; i < aVector.size(); i++) {
- ((PlatformStatus) aVector.elementAt(i)).registerError();
- }
- } else {
-
- // If a log file is not specified explicitly it effects
- // all "platforms" except JDT
-
- Enumeration values = platforms.elements();
- while (values.hasMoreElements()) {
- PlatformStatus aValue = (PlatformStatus) values.nextElement();
- if (!aValue.getId().equals("JA") &&
- !aValue.getId().equals("EW") &&
- !aValue.getId().equals("EA")) {
- aValue.registerError();
- }
- }
- }
- }
-
- public boolean hasErrors(String id) {
- return ((PlatformStatus) platforms.get(id)).hasErrors();
- }
-
- // Answer a string array of the zip type names in the order they appear in
- // the .xml file.
- public String[] getTypes() {
- return (String[]) typesList.toArray(new String[typesList.size()]);
- }
-
- // Answer an array of PlatformStatus objects for a given type.
-
- public PlatformStatus[] getPlatforms(String type) {
- Vector platformIDs = (Vector) typesMap.get(type);
- PlatformStatus[] result = new PlatformStatus[platformIDs.size()];
- for (int i = 0; i < platformIDs.size(); i++) {
- result[i] = (PlatformStatus) platforms.get((String) platformIDs.elementAt(i));
- }
- return result;
- }
-
- /**
- * Returns the testLogs.
- * @return Vector
- */
- public Vector getTestLogs() {
- return testLogs;
- }
-
- private String convertPathDelimiters(String path){
- return new File(path).getPath();
- }
-
-}
diff --git a/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/PlatformStatus.java b/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/PlatformStatus.java
deleted file mode 100644
index 5da34514305824ae836cc635e8bc9da2e78aca82..0000000000000000000000000000000000000000
--- a/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/PlatformStatus.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wtp.releng.tools;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-/**
- * @version 1.0
- * @author
- */
-public class PlatformStatus {
-
- private String id;
- private String name;
- private String fileName;
- private boolean hasErrors = false;
-
- PlatformStatus(Element anElement) {
- super();
- NamedNodeMap attributes = anElement.getAttributes();
- this.id = (String) attributes.getNamedItem("id").getNodeValue();
- this.name = (String) attributes.getNamedItem("name").getNodeValue();
- this.fileName = (String) attributes.getNamedItem("fileName").getNodeValue();
-
- }
-
- /**
- * Gets the id.
- * @return Returns a String
- */
- public String getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- public String getFileName() {
- return fileName;
- }
-
- public void registerError() {
- this.hasErrors = true;
- }
-
- public boolean hasErrors() {
- return this.hasErrors;
- }
-}
diff --git a/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ResultsSummaryGenerator.java b/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ResultsSummaryGenerator.java
index 3d4b71d705ceb7e2b53866de4d079e776f9ea79d..4bac6c618c8511377ed95525beae727c1b2eca33 100644
--- a/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ResultsSummaryGenerator.java
+++ b/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/ResultsSummaryGenerator.java
@@ -10,7 +10,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.Writer;
import java.util.Arrays;
-import java.util.Enumeration;
import java.util.StringTokenizer;
import java.util.Vector;
@@ -62,7 +61,6 @@ public class ResultsSummaryGenerator extends Task {
public String testResultsWithProblems = EOL;
private DocumentBuilder parser = null;
- public ErrorTracker anErrorTracker;
public String testResultsTemplateString = "";
public String dropTemplateString = "";
@@ -110,8 +108,6 @@ public class ResultsSummaryGenerator extends Task {
// <descriptor, ie. OS name>,path to template file, path to output file
// public String platformSpecificTemplateList = "";
- // Location and name of the template drop index.php file.
- public String dropTemplateFileName;
// Name of the generated index php file.
public String testResultsHtmlFileName;
@@ -176,7 +172,6 @@ public class ResultsSummaryGenerator extends Task {
test.setTestResultsTemplateFileName("C:\\junk\\templateFiles\\testResults.php.template");
// test.setPlatformSpecificTemplateList("Windows,C:\\junk\\templateFiles\\platform.php.template,winPlatform.php;Linux,C:\\junk\\templateFiles\\platform.php.template,linPlatform.php;Solaris,C:\\junk\\templateFiles\\platform.php.template,solPlatform.php;AIX,C:\\junk\\templateFiles\\platform.php.template,aixPlatform.php;Macintosh,C:\\junk\\templateFiles\\platform.php.template,macPlatform.php;Source
// Build,C:\\junk\\templateFiles\\sourceBuilds.php.template,sourceBuilds.php");
- test.setDropTemplateFileName("C:\\junk\\templateFiles\\index.php.template");
test.setTestResultsHtmlFileName("testResults.php");
// test.setDropHtmlFileName("index.php");
test.setDropHtmlFileName("index.html");
@@ -191,14 +186,9 @@ public class ResultsSummaryGenerator extends Task {
public void execute() {
try {
- anErrorTracker = new ErrorTracker();
- // platformDescription = new Vector();
- // platformTemplateString = new Vector();
- // platformDropFileName = new Vector();
- anErrorTracker.loadFile(testManifestFileName);
getDropTokensFromList(dropTokenList);
testResultsTemplateString = readFile(testResultsTemplateFileName);
- dropTemplateString = readFile(dropTemplateFileName);
+ //dropTemplateString = readFile(dropTemplateFileName);
// Specific to the platform build-page
/*
@@ -232,7 +222,6 @@ public class ResultsSummaryGenerator extends Task {
// writeDropFiles();
// }
// else {
- writeDropIndexFile();
// }
}
catch (Exception e) {
@@ -433,7 +422,6 @@ public class ResultsSummaryGenerator extends Task {
File.separator, logName.indexOf("_") + 1), "*");
logName = new String(stringBuffer);
- anErrorTracker.registerError(logName);
}
formatCompileErrorRow(log, errorCount, warningCount,
forbiddenWarningCount, discouragedWarningCount, buffer);
@@ -513,7 +501,6 @@ public class ResultsSummaryGenerator extends Task {
File.separator, logName.indexOf("_") + 1), "*");
logName = new String(buffer);
- anErrorTracker.registerError(logName);
}
formatCompileErrorRow(log.replaceAll(".xml", ".html"), errorCount,
warningCount, forbiddenWarningCount, discouragedWarningCount,
@@ -649,7 +636,6 @@ public class ResultsSummaryGenerator extends Task {
}
- private int missingCount;
public boolean includeAll;
private int totalErrors;
private int totalAccess;
@@ -658,34 +644,6 @@ public class ResultsSummaryGenerator extends Task {
private int totaldiscouragedAccessWarningCount;
private int totalforbiddenAccessWarningCount;
- private String verifyAllTestsRan(String directory) {
- Enumeration enumeration = (anErrorTracker.getTestLogs()).elements();
-
- String replaceString = "";
- while (enumeration.hasMoreElements()) {
- String testLogName = enumeration.nextElement().toString();
-
- if (new File(directory + File.separator + testLogName).exists())
- continue;
-
- anErrorTracker.registerError(testLogName);
-
- String tmp = formatTestRow(testLogName, -1, -1);
- // if (missingCount == 0) {
- // replaceString = replaceString + "</table></br>" + EOL + "<table
- // width=\"65%\" border=\"1\" bgcolor=\"#EEEEEE\" rules=\"groups\"
- // align=\"center\">" + "<tr bgcolor=\"#9999CC\"> <th
- // width=\"80%\" align=\"center\"> Missing Files </th><th
- // align=\"center\"> Status </th></tr>";
- // }
- replaceString = replaceString + tmp;
- testResultsWithProblems = testResultsWithProblems.concat(EOL
- + testLogName.substring(0, testLogName.length() - 4)
- + " (file missing)");
- missingCount++;
- }
- return replaceString;
- }
private void parseUnitTestXml() throws IOException,
TransformerFactoryConfigurationError, TransformerException {
@@ -713,8 +671,6 @@ public class ResultsSummaryGenerator extends Task {
0, xmlFileNames[i].getName().length() - 4);
testResultsWithProblems = testResultsWithProblems
.concat(EOL + testName);
- anErrorTracker.registerError(fullName
- .substring(getXmlDirectoryName().length() + 1));
}
String tmp = formatTestRow(xmlFileNames[i].getPath(),
@@ -734,8 +690,6 @@ public class ResultsSummaryGenerator extends Task {
}
}
- // check for missing test logs
- replaceString = replaceString + verifyAllTestsRan(xmlDirectoryName);
String tmp = formatTestRow("TOTALS", grandTotalErrors,
grandTotalTests);
@@ -792,47 +746,6 @@ public class ResultsSummaryGenerator extends Task {
}
- private void writeDropIndexFile() {
-
- String[] types = anErrorTracker.getTypes();
- for (int i = 0; i < types.length; i++) {
- PlatformStatus[] platforms = anErrorTracker.getPlatforms(types[i]);
- String replaceString = processDropRows(platforms);
- // System.out.println("replaceString: " + replaceString);
- // System.out.println("dropTemplateString: " +
- // dropTemplateString);
- // System.out.println("dropToken: " +
- // dropTokens.get(i).toString());
- dropTemplateString = replace(dropTemplateString, dropTokens.get(i)
- .toString(), replaceString);
- }
- // Replace the token %testsStatus% with the status of the test results
- // dropTemplateString = replace(dropTemplateString, "%testsStatus%",
- // testResultsStatus);
- String outputFileName = dropDirectoryName + File.separator
- + dropHtmlFileName;
- writeFile(outputFileName, dropTemplateString);
- }
- private String processDropRows(PlatformStatus[] platforms) {
-
- String result = "";
- for (int i = 0; i < platforms.length; i++) {
- result = result + processDropRow(platforms[i]);
- }
-
- return result;
- }
-
- private String processDropRow(PlatformStatus aPlatform) {
-
- String result = "<tr>";
- result = result + aPlatform.getFileName();
-
- result = result + "</tr>" + EOL;
- // System.out.println("aPlatform: " + aPlatform.getFileName());
- // System.out.println("dropRow: " + result);
- return result;
- }
private void writeTestResultsFile() {
@@ -1222,24 +1135,7 @@ public class ResultsSummaryGenerator extends Task {
this.dropHtmlFileName = dropHtmlFileName;
}
- /**
- * Gets the dropTemplateFileName.
- *
- * @return Returns a String
- */
- public String getDropTemplateFileName() {
- return dropTemplateFileName;
- }
- /**
- * Sets the dropTemplateFileName.
- *
- * @param dropTemplateFileName
- * The dropTemplateFileName to set
- */
- public void setDropTemplateFileName(String dropTemplateFileName) {
- this.dropTemplateFileName = dropTemplateFileName;
- }
private void getDropTokensFromList(String list) {
StringTokenizer tokenizer = new StringTokenizer(list, ",");
diff --git a/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/TestResultsGenerator.java b/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/TestResultsGenerator.java
index 4a6ed6de858679c9de8ebbb7d7e54fd3f72f3ddd..fd34228f80ced466fdb0058a69191c52ffcf9fc1 100644
--- a/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/TestResultsGenerator.java
+++ b/archive/releng.builder/tools/org.eclipse.wtp.releng.tools/src/org/eclipse/wtp/releng/tools/TestResultsGenerator.java
@@ -1,6 +1,5 @@
package org.eclipse.wtp.releng.tools;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -12,13 +11,12 @@ import java.io.InputStream;
import java.util.Arrays;
import java.util.StringTokenizer;
import java.util.Vector;
-import java.util.Enumeration;
-import org.apache.tools.ant.Task;
-import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.tools.ant.Task;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
@@ -27,7 +25,6 @@ import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-
/**
* @version 1.0
* @author Dean Roberts
@@ -49,7 +46,6 @@ public class TestResultsGenerator extends Task {
public String testResultsWithProblems = "\n";
private DocumentBuilder parser = null;
- public ErrorTracker anErrorTracker;
public String testResultsTemplateString = "";
public String dropTemplateString = "";
@@ -97,9 +93,6 @@ public class TestResultsGenerator extends Task {
// <descriptor, ie. OS name>,path to template file, path to output file
public String platformSpecificTemplateList = "";
- // Location and name of the template drop index.php file.
- public String dropTemplateFileName;
-
// Name of the generated index php file.
public String testResultsHtmlFileName;
@@ -126,21 +119,24 @@ public class TestResultsGenerator extends Task {
// The four configurations, add new configurations to test results here +
// update
// testResults.php.template for changes
- private String[] testsConfig = {"linux.gtk.x86.xml", "linux.gtk.x86_5.0.xml", "macosx.carbon.ppc.xml", "win32.win32.x86.xml", "win32.win32.x86_5.0.xml"};
-
+ private String[] testsConfig = { "linux.gtk.x86.xml",
+ "linux.gtk.x86_5.0.xml", "macosx.carbon.ppc.xml",
+ "win32.win32.x86.xml", "win32.win32.x86_5.0.xml" };
public static void main(String[] args) {
TestResultsGenerator test = new TestResultsGenerator();
- test.setDropTokenList("%sdk%,%tests%,%example%,%rcpruntime%,%rcpsdk%,%icubase%,%runtime%,%platformsdk%,%jdt%,%jdtsdk%,%pde%,%pdesdk%,%cvs%,%cvssdk%,%teamextras%,%swt%,%relengtools%");
+ test
+ .setDropTokenList("%sdk%,%tests%,%example%,%rcpruntime%,%rcpsdk%,%icubase%,%runtime%,%platformsdk%,%jdt%,%jdtsdk%,%pde%,%pdesdk%,%cvs%,%cvssdk%,%teamextras%,%swt%,%relengtools%");
test.setPlatformIdentifierToken("%platform%");
test.getDropTokensFromList(test.dropTokenList);
test.setIsBuildTested(true);
test.setXmlDirectoryName("C:\\junk\\testresults\\xml");
test.setHtmlDirectoryName("C:\\junk\\testresults");
test.setDropDirectoryName("C:\\junk");
- test.setTestResultsTemplateFileName("C:\\junk\\templateFiles\\testResults.php.template");
- test.setPlatformSpecificTemplateList("Windows,C:\\junk\\templateFiles\\platform.php.template,winPlatform.php;Linux,C:\\junk\\templateFiles\\platform.php.template,linPlatform.php;Solaris,C:\\junk\\templateFiles\\platform.php.template,solPlatform.php;AIX,C:\\junk\\templateFiles\\platform.php.template,aixPlatform.php;Macintosh,C:\\junk\\templateFiles\\platform.php.template,macPlatform.php;Source Build,C:\\junk\\templateFiles\\sourceBuilds.php.template,sourceBuilds.php");
- test.setDropTemplateFileName("C:\\junk\\templateFiles\\index.php.template");
+ test
+ .setTestResultsTemplateFileName("C:\\junk\\templateFiles\\testResults.php.template");
+ test
+ .setPlatformSpecificTemplateList("Windows,C:\\junk\\templateFiles\\platform.php.template,winPlatform.php;Linux,C:\\junk\\templateFiles\\platform.php.template,linPlatform.php;Solaris,C:\\junk\\templateFiles\\platform.php.template,solPlatform.php;AIX,C:\\junk\\templateFiles\\platform.php.template,aixPlatform.php;Macintosh,C:\\junk\\templateFiles\\platform.php.template,macPlatform.php;Source Build,C:\\junk\\templateFiles\\sourceBuilds.php.template,sourceBuilds.php");
test.setTestResultsHtmlFileName("testResults.php");
// test.setDropHtmlFileName("index.php");
test.setDropHtmlFileName("index.html");
@@ -154,14 +150,13 @@ public class TestResultsGenerator extends Task {
public void execute() {
- anErrorTracker = new ErrorTracker();
platformDescription = new Vector();
platformTemplateString = new Vector();
platformDropFileName = new Vector();
- anErrorTracker.loadFile(testManifestFileName);
+ // anErrorTracker.loadFile(testManifestFileName);
getDropTokensFromList(dropTokenList);
testResultsTemplateString = readFile(testResultsTemplateFileName);
- dropTemplateString = readFile(dropTemplateFileName);
+ // dropTemplateString = readFile(dropTemplateFileName);
// Specific to the platform build-page
if (platformSpecificTemplateList != "") {
@@ -195,9 +190,6 @@ public class TestResultsGenerator extends Task {
if (platformSpecificTemplateList != "") {
writeDropFiles();
}
- else {
- writeDropIndexFile();
- }
}
public void parseCompileLogs() {
@@ -207,11 +199,13 @@ public class TestResultsGenerator extends Task {
if (replaceString.length() == 0) {
replaceString.append("None");
}
- testResultsTemplateString = replace(testResultsTemplateString, compileLogsToken, String.valueOf(replaceString));
+ testResultsTemplateString = replace(testResultsTemplateString,
+ compileLogsToken, String.valueOf(replaceString));
}
- private void processCompileLogsDirectory(String directoryName, StringBuffer buffer) {
+ private void processCompileLogsDirectory(String directoryName,
+ StringBuffer buffer) {
File sourceDirectory = new File(directoryName);
if (sourceDirectory.isFile()) {
if (sourceDirectory.getName().endsWith(".log"))
@@ -223,7 +217,8 @@ public class TestResultsGenerator extends Task {
File[] logFiles = sourceDirectory.listFiles();
Arrays.sort(logFiles);
for (int j = 0; j < logFiles.length; j++) {
- processCompileLogsDirectory(logFiles[j].getAbsolutePath(), buffer);
+ processCompileLogsDirectory(logFiles[j].getAbsolutePath(),
+ buffer);
}
}
}
@@ -237,14 +232,16 @@ public class TestResultsGenerator extends Task {
int discouragedWarningCount = countDiscouragedWarnings(fileContents);
if (errorCount != 0) {
// use wildcard in place of version number on directory names
- String logName = log.substring(getCompileLogsDirectoryName().length() + 1);
+ String logName = log.substring(getCompileLogsDirectoryName()
+ .length() + 1);
StringBuffer stringBuffer = new StringBuffer(logName);
- stringBuffer.replace(logName.indexOf("_") + 1, logName.indexOf(File.separator, logName.indexOf("_") + 1), "*");
+ stringBuffer.replace(logName.indexOf("_") + 1, logName.indexOf(
+ File.separator, logName.indexOf("_") + 1), "*");
logName = new String(stringBuffer);
- anErrorTracker.registerError(logName);
}
- formatCompileErrorRow(log, errorCount, warningCount, forbiddenWarningCount, discouragedWarningCount, buffer);
+ formatCompileErrorRow(log, errorCount, warningCount,
+ forbiddenWarningCount, discouragedWarningCount, buffer);
}
private void parseCompileLog(String log, StringBuffer stringBuffer) {
@@ -259,25 +256,21 @@ public class TestResultsGenerator extends Task {
try {
reader = new BufferedReader(new FileReader(file));
InputSource inputSource = new InputSource(reader);
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory factory = DocumentBuilderFactory
+ .newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
aDocument = builder.parse(inputSource);
- }
- catch (SAXException e) {
+ } catch (SAXException e) {
e.printStackTrace();
- }
- catch (IOException e) {
+ } catch (IOException e) {
e.printStackTrace();
- }
- catch (ParserConfigurationException e) {
+ } catch (ParserConfigurationException e) {
e.printStackTrace();
- }
- finally {
+ } finally {
if (reader != null) {
try {
reader.close();
- }
- catch (IOException e) {
+ } catch (IOException e) {
// ignore
}
}
@@ -304,15 +297,12 @@ public class TestResultsGenerator extends Task {
String nodeValue = idNode.getNodeValue();
if (ForbiddenReferenceID.equals(nodeValue)) {
forbiddenWarningCount++;
- }
- else if (DiscouragedReferenceID.equals(nodeValue)) {
+ } else if (DiscouragedReferenceID.equals(nodeValue)) {
discouragedWarningCount++;
- }
- else {
+ } else {
warningCount++;
}
- }
- else if (ERROR_SEVERITY.equals(severityNodeValue)) {
+ } else if (ERROR_SEVERITY.equals(severityNodeValue)) {
// this is an error
errorCount++;
}
@@ -321,14 +311,17 @@ public class TestResultsGenerator extends Task {
if (errorCount != 0) {
// use wildcard in place of version number on directory names
// System.out.println(log + "/n");
- String logName = log.substring(getCompileLogsDirectoryName().length() + 1);
+ String logName = log.substring(getCompileLogsDirectoryName()
+ .length() + 1);
StringBuffer buffer = new StringBuffer(logName);
- buffer.replace(logName.indexOf("_") + 1, logName.indexOf(File.separator, logName.indexOf("_") + 1), "*");
+ buffer.replace(logName.indexOf("_") + 1, logName.indexOf(
+ File.separator, logName.indexOf("_") + 1), "*");
logName = new String(buffer);
- anErrorTracker.registerError(logName);
}
- formatCompileErrorRow(log.replaceAll(".xml", ".html"), errorCount, warningCount, forbiddenWarningCount, discouragedWarningCount, stringBuffer);
+ formatCompileErrorRow(log.replaceAll(".xml", ".html"), errorCount,
+ warningCount, forbiddenWarningCount, discouragedWarningCount,
+ stringBuffer);
}
public static byte[] getFileByteContent(String fileName) throws IOException {
@@ -337,13 +330,11 @@ public class TestResultsGenerator extends Task {
File file = new File(fileName);
stream = new FileInputStream(file);
return getInputStreamAsByteArray(stream, (int) file.length());
- }
- finally {
+ } finally {
if (stream != null) {
try {
stream.close();
- }
- catch (IOException e) {
+ } catch (IOException e) {
// ignore
}
}
@@ -351,47 +342,51 @@ public class TestResultsGenerator extends Task {
}
/**
- * Returns the given input stream's contents as a byte array. If a length
- * is specified (ie. if length != -1), only length bytes are returned.
+ * Returns the given input stream's contents as a byte array. If a length is
+ * specified (ie. if length != -1), only length bytes are returned.
* Otherwise all bytes in the stream are returned. Note this doesn't close
* the stream.
*
* @throws IOException
* if a problem occured reading the stream.
*/
- public static byte[] getInputStreamAsByteArray(InputStream stream, int length) throws IOException {
+ public static byte[] getInputStreamAsByteArray(InputStream stream,
+ int length) throws IOException {
byte[] contents;
if (length == -1) {
contents = new byte[0];
int contentsLength = 0;
int amountRead = -1;
do {
- int amountRequested = Math.max(stream.available(), DEFAULT_READING_SIZE); // read
- // at
- // least
- // 8K
+ int amountRequested = Math.max(stream.available(),
+ DEFAULT_READING_SIZE); // read
+ // at
+ // least
+ // 8K
// resize contents if needed
if (contentsLength + amountRequested > contents.length) {
- System.arraycopy(contents, 0, contents = new byte[contentsLength + amountRequested], 0, contentsLength);
+ System.arraycopy(contents, 0,
+ contents = new byte[contentsLength
+ + amountRequested], 0, contentsLength);
}
// read as many bytes as possible
- amountRead = stream.read(contents, contentsLength, amountRequested);
+ amountRead = stream.read(contents, contentsLength,
+ amountRequested);
if (amountRead > 0) {
// remember length of contents
contentsLength += amountRead;
}
- }
- while (amountRead != -1);
+ } while (amountRead != -1);
// resize contents if necessary
if (contentsLength < contents.length) {
- System.arraycopy(contents, 0, contents = new byte[contentsLength], 0, contentsLength);
+ System.arraycopy(contents, 0,
+ contents = new byte[contentsLength], 0, contentsLength);
}
- }
- else {
+ } else {
contents = new byte[length];
int len = 0;
int readSize = 0;
@@ -411,8 +406,7 @@ public class TestResultsGenerator extends Task {
byte[] aByteArray = null;
try {
aByteArray = getFileByteContent(fileName);
- }
- catch (IOException e) {
+ } catch (IOException e) {
e.printStackTrace();
}
if (aByteArray == null) {
@@ -444,45 +438,22 @@ public class TestResultsGenerator extends Task {
}
int startIndex = endIndex;
- while (startIndex >= 0 && aString.charAt(startIndex) != '(' && aString.charAt(startIndex) != ',') {
+ while (startIndex >= 0 && aString.charAt(startIndex) != '('
+ && aString.charAt(startIndex) != ',') {
startIndex--;
}
String count = aString.substring(startIndex + 1, endIndex).trim();
try {
return Integer.parseInt(count);
- }
- catch (NumberFormatException e) {
+ } catch (NumberFormatException e) {
return 0;
}
}
- private int missingCount = 0;
private boolean includeAll;
- private String verifyAllTestsRan(String directory) {
- Enumeration enumeration = (anErrorTracker.getTestLogs()).elements();
-
- String replaceString = "";
- while (enumeration.hasMoreElements()) {
- String testLogName = enumeration.nextElement().toString();
-
- if (new File(directory + File.separator + testLogName).exists())
- continue;
-
- anErrorTracker.registerError(testLogName);
- String tmp = ((platformSpecificTemplateList == "") ? formatRow(testLogName, -1, false) : formatRowReleng(testLogName, -1, false));
- if (missingCount == 0) {
- replaceString = replaceString + "</table></br>" + "\n" + "<table width=\"65%\" border=\"1\" bgcolor=\"#EEEEEE\" rules=\"groups\" align=\"center\">" + "<tr bgcolor=\"#9999CC\"> <th width=\"80%\" align=\"center\"> Missing Files </th><th align=\"center\"> Status </th></tr>";
- }
- replaceString = replaceString + tmp;
- testResultsWithProblems = testResultsWithProblems.concat("\n" + testLogName.substring(0, testLogName.length() - 4) + " (file missing)");
- missingCount++;
- }
- return replaceString;
- }
-
public void parseXml() {
File sourceDirectory = new File(xmlDirectoryName);
@@ -499,28 +470,29 @@ public class TestResultsGenerator extends Task {
String fullName = xmlFileNames[i].getPath();
int errorCount = countErrors(fullName);
if (errorCount != 0) {
- String testName = xmlFileNames[i].getName().substring(0, xmlFileNames[i].getName().length() - 4);
- testResultsWithProblems = testResultsWithProblems.concat("\n" + testName);
- anErrorTracker.registerError(fullName.substring(getXmlDirectoryName().length() + 1));
+ String testName = xmlFileNames[i].getName().substring(
+ 0, xmlFileNames[i].getName().length() - 4);
+ testResultsWithProblems = testResultsWithProblems
+ .concat("\n" + testName);
}
-
- String tmp = ((platformSpecificTemplateList == "") ? formatRow(xmlFileNames[i].getPath(), errorCount, true) : formatRowReleng(xmlFileNames[i].getPath(), errorCount, true));
+ String tmp = ((platformSpecificTemplateList == "") ? formatRow(
+ xmlFileNames[i].getPath(), errorCount, true)
+ : formatRowReleng(xmlFileNames[i].getPath(),
+ errorCount, true));
replaceString = replaceString + tmp;
-
}
}
- // check for missing test logs
- replaceString = replaceString + verifyAllTestsRan(xmlDirectoryName);
- testResultsTemplateString = replace(testResultsTemplateString, testResultsToken, replaceString);
+ testResultsTemplateString = replace(testResultsTemplateString,
+ testResultsToken, replaceString);
testsRan = true;
- }
- else {
+ } else {
testsRan = false;
- System.out.println("Test results not found in " + sourceDirectory.getAbsolutePath());
+ System.out.println("Test results not found in "
+ + sourceDirectory.getAbsolutePath());
}
}
@@ -531,10 +503,10 @@ public class TestResultsGenerator extends Task {
if (replaceIndex > -1) {
String resultString = source.substring(0, replaceIndex);
resultString = resultString + replacement;
- resultString = resultString + source.substring(replaceIndex + original.length());
+ resultString = resultString
+ + source.substring(replaceIndex + original.length());
return resultString;
- }
- else {
+ } else {
System.out.println("Could not find token: " + original);
return source;
}
@@ -542,143 +514,32 @@ public class TestResultsGenerator extends Task {
}
protected void writeDropFiles() {
- writeDropIndexFile();
// Write all the platform files
for (int i = 0; i < platformDescription.size(); i++) {
- writePlatformFile(platformDescription.get(i).toString(), platformTemplateString.get(i).toString(), platformDropFileName.get(i).toString());
- }
- }
-
- protected void writeDropIndexFile() {
-
- String[] types = anErrorTracker.getTypes();
- for (int i = 0; i < types.length; i++) {
- PlatformStatus[] platforms = anErrorTracker.getPlatforms(types[i]);
- String replaceString = processDropRows(platforms);
- dropTemplateString = replace(dropTemplateString, dropTokens.get(i).toString(), replaceString);
+ writePlatformFile(platformDescription.get(i).toString(),
+ platformTemplateString.get(i).toString(),
+ platformDropFileName.get(i).toString());
}
- // Replace the token %testsStatus% with the status of the test results
- dropTemplateString = replace(dropTemplateString, "%testsStatus%", testResultsStatus);
- String outputFileName = dropDirectoryName + File.separator + dropHtmlFileName;
- writeFile(outputFileName, dropTemplateString);
}
// Writes the platform file (dropFileName) specific to "desiredPlatform"
- protected void writePlatformFile(String desiredPlatform, String templateString, String dropFileName) {
-
- String[] types = anErrorTracker.getTypes();
- for (int i = 0; i < types.length; i++) {
- PlatformStatus[] platforms = anErrorTracker.getPlatforms(types[i]);
- // Call processPlatformDropRows passing the platform's name
- String replaceString = processPlatformDropRows(platforms, desiredPlatform);
- templateString = replace(templateString, dropTokens.get(i).toString(), replaceString);
- }
- // Replace the platformIdentifierToken with the platform's name and
- // the testsStatus
- // token with the status of the test results
- templateString = replace(templateString, platformIdentifierToken, desiredPlatform);
- templateString = replace(templateString, "%testsStatus%", testResultsStatus);
- String outputFileName = dropDirectoryName + File.separator + dropFileName;
+ private void writePlatformFile(String desiredPlatform,
+ String templateString, String dropFileName) {
+
+ templateString = replace(templateString, platformIdentifierToken,
+ desiredPlatform);
+ templateString = replace(templateString, "%testsStatus%",
+ testResultsStatus);
+ String outputFileName = dropDirectoryName + File.separator
+ + dropFileName;
writeFile(outputFileName, templateString);
}
- // Process drop rows specific to each of the platforms
- protected String processPlatformDropRows(PlatformStatus[] platforms, String name) {
-
- String result = "";
- boolean found = false;
- for (int i = 0; i < platforms.length; i++) {
- // If the platform description indicates the platform's name, or
- // "All",
- // call processDropRow
- if (platforms[i].getName().startsWith(name.substring(0, 3)) || platforms[i].getName().equals("All")) {
- result = result + processDropRow(platforms[i]);
- found = true;
- }
- // If the platform description indicates "All Other Platforms",
- // process
- // the row locally
- else if (platforms[i].getName().equals("All Other Platforms") && !found) {
- String imageName = "";
-
- if (platforms[i].hasErrors()) {
- imageName = "<a href=\"" + getTestResultsHtmlFileName() + "\"><img src = \"FAIL.gif\" width=19 height=23></a>";
- }
- else {
- if (testsRan) {
- imageName = "<img src = \"OK.gif\" width=19 height=23>";
- }
- else {
- if (isBuildTested) {
- imageName = "<font size=\"-1\" color=\"#FF0000\">pending</font>";
- }
- else {
- imageName = "<img src = \"OK.gif\" width=19 height=23>";
- }
- }
- }
-
- result = result + "<tr>";
- result = result + "<td><div align=left>" + imageName + "</div></td>\n";
- result = result + "<td>All " + name + "</td>";
- // generate ftp, http, md5 and sha1 links by calling php
- // functions in the template
- result = result + "<td><?php genLinks($_SERVER[\"SERVER_NAME\"],\"@buildlabel@\",\"" + platforms[i].getFileName() + "\"); ?></td>\n";
- result = result + "</tr>\n";
- }
- }
-
- return result;
- }
-
- protected String processDropRows(PlatformStatus[] platforms) {
-
- String result = "";
- for (int i = 0; i < platforms.length; i++) {
- result = result + processDropRow(platforms[i]);
- }
-
- return result;
- }
-
- protected String processDropRow(PlatformStatus aPlatform) {
-
- String imageName = "";
-
- if (aPlatform.hasErrors()) {
- imageName = "<a href=\"" + getTestResultsHtmlFileName() + "\"><img src = \"FAIL.gif\" width=19 height=23></a>";
- // Failure in tests
- testResultsStatus = "failed";
- }
- else {
- if (testsRan) {
- imageName = "<img src = \"OK.gif\" width=19 height=23>";
- }
- else {
- if (isBuildTested) {
- imageName = "<font size=\"-1\" color=\"#FF0000\">pending</font>";
- // Tests are pending
- testResultsStatus = "pending";
- }
- else {
- imageName = "<img src = \"OK.gif\" width=19 height=23>";
- }
- }
- }
-
- String result = "<tr>";
-
- result = result + "<td><div align=left>" + imageName + "</div></td>\n";
- result = result + "<td>" + aPlatform.getName() + "</td>";
- result = result + "<td>" + aPlatform.getFileName() + "</td>\n";
- result = result + "</tr>\n";
-
- return result;
- }
public void writeTestResultsFile() {
- String outputFileName = dropDirectoryName + File.separator + testResultsHtmlFileName;
+ String outputFileName = dropDirectoryName + File.separator
+ + testResultsHtmlFileName;
writeFile(outputFileName, testResultsTemplateString);
}
@@ -687,19 +548,16 @@ public class TestResultsGenerator extends Task {
try {
outputStream = new FileOutputStream(outputFileName);
outputStream.write(contents.getBytes());
- }
- catch (FileNotFoundException e) {
- System.out.println("File not found exception writing: " + outputFileName);
- }
- catch (IOException e) {
+ } catch (FileNotFoundException e) {
+ System.out.println("File not found exception writing: "
+ + outputFileName);
+ } catch (IOException e) {
System.out.println("IOException writing: " + outputFileName);
- }
- finally {
+ } finally {
if (outputStream != null) {
try {
outputStream.close();
- }
- catch (IOException e) {
+ } catch (IOException e) {
// ignore
}
}
@@ -746,20 +604,41 @@ public class TestResultsGenerator extends Task {
return dropDirectoryName;
}
- private void formatCompileErrorRow(String fileName, int errorCount, int warningCount, int forbiddenAccessWarningCount, int discouragedAccessWarningCount, StringBuffer buffer) {
+ private void formatCompileErrorRow(String fileName, int errorCount,
+ int warningCount, int forbiddenAccessWarningCount,
+ int discouragedAccessWarningCount, StringBuffer buffer) {
- int accessRuleWarningCount = forbiddenAccessWarningCount + discouragedAccessWarningCount;
+ int accessRuleWarningCount = forbiddenAccessWarningCount
+ + discouragedAccessWarningCount;
if (!includeAll) {
- if (errorCount == 0 && warningCount == 0 && accessRuleWarningCount == 0) {
+ if (errorCount == 0 && warningCount == 0
+ && accessRuleWarningCount == 0) {
return;
}
}
int i = fileName.indexOf(getHrefCompileLogsTargetPath());
- String shortName = fileName.substring(i + getHrefCompileLogsTargetPath().length());
-
- buffer.append("<tr>\n<td>\n").append("<a href=").append("\"").append(getHrefCompileLogsTargetPath()).append(shortName).append("\">").append(shortName).append("</a>").append("</td><td align=\"center\">").append("<a href=").append("\"").append(getHrefCompileLogsTargetPath()).append(shortName).append("#ERRORS").append("\">").append(errorCount).append("</a>").append("</td><td align=\"center\">").append("<a href=").append("\"").append(getHrefCompileLogsTargetPath()).append(shortName).append("#ACCESSRULES_WARNINGS").append("\">").append(accessRuleWarningCount).append("</a>").append("(").append(forbiddenAccessWarningCount).append("/").append(discouragedAccessWarningCount).append(")").append("</td><td align=\"center\">").append("<a href=").append("\"").append(getHrefCompileLogsTargetPath()).append(shortName).append("#OTHER_WARNINGS").append("\">").append(warningCount).append("</a>").append("</td>\n</tr>\n");
+ String shortName = fileName.substring(i
+ + getHrefCompileLogsTargetPath().length());
+
+ buffer.append("<tr>\n<td>\n").append("<a href=").append("\"").append(
+ getHrefCompileLogsTargetPath()).append(shortName).append("\">")
+ .append(shortName).append("</a>").append(
+ "</td><td align=\"center\">").append("<a href=")
+ .append("\"").append(getHrefCompileLogsTargetPath()).append(
+ shortName).append("#ERRORS").append("\">").append(
+ errorCount).append("</a>").append(
+ "</td><td align=\"center\">").append("<a href=")
+ .append("\"").append(getHrefCompileLogsTargetPath()).append(
+ shortName).append("#ACCESSRULES_WARNINGS")
+ .append("\">").append(accessRuleWarningCount).append("</a>")
+ .append("(").append(forbiddenAccessWarningCount).append("/")
+ .append(discouragedAccessWarningCount).append(")").append(
+ "</td><td align=\"center\">").append("<a href=")
+ .append("\"").append(getHrefCompileLogsTargetPath()).append(
+ shortName).append("#OTHER_WARNINGS").append("\">")
+ .append(warningCount).append("</a>").append("</td>\n</tr>\n");
}
private String formatRow(String fileName, int errorCount, boolean link) {
@@ -783,15 +662,16 @@ public class TestResultsGenerator extends Task {
else
aString = aString + "<tr><td>";
-
if (errorCount != 0) {
- displayName = "<font color=\"#ff0000\">" + displayName + "</font>";
+ displayName = "<font color=\"#ff0000\">" + displayName
+ + "</font>";
}
if (errorCount == -1) {
aString = aString.concat(displayName);
- }
- else {
- aString = aString + "<a href=" + "\"" + hrefTestResultsTargetPath + "/" + shortName + ".html" + "\">" + displayName + "</a>";
+ } else {
+ aString = aString + "<a href=" + "\""
+ + hrefTestResultsTargetPath + "/" + shortName + ".html"
+ + "\">" + displayName + "</a>";
}
if (errorCount > 0)
aString = aString + "</td><td><b>";
@@ -802,7 +682,8 @@ public class TestResultsGenerator extends Task {
aString = aString + "<font color=\"#ff0000\">DNF";
else if (errorCount > 0)
- aString = aString + "<font color=\"#ff0000\">" + String.valueOf(errorCount);
+ aString = aString + "<font color=\"#ff0000\">"
+ + String.valueOf(errorCount);
else
aString = aString + String.valueOf(errorCount);
@@ -832,7 +713,8 @@ public class TestResultsGenerator extends Task {
String aString = "";
if (!link) {
- return "<tr><td>" + fileName + "</td><td align=\"center\">" + "DNF </tr>";
+ return "<tr><td>" + fileName + "</td><td align=\"center\">"
+ + "DNF </tr>";
}
if (fileName.endsWith(".xml")) {
@@ -840,7 +722,8 @@ public class TestResultsGenerator extends Task {
int begin = fileName.lastIndexOf(File.separatorChar);
// Get org.eclipse. out of the component name
- String shortName = fileName.substring(begin + 13, fileName.indexOf('_'));
+ String shortName = fileName.substring(begin + 13, fileName
+ .indexOf('_'));
String displayName = shortName;
// If the short name does not start with this prefix
@@ -852,24 +735,28 @@ public class TestResultsGenerator extends Task {
testShortName = shortName;
counter = 0;
// Set new prefix
- prefix = shortName.substring(0, shortName.indexOf(".tests") + 6);
- aString = aString + "<tbody><tr><td><b>" + prefix + ".*" + "</b><td><td><td><td>";
+ prefix = shortName.substring(0,
+ shortName.indexOf(".tests") + 6);
+ aString = aString + "<tbody><tr><td><b>" + prefix + ".*"
+ + "</b><td><td><td><td>";
aString = aString + "<tr><td><P>" + shortName;
// Loop until the matching string postfix(test config.) is
// found
- while (counter < card && !fileName.endsWith(testsConfig[counter])) {
+ while (counter < card
+ && !fileName.endsWith(testsConfig[counter])) {
aString = aString + "<td align=\"center\">-</td>";
counter++;
}
- }
- else {
+ } else {
// Set new prefix
- prefix = shortName.substring(0, shortName.indexOf(".tests") + 6);
+ prefix = shortName.substring(0,
+ shortName.indexOf(".tests") + 6);
// Loop until the matching string postfix(test config.) is
// found
- while (counter < card && !fileName.endsWith(testsConfig[counter])) {
+ while (counter < card
+ && !fileName.endsWith(testsConfig[counter])) {
aString = aString + "<td align=\"center\">-</td>";
counter++;
}
@@ -879,7 +766,8 @@ public class TestResultsGenerator extends Task {
// since this would mean that the team has more than one
// component test
if (!shortName.endsWith("tests")) {
- aString = aString + "<tbody><tr><td><b>" + prefix + ".*" + "</b><td><td><td><td>";
+ aString = aString + "<tbody><tr><td><b>" + prefix
+ + ".*" + "</b><td><td><td><td>";
aString = aString + "<tr><td><P>" + shortName;
}
// The team has only one component test
@@ -907,15 +795,16 @@ public class TestResultsGenerator extends Task {
aString = aString + "<tr><td><P>" + shortName;
// Loop until the matching string postfix(test config.) is
// found
- while (counter < card && !fileName.endsWith(testsConfig[counter])) {
+ while (counter < card
+ && !fileName.endsWith(testsConfig[counter])) {
aString = aString + "<td align=\"center\">-</td>";
counter++;
}
- }
- else {
+ } else {
// Loop until the matching string postfix(test config.) is
// found
- while (counter < card && !fileName.endsWith(testsConfig[counter])) {
+ while (counter < card
+ && !fileName.endsWith(testsConfig[counter])) {
aString = aString + "<td align=\"center\">-</td>";
counter++;
}
@@ -926,7 +815,8 @@ public class TestResultsGenerator extends Task {
aString = aString + "<tr><td><P>" + shortName;
// Loop until the matching string postfix(test
// config.) is found
- while (counter < card && !fileName.endsWith(testsConfig[counter])) {
+ while (counter < card
+ && !fileName.endsWith(testsConfig[counter])) {
aString = aString + "<td align=\"center\">-</td>";
counter++;
}
@@ -942,18 +832,24 @@ public class TestResultsGenerator extends Task {
// Print number of errors
if (errorCount != 0) {
- displayName = "<font color=\"#ff0000\">" + "(" + String.valueOf(errorCount) + ")" + "</font>";
- }
- else {
+ displayName = "<font color=\"#ff0000\">" + "("
+ + String.valueOf(errorCount) + ")" + "</font>";
+ } else {
displayName = "(0)";
}
// Reference
if (errorCount == -1) {
aString = aString.concat(displayName);
- }
- else {
- aString = aString + "<a href=" + "\"" + hrefTestResultsTargetPath + "/" + fileName.substring(begin + 1, fileName.length() - 4) + ".html" + "\">" + displayName + "</a>";
+ } else {
+ aString = aString
+ + "<a href="
+ + "\""
+ + hrefTestResultsTargetPath
+ + "/"
+ + fileName.substring(begin + 1,
+ fileName.length() - 4) + ".html" + "\">"
+ + displayName + "</a>";
}
if (errorCount == -1)
@@ -977,7 +873,8 @@ public class TestResultsGenerator extends Task {
return -1;
try {
- DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory
+ .newInstance();
parser = docBuilderFactory.newDocumentBuilder();
Document document = parser.parse(fileName);
@@ -990,31 +887,28 @@ public class TestResultsGenerator extends Task {
Element element = (Element) elements.item(i);
NamedNodeMap attributes = element.getAttributes();
Node aNode = attributes.getNamedItem("errors");
- errorCount = errorCount + Integer.parseInt(aNode.getNodeValue());
+ errorCount = errorCount
+ + Integer.parseInt(aNode.getNodeValue());
aNode = attributes.getNamedItem("failures");
- errorCount = errorCount + Integer.parseInt(aNode.getNodeValue());
+ errorCount = errorCount
+ + Integer.parseInt(aNode.getNodeValue());
}
- }
- catch (IOException e) {
+ } catch (IOException e) {
System.out.println("IOException: " + fileName);
// e.printStackTrace();
return 0;
- }
- catch (SAXException e) {
+ } catch (SAXException e) {
System.out.println("SAXException: " + fileName);
// e.printStackTrace();
return 0;
- }
- catch (ParserConfigurationException e) {
+ } catch (ParserConfigurationException e) {
e.printStackTrace();
}
return errorCount;
}
-
-
/**
* Gets the hrefTestResultsTargetPath.
*
@@ -1110,25 +1004,6 @@ public class TestResultsGenerator extends Task {
this.dropHtmlFileName = dropHtmlFileName;
}
- /**
- * Gets the dropTemplateFileName.
- *
- * @return Returns a String
- */
- public String getDropTemplateFileName() {
- return dropTemplateFileName;
- }
-
- /**
- * Sets the dropTemplateFileName.
- *
- * @param dropTemplateFileName
- * The dropTemplateFileName to set
- */
- public void setDropTemplateFileName(String dropTemplateFileName) {
- this.dropTemplateFileName = dropTemplateFileName;
- }
-
protected void getDropTokensFromList(String list) {
StringTokenizer tokenizer = new StringTokenizer(list, ",");
dropTokens = new Vector();
@@ -1172,7 +1047,6 @@ public class TestResultsGenerator extends Task {
this.isBuildTested = isBuildTested;
}
-
/**
* @return
*/
@@ -1227,7 +1101,8 @@ public class TestResultsGenerator extends Task {
return platformSpecificTemplateList;
}
- public void setPlatformSpecificTemplateList(String platformSpecificTemplateList) {
+ public void setPlatformSpecificTemplateList(
+ String platformSpecificTemplateList) {
this.platformSpecificTemplateList = platformSpecificTemplateList;
}