- * A harness that runs a system-level command. - *
- *- * No provision is made for standard input. - *
- *- * The standard output and standard error streams are asynchronously read, so - * the sub-process will not block on full buffers. Warning: if either of these - * streams contain more data than can fit into a String, then we will have a - * problem. - *
- * - * @author jblake - */ -public class CommandRunner { - - private Integer returnCode; - private String stdOut = ""; - private String stdErr = ""; - private File workingDirectory; - - /* Gets informed of output as it arrives. Never null. */ - private final Listener listener; - - private final Map- * Parse the file of ignored tests. - *
- *- * Ignore any blank line, or any line starting with '#' or '!' - *
- *- * Each other line describes an ignored test. The line contains the suite - * name, a comma (with optional space), the test name (with optional space) - * and optionally a comment, starting with a '#'. - *
- * If the test name is an asterisk '*', then the entire suite will be - * ignored. - *- *
- */ - public IgnoredTests(File file) { - this.filePath = file.getAbsolutePath(); - - Listtrue iff all tests passed.
- */
- public boolean run() {
- boolean success;
- try {
- listener.runStarted();
- outputManager.cleanOutputDirectory();
-
- parseSuites();
- selectSuites();
-
- runSelectedSuites();
- tomcatController.cleanup();
-
- listener.runEndTime();
- outputManager.summarizeOutput(dataModel);
- success = Status.isSuccess(dataModel.getRunStatus());
- } catch (IOException e) {
- listener.runFailed(e);
- success = false;
- throw new FatalException(e);
- } catch (FatalException e) {
- listener.runFailed(e);
- success = false;
- throw e;
- } finally {
- listener.runStopped();
- outputManager.summarizeOutput(dataModel);
- }
-
- return success;
- }
-
- /**
- * Scan the suite directories in the suite files.
- */
- public void parseSuites() {
- List");
- w.println("
| ");
- w.println(" ");
- w.println("
| ");
- w.println("
| No errors or warnings | |
| ERROR | " + e + " |
| ");
- w.println(" " + outputLink(s)
- + " ");
- if (!sReason.isEmpty()) {
- // The entire class is either failed or pending or ignored.
- w.println(" " + sReason + " ");
- } else {
- // Show the individual tests.
- for (TestData t : s.getTestMap().values()) {
- String tClass = t.getStatus().getHtmlClass();
- String tReason = dataModel.getReasonForIgnoring(
- s.getName(), t.getTestName());
-
- w.println(" ");
- w.println(" " + outputLink(t));
- if (!tReason.isEmpty()) {
- w.println(" ");
- }
- }
- w.println(" " + tReason
- + " ");
- }
- w.println(" | ");
- w.println("
| Standard Output |
|---|
" + output.getStdout() - + " |
| Error Output |
|---|
" + output.getErrout() - + " |
| Suite name | Test name | " - + "Reason for ignoring |
|---|---|---|
| No tests ignored. | " - + "||
| " + suiteName + " | "); - w.println("" + testName + " | "); - w.println("" + reason + " | "); - w.println("
");
-
- Reader reader = null;
- try {
- reader = new FileReader(parms.getLogFile());
- char[] buffer = new char[4096];
- int howMany;
- while (-1 != (howMany = reader.read(buffer))) {
- w.write(buffer, 0, howMany);
- }
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-
- w.println(" ");
- w.println("");
- w.println("");
- }
-
- private String formatElapsedTime(long elapsed) {
- if (elapsed == 0) {
- return "---";
- }
-
- long elapsedSeconds = elapsed / 1000L;
- long seconds = elapsedSeconds % 60L;
- long elapsedMinutes = elapsedSeconds / 60L;
- long minutes = elapsedMinutes % 60L;
- long hours = elapsedMinutes / 60L;
-
- String elapsedTime = "";
- if (hours > 0) {
- elapsedTime += hours + "h ";
- }
- if (minutes > 0 || hours > 0) {
- elapsedTime += minutes + "m ";
- }
- elapsedTime += seconds + "s";
-
- return elapsedTime;
- }
-
- private String formatDateTime(long dateTime) {
- if (dateTime == 0) {
- return "---";
- }
-
- return dateFormat.format(new Date(dateTime));
- }
-
- private String outputLink(SuiteData s) {
- if (s.getOutputLink() == null) {
- return s.getName();
- } else {
- return "" + s.getName()
- + "";
- }
- }
-
- private String outputLink(TestData t) {
- if (t.getOutputLink() == null) {
- return t.getTestName();
- } else {
- return "" + t.getTestName()
- + "";
- }
- }
-}
diff --git a/utilities/testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner/output/SuiteResults.java b/utilities/testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner/output/SuiteResults.java
deleted file mode 100644
index b611643bd..000000000
--- a/utilities/testrunner/src/edu/cornell/mannlib/vitro/utilities/testrunner/output/SuiteResults.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.utilities.testrunner.output;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import edu.cornell.mannlib.vitro.utilities.testrunner.FileHelper;
-import edu.cornell.mannlib.vitro.utilities.testrunner.IgnoredTests;
-import edu.cornell.mannlib.vitro.utilities.testrunner.SeleniumRunnerParameters;
-import edu.cornell.mannlib.vitro.utilities.testrunner.Status;
-
-/**
- * Extract any summary information from an HTML output file, produced by a test
- * suite.
- */
-public class SuiteResults {
- /**
- * If the file doesn't contain a line that includes this pattern, it is not
- * a suite output file.
- */
- private static final Pattern TITLE_LINE_PATTERN = Pattern
- .compile(""; - - /** - * So here is the pattern to match it: - */ - private static final Pattern TEST_LINE_PATTERN = Pattern - .compile("MyTest
Each - * other line describes an ignored test. The line contains the suite name, a - * comma (with optional space), the test name (with optional space) and - * optionally a comment, starting with a '#'.
If the test name is an - * asterisk '*', then the entire suite will be ignored.
- */
-
- private static File ignoreFile;
- private static File badFile;
-
- @BeforeClass
- public static void initializeTheFile() throws IOException {
- ignoreFile = File.createTempFile("IgnoredTestsTest", "");
-
- Writer writer = new FileWriter(ignoreFile);
- try {
- writer.write(FILE_CONTENTS);
- } finally {
- writer.close();
- }
- }
-
- @BeforeClass
- public static void initializeBadFile() throws IOException {
- badFile = File.createTempFile("IgnoredTestsTest", "");
-
- Writer writer = new FileWriter(badFile);
- try {
- writer.write(BAD_CONTENTS);
- } finally {
- writer.close();
- }
- }
-
- @AfterClass
- public static void cleanup() throws IOException {
- ignoreFile.delete();
- badFile.delete();
- }
-
- private IgnoredTests ignored;
-
- @Before
- public void readTheFile() {
- ignored = new IgnoredTests(ignoreFile);
- }
-
- @Test(expected = FatalException.class)
- public void readBadFile() {
- new IgnoredTests(badFile);
- }
-
- @Test
- public void getList() {
- Set