From 03345e148207147f30aed881cb3e0b63912b49b8 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Tue, 23 Mar 2010 06:02:05 +0000 Subject: [PATCH] SOLR-1835: run the core tests in parallel... not perfect but a start git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/branches/newtrunk@926470 13f79535-47bb-0310-9956-ffa450edef68 --- solr/build.xml | 60 ++++- solr/common-build.xml | 1 + solr/lib/apache-ant-1.7.1.jar | 2 + solr/lib/apache-ant-junit-1.7.1.jar | 2 + .../apache/solr/SolrJUnitResultFormatter.java | 226 ++++++++++++++++++ 5 files changed, 284 insertions(+), 7 deletions(-) create mode 100644 solr/lib/apache-ant-1.7.1.jar create mode 100644 solr/lib/apache-ant-junit-1.7.1.jar create mode 100644 solr/src/test/org/apache/solr/SolrJUnitResultFormatter.java diff --git a/solr/build.xml b/solr/build.xml index b84e5d8e955..1f738933b92 100644 --- a/solr/build.xml +++ b/solr/build.xml @@ -375,8 +375,51 @@ description="Runs the core unit tests." depends="test-core, test-contrib" /> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -404,17 +447,17 @@ - + - + - + - + @@ -422,7 +465,9 @@ Tests failed! - + + + @@ -509,6 +554,7 @@ + diff --git a/solr/common-build.xml b/solr/common-build.xml index 2d6d4f7014a..9b76d7e7f2a 100644 --- a/solr/common-build.xml +++ b/solr/common-build.xml @@ -103,6 +103,7 @@ + diff --git a/solr/lib/apache-ant-1.7.1.jar b/solr/lib/apache-ant-1.7.1.jar new file mode 100644 index 00000000000..dd5604f2f70 --- /dev/null +++ b/solr/lib/apache-ant-1.7.1.jar @@ -0,0 +1,2 @@ +AnyObjectId[704717779f6d0d7eb026dc7af78a35e51adeec8b] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/lib/apache-ant-junit-1.7.1.jar b/solr/lib/apache-ant-junit-1.7.1.jar new file mode 100644 index 00000000000..26454d610e4 --- /dev/null +++ b/solr/lib/apache-ant-junit-1.7.1.jar @@ -0,0 +1,2 @@ +AnyObjectId[063cce4f940033fa6e33d3e590cf6f5051129295] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/src/test/org/apache/solr/SolrJUnitResultFormatter.java b/solr/src/test/org/apache/solr/SolrJUnitResultFormatter.java new file mode 100644 index 00000000000..f5641994b90 --- /dev/null +++ b/solr/src/test/org/apache/solr/SolrJUnitResultFormatter.java @@ -0,0 +1,226 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.solr; + +import java.io.IOException; +import java.io.OutputStream; +import java.text.NumberFormat; + +import junit.framework.AssertionFailedError; +import junit.framework.Test; + +import org.apache.tools.ant.taskdefs.optional.junit.JUnitResultFormatter; +import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest; +import org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner; +import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.StringUtils; + +/** + * Just like BriefJUnitResultFormatter "brief" bundled with ant, + * except all formatted text is buffered until the test suite is finished. + * At this point, the output is written at once in synchronized fashion. + * This way tests can run in parallel without interleaving output. + */ +public class SolrJUnitResultFormatter implements JUnitResultFormatter { + private static final double ONE_SECOND = 1000.0; + + /** Where to write the log to. */ + private OutputStream out; + + /** Formatter for timings. */ + private NumberFormat numberFormat = NumberFormat.getInstance(); + + /** Output suite has written to System.out */ + private String systemOutput = null; + + /** Output suite has written to System.err */ + private String systemError = null; + + /** Buffer output until the end of the test */ + private StringBuilder sb; + + /** Constructor for SolrJUnitResultFormatter. */ + public SolrJUnitResultFormatter() { + sb = new StringBuilder(); + } + + /** + * Sets the stream the formatter is supposed to write its results to. + * @param out the output stream to write to + */ + public void setOutput(OutputStream out) { + this.out = out; + } + + /** + * @see JUnitResultFormatter#setSystemOutput(String) + */ + /** {@inheritDoc}. */ + public void setSystemOutput(String out) { + systemOutput = out; + } + + /** + * @see JUnitResultFormatter#setSystemError(String) + */ + /** {@inheritDoc}. */ + public void setSystemError(String err) { + systemError = err; + } + + + /** + * The whole testsuite started. + * @param suite the test suite + */ + public synchronized void startTestSuite(JUnitTest suite) { + if (out == null) { + return; // Quick return - no output do nothing. + } + sb.setLength(0); + sb.append("Testsuite: "); + sb.append(suite.getName()); + sb.append(StringUtils.LINE_SEP); + } + + /** + * The whole testsuite ended. + * @param suite the test suite + */ + public synchronized void endTestSuite(JUnitTest suite) { + sb.append("Tests run: "); + sb.append(suite.runCount()); + sb.append(", Failures: "); + sb.append(suite.failureCount()); + sb.append(", Errors: "); + sb.append(suite.errorCount()); + sb.append(", Time elapsed: "); + sb.append(numberFormat.format(suite.getRunTime() / ONE_SECOND)); + sb.append(" sec"); + sb.append(StringUtils.LINE_SEP); + sb.append(StringUtils.LINE_SEP); + + // append the err and output streams to the log + if (systemOutput != null && systemOutput.length() > 0) { + sb.append("------------- Standard Output ---------------") + .append(StringUtils.LINE_SEP) + .append(systemOutput) + .append("------------- ---------------- ---------------") + .append(StringUtils.LINE_SEP); + } + + if (systemError != null && systemError.length() > 0) { + sb.append("------------- Standard Error -----------------") + .append(StringUtils.LINE_SEP) + .append(systemError) + .append("------------- ---------------- ---------------") + .append(StringUtils.LINE_SEP); + } + + if (out != null) { + try { + out.write(sb.toString().getBytes()); + out.flush(); + } catch (IOException e) { + throw new RuntimeException("unable to write results", e); + } finally { + if (out != System.out && out != System.err) { + FileUtils.close(out); + } + } + } + } + + /** + * A test started. + * @param test a test + */ + public void startTest(Test test) { + } + + /** + * A test ended. + * @param test a test + */ + public void endTest(Test test) { + } + + /** + * Interface TestListener for JUnit <= 3.4. + * + *

A Test failed. + * @param test a test + * @param t the exception thrown by the test + */ + public void addFailure(Test test, Throwable t) { + formatError("\tFAILED", test, t); + } + + /** + * Interface TestListener for JUnit > 3.4. + * + *

A Test failed. + * @param test a test + * @param t the assertion failed by the test + */ + public void addFailure(Test test, AssertionFailedError t) { + addFailure(test, (Throwable) t); + } + + /** + * A test caused an error. + * @param test a test + * @param error the error thrown by the test + */ + public void addError(Test test, Throwable error) { + formatError("\tCaused an ERROR", test, error); + } + + /** + * Format the test for printing.. + * @param test a test + * @return the formatted testname + */ + protected String formatTest(Test test) { + if (test == null) { + return "Null Test: "; + } else { + return "Testcase: " + test.toString() + ":"; + } + } + + /** + * Format an error and print it. + * @param type the type of error + * @param test the test that failed + * @param error the exception that the test threw + */ + protected synchronized void formatError(String type, Test test, + Throwable error) { + if (test != null) { + endTest(test); + } + + sb.append(formatTest(test) + type); + sb.append(error.getMessage()); + String strace = JUnitTestRunner.getFilteredTrace(error); + sb.append(strace); + sb.append(StringUtils.LINE_SEP); + } +}