开源软件构建与测试

_service:tar_scm:randomizedtesting.spec Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/LocalSlaveStreamHandler.java Deleted

@@ -1,296 +0,0 @@
-package com.carrotsearch.ant.tasks.junit4;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-import java.io.RandomAccessFile;
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
-import org.apache.tools.ant.taskdefs.StreamPumper;
-
-import com.carrotsearch.ant.tasks.junit4.events.BootstrapEvent;
-import com.carrotsearch.ant.tasks.junit4.events.Deserializer;
-import com.carrotsearch.ant.tasks.junit4.events.EventType;
-import com.carrotsearch.ant.tasks.junit4.events.IEvent;
-import com.carrotsearch.ant.tasks.junit4.events.IStreamEvent;
-import com.carrotsearch.ant.tasks.junit4.events.LowLevelHeartBeatEvent;
-import com.google.common.eventbus.EventBus;
-
-/**
- * Establish event passing with a subprocess and pump events to the bus.
- */
-public class LocalSlaveStreamHandler implements ExecuteStreamHandler {
-  private final EventBus eventBus;
-  private final ClassLoader refLoader;
-
-  private InputStream stdout;
-  private InputStream stderr;
-
-  /** raw input stream to the client. */
-  private OutputStream stdin;
-
-  /** character-wrapped input stream to the client. */
-  private OutputStreamWriter stdinWriter;
-
-  private final PrintStream warnStream;
-  private final TailInputStream eventStream;
-  
-  private volatile boolean stopping;
-
-  private List<Thread> pumpers = new ArrayList<>();
-
-  private final OutputStream sysout;
-  private final OutputStream syserr;
-  private final long heartbeat;
-  private final RandomAccessFile streamsBuffer;
-  private final OutputStream streamsBufferWrapper;
-
-  public LocalSlaveStreamHandler(
-      EventBus eventBus, ClassLoader classLoader, PrintStream warnStream, TailInputStream eventStream,
-      OutputStream sysout, OutputStream syserr, long heartbeat, final RandomAccessFile streamsBuffer) {
-    this.eventBus = eventBus;
-    this.warnStream = warnStream;
-    this.refLoader = classLoader;
-    this.eventStream = eventStream;
-    this.sysout = sysout;
-    this.syserr = syserr;
-    this.heartbeat = heartbeat;
-    this.streamsBuffer = streamsBuffer;
-    this.streamsBufferWrapper = new OutputStream() {
-      @Override
-      public void write(int b) throws IOException {
-        streamsBuffer.write(b);
-      }
-
-      @Override
-      public void write(byte b) throws IOException {
-        streamsBuffer.write(b, 0, b.length);
-      }
-
-      @Override
-      public void write(byte b, int off, int len) throws IOException {
-        streamsBuffer.write(b, off, len);
-      }
-    };
-  }
-
-  @Override
-  public void setProcessErrorStream(InputStream is) throws IOException {
-    this.stderr = is;
-  }
-  
-  @Override
-  public void setProcessOutputStream(InputStream is) throws IOException {
-    this.stdout = is;
-  }
-
-  @Override
-  public void setProcessInputStream(OutputStream os) throws IOException {
-    this.stdin = os;
-  }
-
-  /**
-   * A timestamp of last received event (GH-106).
-   */
-  private volatile Long lastActivity;
-  
-  /**
-   * Watchdog thread if heartbeat is to be measured.
-   */
-  private Thread watchdog;
-  
-  /**
-   * Client charset extracted from {@link BootstrapEvent}.
-   */
-  private Charset clientCharset;
-
-  @Override
-  public void start() throws IOException {
-    lastActivity = System.currentTimeMillis();
-
-    pumpers.add(new Thread(new SimpleStreamPumper(stdout, sysout), "pumper-stdout"));
-    pumpers.add(new Thread(new SimpleStreamPumper(stderr, syserr), "pumper-stderr"));
-    pumpers.add(new Thread("pumper-events") {
-      public void run() {
-        pumpEvents(eventStream);
-      }
-    });
-
-    if (heartbeat > 0) {
-      pumpers.add(watchdog = new Thread("pumper-watchdog") {
-        public void run() {
-          final long heartbeatMillis = TimeUnit.SECONDS.toMillis(heartbeat);
-          final long HEARTBEAT = Math.max(500, heartbeatMillis / 5);
-          final long HEARTBEAT_EVENT_THRESHOLD = heartbeatMillis;
-          try {
-            long lastObservedUpdate = lastActivity;
-            long reportDeadline = lastObservedUpdate + HEARTBEAT_EVENT_THRESHOLD; 
-            while (true) {
-              Thread.sleep(HEARTBEAT);
-  
-              Long last = lastActivity;
-              if (last == null) {
-                break; // terminated.
-              }
-  
-              if (last != lastObservedUpdate) {
-                lastObservedUpdate = last;
-                reportDeadline = last + HEARTBEAT_EVENT_THRESHOLD;
-              } else {
-                final long current = System.currentTimeMillis();
-                if (current >= reportDeadline) {
-                  eventBus.post(new LowLevelHeartBeatEvent(last, current));
-                  reportDeadline = System.currentTimeMillis() + HEARTBEAT_EVENT_THRESHOLD;
-                }
-              }
-            }
-          } catch (InterruptedException e ) {
-            // terminate on interrupt.
-          }
-        }
-      });
-    }
-
-    // Start all pumper threads.
-    UncaughtExceptionHandler handler = new UncaughtExceptionHandler() {
-      public void uncaughtException(Thread t, Throwable e) {
-        warnStream.println("Unhandled exception in thread: " + t);
-        e.printStackTrace(warnStream);
-      }
-    };
-
-    for (Thread t : pumpers) {
-      t.setUncaughtExceptionHandler(handler);
-      t.setDaemon(true);
-      t.start();
-    }
-  }
-
-  private static class OnDiskStreamEvent implements IEvent, IStreamEvent {
-    private final RandomAccessFile bufferFile;
-    private long start;
-    private long end;
-    private EventType type;
-
-    public OnDiskStreamEvent(EventType type, RandomAccessFile streamsBuffer, long start, long end) {
-      this.bufferFile = streamsBuffer;
-      this.start = start;
-      this.end = end;
-      this.type = type;
-    }
-
-    @Override
-    public EventType getType() {
-      return type;
-    }
-
-    @Override
-    public void copyTo(OutputStream os) throws IOException {
-      final long restorePosition = bufferFile.getFilePointer();
-      bufferFile.seek(start);
-      try {
-        long length = end - start;

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/SlaveIdle.java Deleted

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/slave Deleted

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/slave/BeforeAfterRunListenerDecorator.java Deleted

@@ -1,86 +0,0 @@
-package com.carrotsearch.ant.tasks.junit4.slave;
-
-import java.lang.reflect.Proxy;
-
-import org.junit.runner.Description;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-import org.junit.runner.notification.RunListener;
-
-/**
- * {@link RunListener} decorator that does something before and after a given method call.
- * A fancier impl. could use a {@link Proxy} but {@link RunListener} is not an interface.
- */
-public abstract class BeforeAfterRunListenerDecorator extends RunListener {
-  private final RunListener delegate;
-
-  public BeforeAfterRunListenerDecorator(RunListener delegate) {
-    this.delegate = delegate;
-  }
-
-  public final void testRunStarted(Description description) throws Exception {
-    before();
-    try {
-      delegate.testRunStarted(description);
-    } finally {
-      after();
-    }
-  }
-
-  public final void testRunFinished(Result result) throws Exception {
-    before();
-    try {
-      delegate.testRunFinished(result);
-    } finally {
-      after();
-    }
-  }
-
-  public final void testStarted(Description description) throws Exception {
-    before();
-    try {
-      delegate.testStarted(description);
-    } finally {
-      after();
-    }
-  }
-
-  public final void testFinished(Description description) throws Exception {
-    before();
-    try {
-      delegate.testFinished(description);
-    } finally {
-      after();
-    }
-  }
-
-  public final void testFailure(Failure failure) throws Exception {
-    before();
-    try {
-      delegate.testFailure(failure);
-    } finally {
-      after();
-    }
-  }
-
-  public final void testAssumptionFailure(Failure failure) {
-    before();
-    try {
-      delegate.testAssumptionFailure(failure);
-    } finally {
-      after();
-    }
-  }
-
-  public final void testIgnored(Description description) throws Exception {
-    before();
-    try {
-      delegate.testIgnored(description);
-    } finally {
-      after();
-    }
-  }
-
-  protected void after() {}
-  protected void before() {}  
-}

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/slave/EventsOutputStream.java Deleted

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/slave/JvmExit.java Deleted

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/slave/NoExceptionRunListenerDecorator.java Deleted

@@ -1,78 +0,0 @@
-package com.carrotsearch.ant.tasks.junit4.slave;
-
-import java.lang.reflect.Proxy;
-
-import org.junit.runner.Description;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-import org.junit.runner.notification.RunListener;
-
-/**
- * {@link RunListener} decorator that does something before and after a given method call.
- * A fancier impl. could use a {@link Proxy} but {@link RunListener} is not an interface.
- */
-public abstract class NoExceptionRunListenerDecorator extends RunListener {
-  private final RunListener delegate;
-  
-  public NoExceptionRunListenerDecorator(RunListener delegate) {
-    this.delegate = delegate;
-  }
-
-  public final void testRunStarted(Description description) throws Exception {
-    try {
-      delegate.testRunStarted(description);
-    } catch (Throwable t) {
-      exception(t);
-    }
-  }
-
-  public final void testRunFinished(Result result) throws Exception {
-    try {
-      delegate.testRunFinished(result);
-    } catch (Throwable t) {
-      exception(t);
-    }
-  }
-
-  public final void testStarted(Description description) throws Exception {
-    try {
-      delegate.testStarted(description);
-    } catch (Throwable t) {
-      exception(t);
-    }
-  }
-
-  public final void testFinished(Description description) throws Exception {
-    try {
-      delegate.testFinished(description);
-    } catch (Throwable t) {
-      exception(t);
-    }
-  }
-
-  public final void testFailure(Failure failure) throws Exception {
-    try {
-      delegate.testFailure(failure);
-    } catch (Throwable t) {
-      exception(t);
-    }
-  }
-
-  public final void testAssumptionFailure(Failure failure) {
-    try {
-      delegate.testAssumptionFailure(failure);
-    } catch (Throwable t) {
-      exception(t);
-    }
-  }
-
-  public final void testIgnored(Description description) throws Exception {
-    try {
-      delegate.testIgnored(description);
-    } catch (Throwable t) {
-      exception(t);
-    }
-  }
-
-  protected abstract void exception(Throwable t);
-}

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/slave/NullWriter.java Deleted

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/slave/OrderedRunNotifier.java Deleted

@@ -1,194 +0,0 @@
-package com.carrotsearch.ant.tasks.junit4.slave;
-
-import java.util.*;
-
-import org.junit.internal.AssumptionViolatedException;
-import org.junit.runner.Description;
-import org.junit.runner.Result;
-import org.junit.runner.notification.*;
-
-public class OrderedRunNotifier extends RunNotifier {
-  /**
-   * A linked list is more convenient for descending iterators. 
-   */
-  private final LinkedList<RunListener> listeners = new LinkedList<RunListener>();
-  private volatile boolean stopRequested = false;
-
-  /**
-   * Add a listener at the end of the listener list.
-   */
-  public void addListener(RunListener listener) {
-    synchronized (listeners) {
-      listeners.add(listener);
-    }
-  }
-  
-  /**
-   * Adds a listener at the head of the listener list.
-   */
-  public void addFirstListener(RunListener listener) {
-    synchronized (listeners) {
-      listeners.addFirst(listener);
-    }
-  }
-
-  /**
-   * Remove a listener from the listener list.
-   */
-  public void removeListener(RunListener listener) {
-    synchronized (listeners) {
-      listeners.remove(listener);
-    }
-  }
-  
-  /**
-   * Notify listeners in the requested order
-   */
-  private abstract class SafeNotifier {
-    void run() {
-      run(false);
-    }
-
-    void run(boolean reversedOrder) {
-      synchronized (listeners) {
-        final Iterator<RunListener> i;
-        if (reversedOrder) {
-          i = listeners.descendingIterator();
-        } else {
-          i = listeners.iterator();
-        }
-
-        while (i.hasNext()) {
-          try {
-            notifyListener(i.next());
-          } catch (Exception e) {
-            i.remove(); // Remove the offending listener.
-            fireTestFailure(new Failure(Description.TEST_MECHANISM, e));
-          }
-        }
-      }
-    }
-
-    abstract protected void notifyListener(RunListener each) throws Exception;
-  }
-
-  /**
-   * Do not invoke.
-   */
-  public void fireTestRunStarted(final Description description) {
-    new SafeNotifier() {
-      @Override
-      protected void notifyListener(RunListener each) throws Exception {
-        each.testRunStarted(description);
-      };
-    }.run();
-  }
-  
-  /**
-   * Do not invoke.
-   */
-  public void fireTestRunFinished(final Result result) {
-    new SafeNotifier() {
-      @Override
-      protected void notifyListener(RunListener each) throws Exception {
-        each.testRunFinished(result);
-      };
-    }.run(true);
-  }
-  
-  /**
-   * Invoke to tell listeners that an atomic test is about to start.
-   * 
-   * @param description
-   *          the description of the atomic test (generally a class and method
-   *          name)
-   * @throws StoppedByUserException
-   *           thrown if a user has requested that the test run stop
-   */
-  public void fireTestStarted(final Description description) throws StoppedByUserException {
-    if (stopRequested) throw new StoppedByUserException();
-
-    new SafeNotifier() {
-      @Override
-      protected void notifyListener(RunListener each) throws Exception {
-        each.testStarted(description);
-      };
-    }.run();
-  }
-  
-  /**
-   * Invoke to tell listeners that an atomic test failed.
-   * 
-   * @param failure
-   *          the description of the test that failed and the exception thrown
-   */
-  public void fireTestFailure(final Failure failure) {
-    new SafeNotifier() {
-      @Override
-      protected void notifyListener(RunListener each) throws Exception {
-        each.testFailure(failure);
-      };
-    }.run(true);
-  }
-  
-  /**
-   * Invoke to tell listeners that an atomic test flagged that it assumed
-   * something false.
-   * 
-   * @param failure
-   *          the description of the test that failed and the
-   *          {@link AssumptionViolatedException} thrown
-   */
-  public void fireTestAssumptionFailed(final Failure failure) {
-    new SafeNotifier() {
-      @Override
-      protected void notifyListener(RunListener each) throws Exception {
-        each.testAssumptionFailure(failure);
-      };
-    }.run(true);
-  }
-  
-  /**
-   * Invoke to tell listeners that an atomic test was ignored.
-   * 
-   * @param description
-   *          the description of the ignored test
-   */
-  public void fireTestIgnored(final Description description) {
-    new SafeNotifier() {
-      @Override
-      protected void notifyListener(RunListener each) throws Exception {
-        each.testIgnored(description);
-      }
-    }.run(true);
-  }
-  
-  /**
-   * Invoke to tell listeners that an atomic test finished. Always invoke
-   * {@link #fireTestFinished(Description)} if you invoke
-   * {@link #fireTestStarted(Description)} as listeners are likely to expect
-   * them to come in pairs.
-   * 
-   * @param description
-   *          the description of the test that finished
-   */
-  public void fireTestFinished(final Description description) {
-    new SafeNotifier() {
-      @Override
-      protected void notifyListener(RunListener each) throws Exception {
-        each.testFinished(description);
-      };
-    }.run(true);
-  }
-  
-  /**
-   * Ask that the tests run stop before starting the next test. Phrased politely
-   * because the test currently running will not be interrupted. It seems a
-   * little odd to put this functionality here, but the <code>RunNotifier</code>
-   * is the only object guaranteed to be shared amongst the many runners
-   * involved.
-   */
-  public void pleaseStop() {
-    stopRequested = true;
-  }
-}

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/slave/RunListenerEmitter.java Deleted

@@ -1,123 +0,0 @@
-package com.carrotsearch.ant.tasks.junit4.slave;
-
-import java.io.IOException;
-
-import org.junit.Ignore;
-import org.junit.runner.Description;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-import org.junit.runner.notification.RunListener;
-
-import com.carrotsearch.ant.tasks.junit4.events.*;
-
-/**
- * Serialize test execution events. Attempts to handle
- * certain corner cases that are not cleanly handled by
- * JUnit itself (reporting the cause of ignored methods, 
- * etc.).
- */
-public class RunListenerEmitter extends RunListener {
-  private final Serializer serializer;
-  private Description suiteDescription;
-  private long start;
-  private long suiteStart;
-
-  /** 
-   * A failure signaled at the suite level. Most likely will result
-   * in ignored methods.
-   */
-  private Failure suiteAssumption;
-
-  public RunListenerEmitter(Serializer serializer) {
-    this.serializer = serializer;
-  }
-
-  @Override
-  public void testRunStarted(Description description) throws Exception {
-    this.suiteDescription = description;
-    this.suiteStart = System.currentTimeMillis();
-    this.suiteAssumption = null;
-    serializer.serialize(new SuiteStartedEvent(description, suiteStart));
-  }
-
-  @Override
-  public void testStarted(Description description) throws Exception {
-    serializer.serialize(new TestStartedEvent(description));
-    start = System.currentTimeMillis();
-  }
-
-  @Override
-  public void testFailure(Failure failure) throws Exception {
-    if (suiteDescription.equals(failure.getDescription())) {
-      serializer.serialize(new SuiteFailureEvent(failure));
-    } else {
-      serializer.serialize(new TestFailureEvent(failure));
-    }
-  }
-
-  @Override
-  public void testAssumptionFailure(Failure failure) {
-    try {
-      // Check for class-level assumption failures that may result
-      // in message-less ignored tests. See GH-103. 
-      if (suiteDescription != null && 
-          suiteDescription.equals(failure.getDescription())) {
-        suiteAssumption = failure;
-      }
-
-      serializer.serialize(new TestIgnoredAssumptionEvent(failure));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  @Override
-  public void testIgnored(Description description) throws Exception {
-    if (suiteDescription.equals(description)) {
-      // JUnitCore has built-in precedence of runners and handles @Ignore
-      // with a different runner, regardless of what is declared in @RunWith. This is
-      // bad.
-    } else {
-      // GH-82: try to determine the reason why the test has been ignored and populate
-      // the cause message. This really should be passed from the runner but the API does
-      // not allow it.
-      String cause = "Unknown reason for ignore status.";
-      
-      // GH-103: check suite-level assumptions.
-      if (suiteAssumption != null) {
-        String msg = suiteAssumption.getMessage();
-        cause = (msg != null ? msg : "Class assumption-ignored.");
-      }
-
-      try {
-        Ignore ignoreAnn = description.getAnnotation(Ignore.class);
-        if ((ignoreAnn = description.getAnnotation(Ignore.class)) != null) {
-          cause = "Annotated @Ignore(" + ignoreAnn.value() + ")"; 
-        } else {
-          // Try class.
-          ignoreAnn = description.getTestClass().getAnnotation(Ignore.class);
-          if (ignoreAnn != null) {
-            cause = "Class annotated @Ignore(" + ignoreAnn.value() + ")";
-          }
-        }
-      } catch (Throwable t) {
-        // Never fail on this.
-      }
-      serializer.serialize(new TestIgnoredEvent(description, cause));
-    }
-  }
-
-  @Override
-  public void testFinished(Description description) throws Exception {
-    long executionTime = System.currentTimeMillis() - start;
-    serializer.serialize(new TestFinishedEvent(description, executionTime, start));
-  }
-
-  @Override
-  public void testRunFinished(Result result) throws Exception {
-    suiteAssumption = null;
-    final long duration = System.currentTimeMillis() - suiteStart;
-    serializer.serialize(
-        new SuiteCompletedEvent(suiteDescription, suiteStart, duration));
-  }  
-}

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/slave/SlaveMain.java Deleted

@@ -1,553 +0,0 @@
-package com.carrotsearch.ant.tasks.junit4.slave;
-
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-import java.io.RandomAccessFile;
-import java.io.Writer;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import com.carrotsearch.randomizedtesting.RandomizedRunner;
-import org.junit.runner.Description;
-import org.junit.runner.Request;
-import org.junit.runner.Result;
-import org.junit.runner.Runner;
-import org.junit.runner.manipulation.Filter;
-import org.junit.runner.manipulation.NoTestsRemainException;
-import org.junit.runner.notification.Failure;
-import org.junit.runner.notification.RunListener;
-import org.junit.runner.notification.RunNotifier;
-
-import com.carrotsearch.ant.tasks.junit4.events.AppendStdErrEvent;
-import com.carrotsearch.ant.tasks.junit4.events.AppendStdOutEvent;
-import com.carrotsearch.ant.tasks.junit4.events.BootstrapEvent;
-import com.carrotsearch.ant.tasks.junit4.events.Serializer;
-import com.carrotsearch.ant.tasks.junit4.events.SuiteFailureEvent;
-import com.carrotsearch.randomizedtesting.MethodGlobFilter;
-import com.carrotsearch.randomizedtesting.SysGlobals;
-import com.carrotsearch.randomizedtesting.annotations.SuppressForbidden;
-import com.google.common.base.Strings;
-import com.google.common.collect.Iterators;
-
-/**
- * A slave process running the actual tests on the target JVM.
- */
-public class SlaveMain {
-  /** Runtime exception. */
-  public static final int ERR_EXCEPTION = 240;
-
-  /** No JUnit on classpath. */
-  public static final int ERR_NO_JUNIT = 239;
-
-  /** Old JUnit on classpath. */
-  public static final int ERR_OLD_JUNIT = 238;
-
-  /** OOM */
-  public static final int ERR_OOM = 237;
-
-  /**
-   * Last resort memory pool released under low memory conditions.
-   * This is not a solution, it's a terrible hack. I know this. Everyone knows this.
-   * Even monkeys in Madagaskar know this. If you know a better solution, patches
-   * welcome. 
-   * 
-   * <p>Approximately 5mb is reserved. Really, smaller values don't make any difference
-   * and the JVM fails to even return the status passed to Runtime.halt().
-   */
-  static volatile Object lastResortMemory = new byte 1024 * 1024 * 5;
-
-  /**
-   * Preallocate and load in advance. 
-   */
-  static Class<OutOfMemoryError> oomClass = OutOfMemoryError.class;
-  
-  /**
-   * Frequent event strean flushing.
-   */
-  public static final String OPTION_FREQUENT_FLUSH = "-flush";
-
-  /**
-   * Multiplex sysout and syserr to original streams (aside from
-   * pumping them to event stream).
-   */
-  public static final String OPTION_SYSOUTS = "-sysouts";
-
-  /**
-   * Read class names from standard input.
-   */
-  public static final String OPTION_STDIN = "-stdin";
-
-  /**
-   * Name the sink for events. If given, accepts one argument - name of a file
-   * to which events should be dumped. The file has to be initially empty!
-   */
-  public static final String OPTION_EVENTSFILE = "-eventsfile";
-
-  /**
-   * Should the debug stream from the runner be created? It's named after the events file
-   * with <code>.debug</code> suffix.
-   */
-  public static final String OPTION_DEBUGSTREAM = "-debug";
-
-  /**
-   * User-defined RunListener classes.
-   */
-  public static final String OPTION_RUN_LISTENERS = "-runListeners";
-
-  /**
-   * Fire a runner failure after startup to verify messages
-   * are propagated properly. Not really useful in practice...
-   */
-  public static final String SYSPROP_FIRERUNNERFAILURE =
-      SlaveMain.class.getName() + ".fireRunnerFailure";
-
-  /**
-   * Delay the initial bootstrap event from the forked JVM 
-   * (used in tests).
-   */
-  public static final String SYSPROP_FORKEDJVM_DELAY_MS =
-      "junit4.tests.internal.initialDelayMs";
-
-  /**
-   * Event sink.
-   */
-  private final Serializer serializer;
-
-  /** A sink for warnings (non-event stream). */
-  private static PrintStream warnings;
-
-  /** Flush serialization stream frequently. */
-  private boolean flushFrequently = false;
-
-  /** Debug stream to flush progress information to. */
-  private File debugMessagesFile;
-
-  /** List of RunListener classes */
-  private String runListeners;
-
-  /** 
-   * Multiplex calls to System streams to both event stream
-   * and the original streams?
-   */
-  private static boolean multiplexStdStreams = false;
-
-  /**
-   * Base for redirected streams. 
-   */
-  private static class ChunkedStream extends OutputStream {
-    public void write(int b) throws IOException {
-      throw new IOException("Only buffered write(byte,int,int) calls expected from super stream.");
-    }
-    
-    @Override
-    public void close() throws IOException {
-      throw new IOException("Not supposed to be called on redirected streams.");
-    }
-  }
-
-  /**
-   * Creates a slave emitting events to the given serializer.
-   */
-  public SlaveMain(Serializer serializer) {
-    this.serializer = serializer;
-  }
-
-  /**
-   * Execute tests.
-   */
-  private void execute(Iterator<String> classNames) throws Throwable {
-    final RunNotifier fNotifier = new OrderedRunNotifier();
-    final Result result = new Result();
-    final Writer debug = debugMessagesFile == null ? new NullWriter() : new OutputStreamWriter(new FileOutputStream(debugMessagesFile), "UTF-8");
-
-    fNotifier.addListener(result.createListener());
-
-    fNotifier.addListener(
-        new StreamFlusherDecorator(
-            new NoExceptionRunListenerDecorator(new RunListenerEmitter(serializer)) {
-              @Override
-              protected void exception(Throwable t) {
-                warn("Event serializer exception.", t);
-              }
-            }));
-
-    fNotifier.addListener(new RunListener() {
-      public void testRunFinished(Result result) throws Exception {
-        debug(debug, "testRunFinished(T:" + result.getRunCount() + ";F:" + result.getFailureCount() + ";I:" + result.getIgnoreCount() + ")");
-        serializer.flush();
-      }
-
-      @Override
-      public void testRunStarted(Description description) throws Exception {
-        debug(debug, "testRunStarted(" + description + ")");

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/slave/SlaveMainSafe.java Deleted

@@ -1,39 +0,0 @@
-package com.carrotsearch.ant.tasks.junit4.slave;
-
-import java.io.Serializable;
-
-import com.carrotsearch.randomizedtesting.annotations.SuppressForbidden;
-
-@SuppressForbidden("legitimate sysstreams.")
-public class SlaveMainSafe {
-  public static void main(String args) {
-    verifyJUnit4Present();
-
-    try {
-      SlaveMain.main(args);
-    } catch (Throwable e) {
-      try  {
-        System.err.println(e.toString());
-        e.printStackTrace(System.err);
-        System.out.close();
-        System.err.close();
-      } finally {
-        JvmExit.halt(SlaveMain.ERR_EXCEPTION);
-      }
-    }
-  }
-
-  /**
-   * Verify JUnit presence and version.
-   */
-  private static void verifyJUnit4Present() {
-    try {
-      Class<?> clazz = Class.forName("org.junit.runner.Description");
-      if (!Serializable.class.isAssignableFrom(clazz)) {
-        JvmExit.halt(SlaveMain.ERR_OLD_JUNIT);
-      }
-    } catch (ClassNotFoundException e) {
-      JvmExit.halt(SlaveMain.ERR_NO_JUNIT);
-    }
-  }  
-}

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/slave/StdInLineIterator.java Deleted

@@ -1,37 +0,0 @@
-package com.carrotsearch.ant.tasks.junit4.slave;
-
-import java.io.*;
-import java.nio.charset.Charset;
-
-import com.carrotsearch.ant.tasks.junit4.events.IdleEvent;
-import com.carrotsearch.ant.tasks.junit4.events.Serializer;
-import com.google.common.collect.AbstractIterator;
-
-/**
- * Iterates over lines from standard input. 
- */
-class StdInLineIterator extends AbstractIterator<String> {
-  private BufferedReader reader;
-  private Serializer serializer;
-
-  public StdInLineIterator(Serializer serializer) {
-    this.serializer = serializer;
-    this.reader = new BufferedReader(
-      new InputStreamReader(
-          System.in,
-          Charset.defaultCharset()));
-  }
-
-  @Override
-  protected String computeNext() {
-    try {
-      serializer.serialize(new IdleEvent());
-      serializer.flush();
-
-      String line = reader.readLine();
-      return line != null ? line : endOfData();
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/slave/StreamFlusherDecorator.java Deleted

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/it/TestUnhandledSlaveFailure.java Deleted

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/tests/SlaveHangingBackgroundThreads.java Deleted

_service:tar_scm:2.7.4.tar.gz/CHANGES.txt -> _service:tar_scm:2.8.1.tar.gz/CHANGES.txt Changed

@@ -5,6 +5,67 @@
 For an up-to-date CHANGES file see 
 https://github.com/randomizedtesting/randomizedtesting/blob/master/CHANGES
 
+======================= randomizedtesting 2.8.1 ====================
+
+Bug Fixes:
+
+  * GH-307: Use monotonic clock instead of wall clock for detecting
+    deadlines as VMs and operating systems may shift wall clock resulting
+    in unpredictable behavior.
+
+======================= randomizedtesting 2.8.0 ====================
+
+Other:
+
+  * GH-303: Messages from ThreadLeakControl.checkThreadLeaks can
+    be inconsistent due to mismatched use of thread data.
+
+  * GH-304: Replace master/slave with main/forkedjvm terminology. This change
+    may result in backward incompatibilities if you used low-level event bus
+    subscription methods or JSON reports. Grep and replace 'slave' with 'forkedJvm'
+    and 'master' with 'main' seed.
+
+======================= randomizedtesting 2.7.9 ====================
+
+Other:
+
+  * Update ASM to 9.2 to support JDK 17
+
+  * Update JUnit dependency to 4.13.1.
+
+  * Update Ant dependency to 1.9.15.
+
+======================= randomizedtesting 2.7.8 ====================
+
+Improvements
+
+  * GH-289: Bump asm to 8.0.1.
+
+  * PR-287: Bump dom4j from 2.1.1 to 2.1.3.
+
+======================= randomizedtesting 2.7.7 ====================
+
+Bug Fixes
+
+  * GH-283: RandomizedRunner throws `NoTestsRemainException` from the
+    constructor when method filter is supplied and no methods match
+    (Mark Vieira).
+
+======================= randomizedtesting 2.7.6 ====================
+
+Improvements
+
+  * Use thread join internally to wait for forked timeouting test thread
+    instead of a hardcoded sleep (dumb!).
+
+======================= randomizedtesting 2.7.5 ====================
+
+Improvements
+
+  * Switch to simple-xml-safe.
+
+  * throw NoTestsRemainException if Filterable.filter removes all tests.
+
 ======================= randomizedtesting 2.7.4 ====================
 
 Bug Fixes
@@ -324,7 +385,7 @@
 
 New Features
  
-  * GH-191: "Tests with failures" should repeat the master seed at the end 
+  * GH-191: "Tests with failures" should repeat the main seed at the end
     of the report. (Dawid Weiss)
 
 Bug Fixes

_service:tar_scm:2.7.4.tar.gz/examples/ant/build.xml -> _service:tar_scm:2.8.1.tar.gz/examples/ant/build.xml Changed

_service:tar_scm:2.7.4.tar.gz/examples/ant/pom.xml -> _service:tar_scm:2.8.1.tar.gz/examples/ant/pom.xml Changed

_service:tar_scm:2.7.4.tar.gz/examples/maven/pom.xml -> _service:tar_scm:2.8.1.tar.gz/examples/maven/pom.xml Changed

_service:tar_scm:2.7.4.tar.gz/examples/maven/src/main/java/com/carrotsearch/examples/randomizedrunner/Test004MoreRandomness.java -> _service:tar_scm:2.8.1.tar.gz/examples/maven/src/main/java/com/carrotsearch/examples/randomizedrunner/Test004MoreRandomness.java Changed

_service:tar_scm:2.7.4.tar.gz/examples/maven/src/main/java/com/carrotsearch/examples/randomizedrunner/Test005RecoveringRandomSeed.java -> _service:tar_scm:2.8.1.tar.gz/examples/maven/src/main/java/com/carrotsearch/examples/randomizedrunner/Test005RecoveringRandomSeed.java Changed

@@ -11,20 +11,20 @@
 /**
  * {@link RandomizedRunner} uses several "contexts", each of which is assigned a
  * predictable {@link Random} and is modeled using a {@link Randomness}
- * instance. The "suite" or "master" context is available from
+ * instance. The "suite" or "main" context is available from
  * {@link BeforeClass} or {@link AfterClass} hooks, for example. Each test
- * method has a nested context with a random seed derived from the master. This
+ * method has a nested context with a random seed derived from the main seed. This
  * way even though the order of tests is shuffled and each test can make a
  * random number of calls to its own context's {@link Random} instance, the
- * global execution paths can always be repeated from the same master seed. The
- * question is: how do we know what master seed was used? There are at least two
+ * global execution paths can always be repeated from the same main seed. The
+ * question is: how do we know what main seed was used? There are at least two
  * ways to find out.
  * 
- * <p>The master seed is always available from
+ * <p>The main seed is always available from
  * {@link RandomizedContext#getRunnerSeedAsString()} so one can simply print it to the
  * console. The current context's {@link Randomness} itself can be printed to the
- * console. In two methods in this class {@link #printMasterContext()} and {@link #printContext()} 
- * we print the master seed and current context's {@link Randomness}, note how the static 
+ * console. In two methods in this class {@link #printMainContext()} and {@link #printContext()}
+ * we print the main seed and current context's {@link Randomness}, note how the static
  * context's {@link Randomness} is identical with the runner's but the test context 
  * is a derived value. 
  * <pre>
@@ -51,9 +51,9 @@
  * </pre>
  * 
  * The first line of the stack trace is a synthetic (non-existing) class with "source file"
- * entry containing all contexts' seeds on the stack (from master to the current test method).
- * In this case, you can see the master context first (<tt>AF567B2B9F8A8F1C</tt>), followed
- * by the test's context (<tt>44E2D1A039274F2A</tt>). The entire class has a fixed master seed
+ * entry containing all contexts' seeds on the stack (from main to the current test method).
+ * In this case, you can see the main context first (<tt>AF567B2B9F8A8F1C</tt>), followed
+ * by the test's context (<tt>44E2D1A039274F2A</tt>). The entire class has a fixed main seed
  * so that the result will always be the same here:
  * <pre>
  * {@literal @}{@link Seed}("AF567B2B9F8A8F1C")
@@ -63,7 +63,7 @@
 @Seed("AF567B2B9F8A8F1C")
 public class Test005RecoveringRandomSeed extends RandomizedTest {
   @BeforeClass
-  public static void printMasterContext() {
+  public static void printMainContext() {
     System.out.println("# Static context (@BeforeClass)");
     System.out.println(getContext().getRunnerSeedAsString());
     System.out.println(RandomizedContext.current().getRandomness());

_service:tar_scm:2.7.4.tar.gz/examples/maven/src/main/java/com/carrotsearch/examples/randomizedrunner/Test006RepeatingTests.java -> _service:tar_scm:2.8.1.tar.gz/examples/maven/src/main/java/com/carrotsearch/examples/randomizedrunner/Test006RepeatingTests.java Changed

@@ -10,7 +10,7 @@
 
 /**
  * In example {@link Test005RecoveringRandomSeed} we presented
- * {@link Randomness} contexts and how they are derived from a master seed. Once
+ * {@link Randomness} contexts and how they are derived from a main seed. Once
  * you know a certain test case fails it is usually beneficial to immediately
  * check if it <b>always fails</b> on a given seed (which means there is a
  * deterministic failure scenario). A simple way to do so would be to re-run a
@@ -25,10 +25,10 @@
  * public void repeatFailure() { //...
  * </pre>
  * Note how the seed is fixed using {@link Seed} annotation (on the
- * method) rather than on the master. This ensures the method's context is
- * pinned to that value, but the master is still random. If you have
+ * method) rather than on the class. This ensures the method's context is
+ * pinned to that value, but the main seed is still random. If you have
  * {@link BeforeClass} hooks that depend on randomness you should use
- * suite-level {@link Seed} annotation and pin the master seed instead.
+ * suite-level {@link Seed} annotation and pin the main seed instead.
  * 
  * <p>You can also set {@link Repeat#useConstantSeed()} to <code>false</code> and
  * then every iteration of the test method will have a pseudo-random context derived

_service:tar_scm:2.7.4.tar.gz/examples/maven/src/main/java/com/carrotsearch/examples/randomizedrunner/Test010Lingering.java -> _service:tar_scm:2.8.1.tar.gz/examples/maven/src/main/java/com/carrotsearch/examples/randomizedrunner/Test010Lingering.java Changed

_service:tar_scm:2.7.4.tar.gz/examples/security-manager/pom.xml -> _service:tar_scm:2.8.1.tar.gz/examples/security-manager/pom.xml Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/pom.xml -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/pom.xml Changed

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.carrotsearch.randomizedtesting</groupId>
     <artifactId>randomizedtesting-parent</artifactId>
-    <version>2.7.4</version>
+    <version>2.8.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -54,8 +54,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.simpleframework</groupId>
-      <artifactId>simple-xml</artifactId>
+      <groupId>com.carrotsearch.thirdparty</groupId>
+      <artifactId>simple-xml-safe</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -101,11 +101,6 @@
                 </excludes>
                 <classesDirectory>${project.build.directory}/dontinclude</classesDirectory>
                 <classpathDependencyExcludes>
-                    
                     <classpathDependencyExcludes>com.carrotsearch.randomizedtesting:randomizedtesting-runner</classpathDependencyExcludes>
                     <classpathDependencyExcludes>com.google.guava:guava</classpathDependencyExcludes>
                 </classpathDependencyExcludes>
@@ -163,8 +158,8 @@
                 <packages>com.carrotsearch.ant.tasks.junit4.events*</packages>
               </group>
             </groups>
-            <header><!CDATA<div id='header'><a class='logo' target='_top' href='http://labs.carrotsearch.com'></a>${project.name} v${project.version} <br>API Documentation</div>></header>
-            <excludePackageNames>com.carrotsearch.ant.tasks.junit4.slave</excludePackageNames>
+            <header><!CDATA<div id='header'><a class='logo' target='_top' href='https://labs.carrotsearch.com'></a>${project.name} v${project.version} <br>API Documentation</div>></header>
+            <excludePackageNames>com.carrotsearch.ant.tasks.junit4.forked</excludePackageNames>
           </configuration>
         </plugin>        
       </plugins>          
@@ -227,8 +222,8 @@
                 <filter>!module-info.class</filter>
               </inclusion>
               <inclusion>
-                <groupId>org.simpleframework</groupId>
-                <artifactId>simple-xml</artifactId>
+                <groupId>com.carrotsearch.thirdparty</groupId>
+                <artifactId>simple-xml-safe</artifactId>
               </inclusion>
               <inclusion>
                 <groupId>com.carrotsearch.randomizedtesting</groupId>

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/DiagnosticsListener.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/DiagnosticsListener.java Changed

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/ForkedJvmIdle.java Added

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/ForkedJvmInfo.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/ForkedJvmInfo.java Changed

@@ -15,18 +15,18 @@
 import com.carrotsearch.randomizedtesting.WriterOutputStream;
 
 /**
- * Static slave information.
+ * Static forked JVM information.
  */
 public final class ForkedJvmInfo {
   /**
-   * Unique sequential slave identifier.
+   * Unique sequential identifier.
    */
   public final int id;
 
   /**
-   * The number of executed slaves, total.
+   * The number of executed forked JVMs, total.
    */
-  public final int slaves;
+  public final int forkedJvmCount;
 
   /**
    * Bootstrap event.
@@ -39,28 +39,28 @@
   long start, end;
 
   /**
-   * Execute these test suites on this slave.
+   * Execute these test suites on this forked JVM.
    */
   ArrayList<String> testSuites;
 
   /**
-   * Complete slave command line invocation string. 
+   * Complete command line invocation string.
    */
-  String slaveCommandLine;
+  String forkedCommandLine;
 
   /**
-   * Execution error if anything bad happened on the slave.
+   * Execution error if anything bad happened.
    */
   Throwable executionError;
 
   /* */
-  public ForkedJvmInfo(int id, int slaves) {
+  public ForkedJvmInfo(int id, int forkedJvmCount) {
     this.id = id;
-    this.slaves = slaves;
+    this.forkedJvmCount = forkedJvmCount;
   }
 
   /**
-   * Return the {@link Charset} used to encode stream bytes from the slave.
+   * Return the {@link Charset} used to encode stream bytes from the forked JVM.
    */
   public Charset getCharset() {
     if (bootstrapEvent != null) {
@@ -71,7 +71,7 @@
   }
 
   /**
-   * System properties on the slave.
+   * System properties on the forked JVM.
    */
   public Map<String,String> getSystemProperties() {
     if (bootstrapEvent == null) {
@@ -95,14 +95,14 @@
   }
 
   /**
-   * Command line string used to invoke the slave.
+   * Command line string used to invoke the forked JVM
    */
   public String getCommandLine() {
-    return slaveCommandLine;
+    return forkedCommandLine;
   }
   
   /**
-   * JVM name (slave).
+   * JVM name.
    */
   public String getJvmName() {
     return getSystemProperties().get("java.vm.name") + ", " +
@@ -110,14 +110,14 @@
   }
 
   /**
-   * Slave execution time.
+   * Forked JVM execution time.
    */
   long getExecutionTime() {
     return end - start;
   }
   
   /**
-   * Set the bootstrap event associated with this slave. 
+   * Set the bootstrap event associated with this forked JVM.
    */
   void setBootstrapEvent(BootstrapEvent e) {
     this.bootstrapEvent = e;

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/JUnit4.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/JUnit4.java Changed

@@ -43,6 +43,8 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import com.carrotsearch.ant.tasks.junit4.forked.ForkedMain;
+import com.carrotsearch.ant.tasks.junit4.forked.ForkedMainSafe;
 import com.carrotsearch.ant.tasks.junit4.runlisteners.RunListenerClass;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
@@ -79,8 +81,6 @@
 import com.carrotsearch.ant.tasks.junit4.events.aggregated.ChildBootstrap;
 import com.carrotsearch.ant.tasks.junit4.events.aggregated.JvmOutputEvent;
 import com.carrotsearch.ant.tasks.junit4.listeners.AggregatedEventListener;
-import com.carrotsearch.ant.tasks.junit4.slave.SlaveMain;
-import com.carrotsearch.ant.tasks.junit4.slave.SlaveMainSafe;
 import com.carrotsearch.randomizedtesting.ClassGlobFilter;
 import com.carrotsearch.randomizedtesting.FilterExpressionParser;
 import com.carrotsearch.randomizedtesting.FilterExpressionParser.Node;
@@ -105,7 +105,7 @@
 /**
  * An ANT task to run JUnit4 tests. Differences (benefits?) compared to ANT's default JUnit task:
  * <ul>
- *  <li>Built-in parallel test execution support (spawns multiple JVMs to avoid 
+ *  <li>Built-in parallel test execution support (spawns multiple JVMs to avoid
  *  test interactions).</li>
  *  <li>Randomization of the order of test suites within a single JVM.</li>
  *  <li>Aggregates and synchronizes test events from executors. All reports run on
@@ -114,7 +114,7 @@
  *  Report listeners use Google Guava's {@link EventBus} and receive full information
  *  about tests' execution (including skipped, assumption-skipped tests, streamlined
  *  output and error stream chunks, etc.).</li>
- *  <li>JUnit 4.10+ is required both for the task and for the tests classpath. 
+ *  <li>JUnit 4.10+ is required both for the task and for the tests classpath.
  *  Older versions will cause build failure.</li>
  *  <li>Integration with {@link RandomizedRunner} (randomization seed is passed to
  *  children JVMs).</li>
@@ -157,8 +157,8 @@
   /** @see #setParallelism(String) */
   public static final String PARALLELISM_MAX = "max";
 
-  /** Default value of {@link #setShuffleOnSlave}. */
-  public static final boolean DEFAULT_SHUFFLE_ON_SLAVE = true;
+  /** Default value of {@link #setShuffleOnForkedJvm(boolean)}. */
+  public static final boolean DEFAULT_SHUFFLE_ON_FORKED_JVM = true;
 
   /** Default value of {@link #setParallelism}. */
   public static final String  DEFAULT_PARALLELISM = "1";
@@ -168,7 +168,7 @@
 
   /** Default value of {@link #setHaltOnFailure}. */
   public static final boolean DEFAULT_HALT_ON_FAILURE = true;
-  
+
   /** Default value of {@link #setIsolateWorkingDirectories(boolean)}. */
   public static final boolean DEFAULT_ISOLATE_WORKING_DIRECTORIES = true;
 
@@ -180,7 +180,7 @@
 
   /** Default value of {@link #setSysouts}. */
   public static final boolean DEFAULT_SYSOUTS = false;
-  
+
   /** Default value of {@link #setDebugStream}. */
   public static final boolean DEFAULT_DEBUGSTREAM = false;
 
@@ -222,17 +222,17 @@
   /**
    * @see #setSysouts
    */
-  private boolean sysouts = DEFAULT_SYSOUTS; 
+  private boolean sysouts = DEFAULT_SYSOUTS;
 
   /**
    * @see #setDebugStream
    */
-  private boolean debugStream = DEFAULT_DEBUGSTREAM; 
+  private boolean debugStream = DEFAULT_DEBUGSTREAM;
 
   /**
-   * Slave VM command line.
+   * Forked JVM command line.
    */
-  private CommandlineJava slaveCommand = new CommandlineJava();
+  private CommandlineJava forkedJvmCommandLine = new CommandlineJava();
 
   /**
    * Set new environment for the forked process?
@@ -243,12 +243,12 @@
    * @see #setUniqueSuiteNames
    */
   private boolean uniqueSuiteNames = DEFAULT_UNIQUE_SUITE_NAME;
-  
+
   /**
    * Environment variables to use in the forked JVM.
    */
   private Environment env = new Environment();
-  
+
   /**
    * Directory to invoke forked VMs in.
    */
@@ -273,9 +273,9 @@
    * Property to set if there were test failures or errors.
    */
   private String failureProperty;
-  
+
   /**
-   * A folder to store temporary files in. Defaults to {@link #dir} or  
+   * A folder to store temporary files in. Defaults to {@link #dir} or
    * the project's basedir.
    */
   private Path tempDir;
@@ -297,7 +297,7 @@
 
   /**
    * Class loader used to resolve annotations and classes referenced from annotations
-   * when {@link Description}s containing them are passed from slaves.
+   * when {@link Description}s containing them are passed from forked JVMs.
    */
   private AntClassLoader testsClassLoader;
 
@@ -344,44 +344,44 @@
   private float dynamicAssignmentRatio = DEFAULT_DYNAMIC_ASSIGNMENT_RATIO;
 
   /**
-   * @see #setShuffleOnSlave(boolean)
+   * @see #setShuffleOnForkedJvm(boolean)
    */
-  private boolean shuffleOnSlave = DEFAULT_SHUFFLE_ON_SLAVE;
+  private boolean shuffleOnForkedJvm = DEFAULT_SHUFFLE_ON_FORKED_JVM;
 
   /**
    * @see #setHeartbeat
    */
-  private long heartbeat; 
-  
+  private long heartbeat;
+
   /**
    * @see #setIfNoTests
    */
   private NoTestsAction ifNoTests = NoTestsAction.IGNORE;
-  
+
   /**
    * @see #setStatsPropertyPrefix
    */
   private String statsPropertyPrefix;
-  
+
   /**
-   * 
+   *
    */
   public JUnit4() {
     resources = new Resources();
   }
 
   /**
-   * What should be done on unexpected JVM output? JVM may write directly to the 
+   * What should be done on unexpected JVM output? JVM may write directly to the
    * original descriptors, bypassing redirections of System.out and System.err. Typically,
    * these messages will be important and should fail the build (permgen space exceeded,
    * compiler errors, crash dumps). However, certain legitimate logs (gc activity, class loading
    * logs) are also printed to these streams so sometimes the output can be ignored.
-   * 
-   * <p>Allowed values (any comma-delimited combination of): {@link JvmOutputAction} 
+   *
+   * <p>Allowed values (any comma-delimited combination of): {@link JvmOutputAction}
    * constants.
    */
   public void setJvmOutputAction(String jvmOutputActions) {
-    EnumSet<JvmOutputAction> actions = EnumSet.noneOf(JvmOutputAction.class); 
+    EnumSet<JvmOutputAction> actions = EnumSet.noneOf(JvmOutputAction.class);
     for (String s : jvmOutputActions.split("\\,\\ +")) {
       s = s.trim().toUpperCase(Locale.ROOT);
       actions.add(JvmOutputAction.valueOf(s));
@@ -393,13 +393,13 @@
    * If set to true, any sysout and syserr calls will be written to original
    * output and error streams (and in effect will appear as "jvm output". By default
    * sysout and syserrs are captured and proxied to the event stream to be synchronized
-   * with other test events but occasionally one may want to synchronize them with direct 
-   * JVM output (to synchronize with compiler output or GC output for example). 
+   * with other test events but occasionally one may want to synchronize them with direct
+   * JVM output (to synchronize with compiler output or GC output for example).
    */
   public void setSysouts(boolean sysouts) {
     this.sysouts = sysouts;
   }
-  
+
   /**
    * Enables a debug stream from each forked JVM. This will create an additional file
    * next to each events file. For debugging the framework only, not a general-purpose setting.
@@ -407,7 +407,7 @@
   public void setDebugStream(boolean debugStream) {
     this.debugStream = debugStream;
   }

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/LocalForkedJvmStreamHandler.java Added

@@ -0,0 +1,295 @@
+package com.carrotsearch.ant.tasks.junit4;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.RandomAccessFile;
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.tools.ant.taskdefs.ExecuteStreamHandler;
+
+import com.carrotsearch.ant.tasks.junit4.events.BootstrapEvent;
+import com.carrotsearch.ant.tasks.junit4.events.Deserializer;
+import com.carrotsearch.ant.tasks.junit4.events.EventType;
+import com.carrotsearch.ant.tasks.junit4.events.IEvent;
+import com.carrotsearch.ant.tasks.junit4.events.IStreamEvent;
+import com.carrotsearch.ant.tasks.junit4.events.LowLevelHeartBeatEvent;
+import com.google.common.eventbus.EventBus;
+
+/**
+ * Establish event passing with a subprocess and pump events to the bus.
+ */
+public class LocalForkedJvmStreamHandler implements ExecuteStreamHandler {
+  private final EventBus eventBus;
+  private final ClassLoader refLoader;
+
+  private InputStream stdout;
+  private InputStream stderr;
+
+  /** raw input stream to the client. */
+  private OutputStream stdin;
+
+  /** character-wrapped input stream to the client. */
+  private OutputStreamWriter stdinWriter;
+
+  private final PrintStream warnStream;
+  private final TailInputStream eventStream;
+  
+  private volatile boolean stopping;
+
+  private List<Thread> pumpers = new ArrayList<>();
+
+  private final OutputStream sysout;
+  private final OutputStream syserr;
+  private final long heartbeat;
+  private final RandomAccessFile streamsBuffer;
+  private final OutputStream streamsBufferWrapper;
+
+  public LocalForkedJvmStreamHandler(
+      EventBus eventBus, ClassLoader classLoader, PrintStream warnStream, TailInputStream eventStream,
+      OutputStream sysout, OutputStream syserr, long heartbeat, final RandomAccessFile streamsBuffer) {
+    this.eventBus = eventBus;
+    this.warnStream = warnStream;
+    this.refLoader = classLoader;
+    this.eventStream = eventStream;
+    this.sysout = sysout;
+    this.syserr = syserr;
+    this.heartbeat = heartbeat;
+    this.streamsBuffer = streamsBuffer;
+    this.streamsBufferWrapper = new OutputStream() {
+      @Override
+      public void write(int b) throws IOException {
+        streamsBuffer.write(b);
+      }
+
+      @Override
+      public void write(byte b) throws IOException {
+        streamsBuffer.write(b, 0, b.length);
+      }
+
+      @Override
+      public void write(byte b, int off, int len) throws IOException {
+        streamsBuffer.write(b, off, len);
+      }
+    };
+  }
+
+  @Override
+  public void setProcessErrorStream(InputStream is) throws IOException {
+    this.stderr = is;
+  }
+  
+  @Override
+  public void setProcessOutputStream(InputStream is) throws IOException {
+    this.stdout = is;
+  }
+
+  @Override
+  public void setProcessInputStream(OutputStream os) throws IOException {
+    this.stdin = os;
+  }
+
+  /**
+   * A timestamp of last received event (GH-106).
+   */
+  private volatile Long lastActivity;
+  
+  /**
+   * Watchdog thread if heartbeat is to be measured.
+   */
+  private Thread watchdog;
+  
+  /**
+   * Client charset extracted from {@link BootstrapEvent}.
+   */
+  private Charset clientCharset;
+
+  @Override
+  public void start() throws IOException {
+    lastActivity = System.currentTimeMillis();
+
+    pumpers.add(new Thread(new SimpleStreamPumper(stdout, sysout), "pumper-stdout"));
+    pumpers.add(new Thread(new SimpleStreamPumper(stderr, syserr), "pumper-stderr"));
+    pumpers.add(new Thread("pumper-events") {
+      public void run() {
+        pumpEvents(eventStream);
+      }
+    });
+
+    if (heartbeat > 0) {
+      pumpers.add(watchdog = new Thread("pumper-watchdog") {
+        public void run() {
+          final long heartbeatMillis = TimeUnit.SECONDS.toMillis(heartbeat);
+          final long HEARTBEAT = Math.max(500, heartbeatMillis / 5);
+          final long HEARTBEAT_EVENT_THRESHOLD = heartbeatMillis;
+          try {
+            long lastObservedUpdate = lastActivity;
+            long reportDeadline = lastObservedUpdate + HEARTBEAT_EVENT_THRESHOLD; 
+            while (true) {
+              Thread.sleep(HEARTBEAT);
+  
+              Long last = lastActivity;
+              if (last == null) {
+                break; // terminated.
+              }
+  
+              if (last != lastObservedUpdate) {
+                lastObservedUpdate = last;
+                reportDeadline = last + HEARTBEAT_EVENT_THRESHOLD;
+              } else {
+                final long current = System.currentTimeMillis();
+                if (current >= reportDeadline) {
+                  eventBus.post(new LowLevelHeartBeatEvent(last, current));
+                  reportDeadline = System.currentTimeMillis() + HEARTBEAT_EVENT_THRESHOLD;
+                }
+              }
+            }
+          } catch (InterruptedException e ) {
+            // terminate on interrupt.
+          }
+        }
+      });
+    }
+
+    // Start all pumper threads.
+    UncaughtExceptionHandler handler = new UncaughtExceptionHandler() {
+      public void uncaughtException(Thread t, Throwable e) {
+        warnStream.println("Unhandled exception in thread: " + t);
+        e.printStackTrace(warnStream);
+      }
+    };
+
+    for (Thread t : pumpers) {
+      t.setUncaughtExceptionHandler(handler);
+      t.setDaemon(true);
+      t.start();
+    }
+  }
+
+  private static class OnDiskStreamEvent implements IEvent, IStreamEvent {
+    private final RandomAccessFile bufferFile;
+    private long start;
+    private long end;
+    private EventType type;
+
+    public OnDiskStreamEvent(EventType type, RandomAccessFile streamsBuffer, long start, long end) {
+      this.bufferFile = streamsBuffer;
+      this.start = start;
+      this.end = end;
+      this.type = type;
+    }
+
+    @Override
+    public EventType getType() {
+      return type;
+    }
+
+    @Override
+    public void copyTo(OutputStream os) throws IOException {
+      final long restorePosition = bufferFile.getFilePointer();
+      bufferFile.seek(start);
+      try {
+        long length = end - start;
+        final byte  buffer = new byte (int) Math.min(length, 1024 * 4);

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/PickSeedTask.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/PickSeedTask.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/SuiteBalancer.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/SuiteBalancer.java Changed

@@ -14,9 +14,9 @@
     public final String suiteName;
 
     /**
-     * Slave assignment.
+     * forked JVM assignment.
      */
-    public final int slaveId;
+    public final int forkedJvmId;
     
     /**
      * Estimated cost; informational only (depends on the balancer). May be zero
@@ -24,9 +24,9 @@
      */
     public final int estimatedCost;
 
-    public Assignment(String suiteName, int slaveId, int estimatedCost) {
+    public Assignment(String suiteName, int forkedJvmId, int estimatedCost) {
       this.suiteName = suiteName;
-      this.slaveId = slaveId;
+      this.forkedJvmId = forkedJvmId;
       this.estimatedCost = estimatedCost;
     }
 
@@ -34,7 +34,7 @@
     public int compareTo(Assignment other) {
       int v = this.suiteName.compareTo(other.suiteName);
       if (v == 0) {
-        v = this.slaveId - other.slaveId;
+        v = this.forkedJvmId - other.forkedJvmId;
       }
       return v;
     }
@@ -46,11 +46,11 @@
   void setOwner(JUnit4 owner);
   
   /**
-   * Provide assignments for suite names and a given number of slaves.
+   * Provide assignments for suite names and a given number of forked JVMs.
    * 
    * @return Returns an ordered list with assignments. Any suite name not present
    *         in the keys of the returned map will be assigned by following
    *         balancers (or randomly).
    */
-  List<Assignment> assign(Collection<String> suiteNames, int slaves, long seed);
+  List<Assignment> assign(Collection<String> suiteNames, int forkedJvmCount, long seed);
 }

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/balancers/ExecutionTimeBalancer.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/balancers/ExecutionTimeBalancer.java Changed

@@ -15,10 +15,10 @@
  * {@link ExecutionTimesReport}.
  */
 public class ExecutionTimeBalancer extends ProjectComponent implements SuiteBalancer {
-  private static class SlaveLoad {
-    public static final Comparator<SlaveLoad> ASCENDING_BY_ESTIMATED_FINISH = new Comparator<SlaveLoad>() {
+  private static class ForkedJvmLoad {
+    public static final Comparator<ForkedJvmLoad> ASCENDING_BY_ESTIMATED_FINISH = new Comparator<ForkedJvmLoad>() {
       @Override
-      public int compare(SlaveLoad o1, SlaveLoad o2) {
+      public int compare(ForkedJvmLoad o1, ForkedJvmLoad o2) {
         if (o1.estimatedFinish < o2.estimatedFinish) {
           return -1;
         } else if (o1.estimatedFinish == o2.estimatedFinish) {
@@ -32,7 +32,7 @@
     public final int id;
     public long estimatedFinish;
 
-    public SlaveLoad(int id) {
+    public ForkedJvmLoad(int id) {
       this.id = id;
     }
   }
@@ -69,12 +69,12 @@
 
   /**
    * Assign based on execution time history. The algorithm is a greedy heuristic
-   * assigning the longest remaining test to the slave with the
+   * assigning the longest remaining test to the forked JVM with the
    * shortest-completion time so far. This is not optimal but fast and provides
    * a decent average assignment.
    */
   @Override
-  public List<Assignment> assign(Collection<String> suiteNames, int slaves, long seed) {
+  public List<Assignment> assign(Collection<String> suiteNames, int forkedJvmCount, long seed) {
     // Read hints first.
     final Map<String,List<Long>> hints = ExecutionTimesReport.mergeHints(resources, suiteNames);
 
@@ -94,37 +94,37 @@
     Collections.sort(costs, SuiteHint.DESCENDING_BY_WEIGHT);
 
     // Apply the assignment heuristic.
-    final PriorityQueue<SlaveLoad> pq = new PriorityQueue<SlaveLoad>(
-        slaves, SlaveLoad.ASCENDING_BY_ESTIMATED_FINISH);
-    for (int i = 0; i < slaves; i++) {
-      pq.add(new SlaveLoad(i));
+    final PriorityQueue<ForkedJvmLoad> pq = new PriorityQueue<ForkedJvmLoad>(
+        forkedJvmCount, ForkedJvmLoad.ASCENDING_BY_ESTIMATED_FINISH);
+    for (int i = 0; i < forkedJvmCount; i++) {
+      pq.add(new ForkedJvmLoad(i));
     }
 
     final List<Assignment> assignments = new ArrayList<>();
     for (SuiteHint hint : costs) {
-      SlaveLoad slave = pq.remove();
-      slave.estimatedFinish += hint.cost;
-      pq.add(slave);
+      ForkedJvmLoad forkedJvm = pq.remove();
+      forkedJvm.estimatedFinish += hint.cost;
+      pq.add(forkedJvm);
 
       owner.log("Expected execution time for " + hint.suiteName + ": " +
           Duration.toHumanDuration(hint.cost),
           Project.MSG_DEBUG);
 
-      assignments.add(new Assignment(hint.suiteName, slave.id, (int) hint.cost));
+      assignments.add(new Assignment(hint.suiteName, forkedJvm.id, (int) hint.cost));
     }
 
     // Dump estimated execution times.
-    TreeMap<Integer, SlaveLoad> ordered = new TreeMap<Integer, SlaveLoad>();
+    TreeMap<Integer, ForkedJvmLoad> ordered = new TreeMap<Integer, ForkedJvmLoad>();
     while (!pq.isEmpty()) {
-      SlaveLoad slave = pq.remove();
-      ordered.put(slave.id, slave);
+      ForkedJvmLoad forkedJvmLoad = pq.remove();
+      ordered.put(forkedJvmLoad.id, forkedJvmLoad);
     }
     for (Integer id : ordered.keySet()) {
-      final SlaveLoad slave = ordered.get(id);
+      final ForkedJvmLoad forkedJvmLoad = ordered.get(id);
       owner.log(String.format(Locale.ROOT, 
           "Expected execution time on JVM J%d: %8.2fs",
-          slave.id,
-          slave.estimatedFinish / 1000.0f), 
+          forkedJvmLoad.id,
+          forkedJvmLoad.estimatedFinish / 1000.0f),
           verbose ? Project.MSG_INFO : Project.MSG_DEBUG);
     }

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/balancers/RoundRobinBalancer.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/balancers/RoundRobinBalancer.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/BootstrapEvent.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/BootstrapEvent.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/EventType.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/EventType.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/IEvent.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/IEvent.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/IdleEvent.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/IdleEvent.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/QuitEvent.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/QuitEvent.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/Serializer.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/Serializer.java Changed

@@ -11,7 +11,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.carrotsearch.ant.tasks.junit4.gson.stream.JsonWriter;
-import com.carrotsearch.ant.tasks.junit4.slave.SlaveMain;
+import com.carrotsearch.ant.tasks.junit4.forked.ForkedMain;
 import com.google.common.base.Charsets;
 
 /**
@@ -55,14 +55,14 @@
             Throwable reason = doForcedShutdown;
             if (reason != null) {
               try {
-                SlaveMain.warn("Unhandled exception in event serialization.", reason);
+                ForkedMain.warn("Unhandled exception in event serialization.", reason);
               } finally {
                 Runtime.getRuntime().halt(0);
               }
             }
           }
         } catch (Throwable t) {
-          SlaveMain.warn("Unreachable code. Complete panic.", t);
+          ForkedMain.warn("Unreachable code. Complete panic.", t);
         }
       }
       
@@ -71,7 +71,7 @@
         return new UncaughtExceptionHandler() {
           @Override
           public void uncaughtException(Thread t, Throwable e) {
-            SlaveMain.warn("Unreachable code. Complete panic.", e);
+            ForkedMain.warn("Unreachable code. Complete panic.", e);
           }
         };
       }
@@ -91,7 +91,7 @@
       // we enqueue the event and continue, serializing them in order.
       events.addLast(event);
       if (events.size() > 1) {
-        // SlaveMain.warn("Serializing " + event.getType() + " (postponed, " + events.size() + " in queue)", null);
+        // ForkedMain.warn("Serializing " + event.getType() + " (postponed, " + events.size() + " in queue)", null);
         return this;
       }
 
@@ -107,11 +107,11 @@
 
     if (isFlushing.getAndSet(true)) {
       // We're already flushing, return.
-      // SlaveMain.warn("Flush queue already flushing", null);
+      // ForkedMain.warn("Flush queue already flushing", null);
       return;
     }
 
-    // SlaveMain.warn("Flush queue start", null);
+    // ForkedMain.warn("Flush queue start", null);
     try {
       while (!events.isEmpty()) {
         if (writer == null) {
@@ -120,7 +120,7 @@
 
         final RemoteEvent event = events.removeFirst();
         try {
-          // SlaveMain.warn("Serializing " + event.getType(), null);
+          // ForkedMain.warn("Serializing " + event.getType(), null);
           AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
             @Override
             public Void run() throws Exception {
@@ -140,7 +140,7 @@
     } finally {
       isFlushing.set(false);
     }
-    // SlaveMain.warn("Flush queue end", null);
+    // ForkedMain.warn("Flush queue end", null);
 
     if (doForcedShutdown != null) {
       // We can't do a stack bang here so any call is a risk of hitting SOE again.
@@ -157,11 +157,11 @@
   public Serializer flush() throws IOException {
     synchronized (lock) {
       if (writer != null) {
-        // SlaveMain.warn("flushing...", null);
+        // ForkedMain.warn("flushing...", null);
         flushQueue();
         writer.flush();
       } else {
-        // SlaveMain.warn("flushing failed (serializer closed)", null);
+        // ForkedMain.warn("flushing failed (serializer closed)", null);
       }
       return this;
     }
@@ -169,7 +169,7 @@
 
   public void close() throws IOException {
     synchronized (lock) {
-      // SlaveMain.warn("closing...", null);
+      // ForkedMain.warn("closing...", null);
       if (writer != null) {
         serialize(new QuitEvent());
         flushQueue();

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatedQuitEvent.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatedQuitEvent.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatedResultEvent.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatedResultEvent.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatedStartEvent.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatedStartEvent.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatedSuiteResultEvent.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatedSuiteResultEvent.java Changed

@@ -25,7 +25,7 @@
 import com.carrotsearch.randomizedtesting.WriterOutputStream;
 
 public class AggregatedSuiteResultEvent implements AggregatedResultEvent {
-  private transient final ForkedJvmInfo slave;
+  private transient final ForkedJvmInfo forkedJvm;
 
   private final long executionTime;
   private final long startTimestamp;
@@ -47,7 +47,7 @@
       long startTimestamp, 
       long executionTime) {
     this.startEvent = startEvent;
-    this.slave = id;
+    this.forkedJvm = id;
     this.tests = tests;
     this.suiteFailures = suiteFailures;
     this.description = description;
@@ -89,8 +89,8 @@
   }
   
   @Override
-  public ForkedJvmInfo getSlave() {
-    return slave;
+  public ForkedJvmInfo getForkedJvmInfo() {
+    return forkedJvm;
   }
 
   @Override
@@ -106,7 +106,7 @@
   }
 
   /**
-   * Execution start timestamp (on the slave).
+   * Execution start timestamp (on the forked JVM).
    */
   public long getStartTimestamp() {
     return startTimestamp;
@@ -164,7 +164,7 @@
   public void serialize(JsonWriter w, boolean outputStreams) throws IOException {
     w.beginObject();
 
-    w.name("slave").value(getSlave().id);
+    w.name("forkedJvm").value(getForkedJvmInfo().id);
     w.name("startTimestamp").value(getStartTimestamp());
 
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS", Locale.ROOT);
@@ -198,7 +198,7 @@
 
   private void serialize(JsonWriter w, SimpleDateFormat sdf, AggregatedTestResultEvent e) throws IOException {
     w.beginObject();
-    w.name("slave").value(e.getSlave().id);
+    w.name("forkedJvm").value(e.getForkedJvmInfo().id);
     w.name("startTimestamp").value(e.getStartTimestamp());
     w.name("startTimestampDate").value(sdf.format(new Date(e.getStartTimestamp())));
     w.name("executionTime").value(e.getExecutionTime());
@@ -237,7 +237,7 @@
   }
 
   private void serializeEvents(JsonWriter w, boolean outputStreams) throws IOException {
-    final Charset charset = getSlave().getCharset();
+    final Charset charset = getForkedJvmInfo().getCharset();
     int lineBuffer = 160;
     final StringWriter out = new StringWriter();
     final StringWriter err = new StringWriter();

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatedSuiteStartedEvent.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatedSuiteStartedEvent.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatedTestResultEvent.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatedTestResultEvent.java Changed

@@ -17,7 +17,7 @@
 public class AggregatedTestResultEvent implements AggregatedResultEvent {
   private final Description suite;
   private final Description description;
-  private final ForkedJvmInfo slave;
+  private final ForkedJvmInfo forkedJvmInfo;
 
   private TestStatus status = TestStatus.OK;
   private List<FailureMirror> failures = new ArrayList<>();
@@ -34,10 +34,10 @@
   /** Associated {@link TestFinishedEvent}. */
   private TestFinishedEvent testFinishedEvent;
 
-  public AggregatedTestResultEvent(ForkedJvmInfo slave, Description suiteDescription, Description description) {
+  public AggregatedTestResultEvent(ForkedJvmInfo forkedJvmInfo, Description suiteDescription, Description description) {
     this.description = description;
     this.suite = suiteDescription;
-    this.slave = slave;
+    this.forkedJvmInfo = forkedJvmInfo;
   }
 
   @Override
@@ -57,8 +57,8 @@
   }
 
   @Override
-  public ForkedJvmInfo getSlave() {
-    return slave;
+  public ForkedJvmInfo getForkedJvmInfo() {
+    return forkedJvmInfo;
   }
 
   @Override
@@ -74,7 +74,7 @@
   }
 
   /**
-   * Execution start timestamp (on the slave).
+   * Execution start timestamp (on the forked JVM).
    */
   public long getStartTimestamp() {
     return testFinishedEvent.getStartTimestamp();

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatingListener.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/AggregatingListener.java Changed

@@ -21,7 +21,7 @@
  */
 public class AggregatingListener {
   private EventBus target;
-  private ForkedJvmInfo slave;
+  private ForkedJvmInfo forkedJvmInfo;
 
   private AggregatedSuiteStartedEvent startEvent;
   private Description lastSuite;
@@ -34,9 +34,9 @@
   /**
    * @param target Which event bus to repost aggregated events to?
    */
-  public AggregatingListener(EventBus target, ForkedJvmInfo slave) {
+  public AggregatingListener(EventBus target, ForkedJvmInfo forkedJvmInfo) {
     this.target = target;
-    this.slave = slave;
+    this.forkedJvmInfo = forkedJvmInfo;
   }
 
   @Subscribe
@@ -45,7 +45,7 @@
       switch (e.getType()) {
         case APPEND_STDOUT:
         case APPEND_STDERR:
-          target.post(new PartialOutputEvent(slave, e));
+          target.post(new PartialOutputEvent(forkedJvmInfo, e));
           // fall through.
         case TEST_STARTED:
         case TEST_FINISHED:
@@ -74,7 +74,7 @@
     }
 
     target.post(new HeartBeatEvent(
-        slave,
+        forkedJvmInfo,
         current,
         e.lastActivity,
         e.currentTime
@@ -90,14 +90,14 @@
     suiteFailures = new ArrayList<>();
     eventStream = new ArrayList<>();
     lastSuite = e.getDescription();
-    startEvent = new AggregatedSuiteStartedEvent(slave, e);
+    startEvent = new AggregatedSuiteStartedEvent(forkedJvmInfo, e);
 
     target.post(startEvent);
   }
 
   @Subscribe
   public void receiveTestStart(TestStartedEvent e) {
-    tests.push(new AggregatedTestResultEvent(slave, lastSuite, e.getDescription()));
+    tests.push(new AggregatedTestResultEvent(forkedJvmInfo, lastSuite, e.getDescription()));
     testStartStreamMarker = eventStream.size();
   }
 
@@ -157,7 +157,7 @@
   public void receiveSuiteEnd(SuiteCompletedEvent e) {
     target.post(new AggregatedSuiteResultEvent(
         startEvent,
-        slave, 
+        forkedJvmInfo,
         e.getDescription(), 
         suiteFailures, 
         Lists.newArrayList(tests.descendingIterator()),

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/ChildBootstrap.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/ChildBootstrap.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/HeartBeatEvent.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/HeartBeatEvent.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/JvmOutputEvent.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/JvmOutputEvent.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/PartialOutputEvent.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/events/aggregated/PartialOutputEvent.java Changed

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/forked Added

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/forked/BeforeAfterRunListenerDecorator.java Added

@@ -0,0 +1,86 @@
+package com.carrotsearch.ant.tasks.junit4.forked;
+
+import java.lang.reflect.Proxy;
+
+import org.junit.runner.Description;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+
+/**
+ * {@link RunListener} decorator that does something before and after a given method call.
+ * A fancier impl. could use a {@link Proxy} but {@link RunListener} is not an interface.
+ */
+public abstract class BeforeAfterRunListenerDecorator extends RunListener {
+  private final RunListener delegate;
+
+  public BeforeAfterRunListenerDecorator(RunListener delegate) {
+    this.delegate = delegate;
+  }
+
+  public final void testRunStarted(Description description) throws Exception {
+    before();
+    try {
+      delegate.testRunStarted(description);
+    } finally {
+      after();
+    }
+  }
+
+  public final void testRunFinished(Result result) throws Exception {
+    before();
+    try {
+      delegate.testRunFinished(result);
+    } finally {
+      after();
+    }
+  }
+
+  public final void testStarted(Description description) throws Exception {
+    before();
+    try {
+      delegate.testStarted(description);
+    } finally {
+      after();
+    }
+  }
+
+  public final void testFinished(Description description) throws Exception {
+    before();
+    try {
+      delegate.testFinished(description);
+    } finally {
+      after();
+    }
+  }
+
+  public final void testFailure(Failure failure) throws Exception {
+    before();
+    try {
+      delegate.testFailure(failure);
+    } finally {
+      after();
+    }
+  }
+
+  public final void testAssumptionFailure(Failure failure) {
+    before();
+    try {
+      delegate.testAssumptionFailure(failure);
+    } finally {
+      after();
+    }
+  }
+
+  public final void testIgnored(Description description) throws Exception {
+    before();
+    try {
+      delegate.testIgnored(description);
+    } finally {
+      after();
+    }
+  }
+
+  protected void after() {}
+  protected void before() {}  
+}

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/forked/EventsOutputStream.java Added

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/forked/ForkedMain.java Added

@@ -0,0 +1,551 @@
+package com.carrotsearch.ant.tasks.junit4.forked;
+
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.RandomAccessFile;
+import java.io.Writer;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.runner.Description;
+import org.junit.runner.Request;
+import org.junit.runner.Result;
+import org.junit.runner.Runner;
+import org.junit.runner.manipulation.Filter;
+import org.junit.runner.manipulation.NoTestsRemainException;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+import org.junit.runner.notification.RunNotifier;
+
+import com.carrotsearch.ant.tasks.junit4.events.AppendStdErrEvent;
+import com.carrotsearch.ant.tasks.junit4.events.AppendStdOutEvent;
+import com.carrotsearch.ant.tasks.junit4.events.BootstrapEvent;
+import com.carrotsearch.ant.tasks.junit4.events.Serializer;
+import com.carrotsearch.ant.tasks.junit4.events.SuiteFailureEvent;
+import com.carrotsearch.randomizedtesting.MethodGlobFilter;
+import com.carrotsearch.randomizedtesting.SysGlobals;
+import com.carrotsearch.randomizedtesting.annotations.SuppressForbidden;
+import com.google.common.base.Strings;
+import com.google.common.collect.Iterators;
+
+/**
+ * A forked JVM process running the actual tests on the target JVM.
+ */
+public class ForkedMain {
+  /** Runtime exception. */
+  public static final int ERR_EXCEPTION = 240;
+
+  /** No JUnit on classpath. */
+  public static final int ERR_NO_JUNIT = 239;
+
+  /** Old JUnit on classpath. */
+  public static final int ERR_OLD_JUNIT = 238;
+
+  /** OOM */
+  public static final int ERR_OOM = 237;
+
+  /**
+   * Last resort memory pool released under low memory conditions.
+   * This is not a solution, it's a terrible hack. I know this. Everyone knows this.
+   * Even monkeys in Madagaskar know this. If you know a better solution, patches
+   * welcome. 
+   * 
+   * <p>Approximately 5mb is reserved. Really, smaller values don't make any difference
+   * and the JVM fails to even return the status passed to Runtime.halt().
+   */
+  static volatile Object lastResortMemory = new byte 1024 * 1024 * 5;
+
+  /**
+   * Preallocate and load in advance. 
+   */
+  static Class<OutOfMemoryError> oomClass = OutOfMemoryError.class;
+  
+  /**
+   * Frequent event strean flushing.
+   */
+  public static final String OPTION_FREQUENT_FLUSH = "-flush";
+
+  /**
+   * Multiplex sysout and syserr to original streams (aside from
+   * pumping them to event stream).
+   */
+  public static final String OPTION_SYSOUTS = "-sysouts";
+
+  /**
+   * Read class names from standard input.
+   */
+  public static final String OPTION_STDIN = "-stdin";
+
+  /**
+   * Name the sink for events. If given, accepts one argument - name of a file
+   * to which events should be dumped. The file has to be initially empty!
+   */
+  public static final String OPTION_EVENTSFILE = "-eventsfile";
+
+  /**
+   * Should the debug stream from the runner be created? It's named after the events file
+   * with <code>.debug</code> suffix.
+   */
+  public static final String OPTION_DEBUGSTREAM = "-debug";
+
+  /**
+   * User-defined RunListener classes.
+   */
+  public static final String OPTION_RUN_LISTENERS = "-runListeners";
+
+  /**
+   * Fire a runner failure after startup to verify messages
+   * are propagated properly. Not really useful in practice...
+   */
+  public static final String SYSPROP_FIRERUNNERFAILURE =
+      ForkedMain.class.getName() + ".fireRunnerFailure";
+
+  /**
+   * Delay the initial bootstrap event from the forked JVM 
+   * (used in tests).
+   */
+  public static final String SYSPROP_FORKEDJVM_DELAY_MS =
+      "junit4.tests.internal.initialDelayMs";
+
+  /**
+   * Event sink.
+   */
+  private final Serializer serializer;
+
+  /** A sink for warnings (non-event stream). */
+  private static PrintStream warnings;
+
+  /** Flush serialization stream frequently. */
+  private boolean flushFrequently = false;
+
+  /** Debug stream to flush progress information to. */
+  private File debugMessagesFile;
+
+  /** List of RunListener classes */
+  private String runListeners;
+
+  /** 
+   * Multiplex calls to System streams to both event stream
+   * and the original streams?
+   */
+  private static boolean multiplexStdStreams = false;
+
+  /**
+   * Base for redirected streams. 
+   */
+  private static class ChunkedStream extends OutputStream {
+    public void write(int b) throws IOException {
+      throw new IOException("Only buffered write(byte,int,int) calls expected from super stream.");
+    }
+    
+    @Override
+    public void close() throws IOException {
+      throw new IOException("Not supposed to be called on redirected streams.");
+    }
+  }
+
+  /**
+   * Creates a forked JVM emitting events to the given serializer.
+   */
+  public ForkedMain(Serializer serializer) {
+    this.serializer = serializer;
+  }
+
+  /**
+   * Execute tests.
+   */
+  private void execute(Iterator<String> classNames) throws Throwable {
+    final RunNotifier fNotifier = new OrderedRunNotifier();
+    final Result result = new Result();
+    final Writer debug = debugMessagesFile == null ? new NullWriter() : new OutputStreamWriter(new FileOutputStream(debugMessagesFile), "UTF-8");
+
+    fNotifier.addListener(result.createListener());
+
+    fNotifier.addListener(
+        new StreamFlusherDecorator(
+            new NoExceptionRunListenerDecorator(new RunListenerEmitter(serializer)) {
+              @Override
+              protected void exception(Throwable t) {
+                warn("Event serializer exception.", t);
+              }
+            }));
+
+    fNotifier.addListener(new RunListener() {
+      public void testRunFinished(Result result) throws Exception {
+        debug(debug, "testRunFinished(T:" + result.getRunCount() + ";F:" + result.getFailureCount() + ";I:" + result.getIgnoreCount() + ")");
+        serializer.flush();
+      }
+
+      @Override
+      public void testRunStarted(Description description) throws Exception {
+        debug(debug, "testRunStarted(" + description + ")");
+        serializer.flush();
+      }
+

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/forked/ForkedMainSafe.java Added

@@ -0,0 +1,39 @@
+package com.carrotsearch.ant.tasks.junit4.forked;
+
+import java.io.Serializable;
+
+import com.carrotsearch.randomizedtesting.annotations.SuppressForbidden;
+
+@SuppressForbidden("legitimate sysstreams.")
+public class ForkedMainSafe {
+  public static void main(String args) {
+    verifyJUnit4Present();
+
+    try {
+      ForkedMain.main(args);
+    } catch (Throwable e) {
+      try  {
+        System.err.println(e.toString());
+        e.printStackTrace(System.err);
+        System.out.close();
+        System.err.close();
+      } finally {
+        JvmExit.halt(ForkedMain.ERR_EXCEPTION);
+      }
+    }
+  }
+
+  /**
+   * Verify JUnit presence and version.
+   */
+  private static void verifyJUnit4Present() {
+    try {
+      Class<?> clazz = Class.forName("org.junit.runner.Description");
+      if (!Serializable.class.isAssignableFrom(clazz)) {
+        JvmExit.halt(ForkedMain.ERR_OLD_JUNIT);
+      }
+    } catch (ClassNotFoundException e) {
+      JvmExit.halt(ForkedMain.ERR_NO_JUNIT);
+    }
+  }  
+}

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/forked/JvmExit.java Added

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/forked/NoExceptionRunListenerDecorator.java Added

@@ -0,0 +1,78 @@
+package com.carrotsearch.ant.tasks.junit4.forked;
+
+import java.lang.reflect.Proxy;
+
+import org.junit.runner.Description;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+
+/**
+ * {@link RunListener} decorator that does something before and after a given method call.
+ * A fancier impl. could use a {@link Proxy} but {@link RunListener} is not an interface.
+ */
+public abstract class NoExceptionRunListenerDecorator extends RunListener {
+  private final RunListener delegate;
+  
+  public NoExceptionRunListenerDecorator(RunListener delegate) {
+    this.delegate = delegate;
+  }
+
+  public final void testRunStarted(Description description) throws Exception {
+    try {
+      delegate.testRunStarted(description);
+    } catch (Throwable t) {
+      exception(t);
+    }
+  }
+
+  public final void testRunFinished(Result result) throws Exception {
+    try {
+      delegate.testRunFinished(result);
+    } catch (Throwable t) {
+      exception(t);
+    }
+  }
+
+  public final void testStarted(Description description) throws Exception {
+    try {
+      delegate.testStarted(description);
+    } catch (Throwable t) {
+      exception(t);
+    }
+  }
+
+  public final void testFinished(Description description) throws Exception {
+    try {
+      delegate.testFinished(description);
+    } catch (Throwable t) {
+      exception(t);
+    }
+  }
+
+  public final void testFailure(Failure failure) throws Exception {
+    try {
+      delegate.testFailure(failure);
+    } catch (Throwable t) {
+      exception(t);
+    }
+  }
+
+  public final void testAssumptionFailure(Failure failure) {
+    try {
+      delegate.testAssumptionFailure(failure);
+    } catch (Throwable t) {
+      exception(t);
+    }
+  }
+
+  public final void testIgnored(Description description) throws Exception {
+    try {
+      delegate.testIgnored(description);
+    } catch (Throwable t) {
+      exception(t);
+    }
+  }
+
+  protected abstract void exception(Throwable t);
+}

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/forked/NullWriter.java Added

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/forked/OrderedRunNotifier.java Added

@@ -0,0 +1,194 @@
+package com.carrotsearch.ant.tasks.junit4.forked;
+
+import java.util.*;
+
+import org.junit.internal.AssumptionViolatedException;
+import org.junit.runner.Description;
+import org.junit.runner.Result;
+import org.junit.runner.notification.*;
+
+public class OrderedRunNotifier extends RunNotifier {
+  /**
+   * A linked list is more convenient for descending iterators. 
+   */
+  private final LinkedList<RunListener> listeners = new LinkedList<RunListener>();
+  private volatile boolean stopRequested = false;
+
+  /**
+   * Add a listener at the end of the listener list.
+   */
+  public void addListener(RunListener listener) {
+    synchronized (listeners) {
+      listeners.add(listener);
+    }
+  }
+  
+  /**
+   * Adds a listener at the head of the listener list.
+   */
+  public void addFirstListener(RunListener listener) {
+    synchronized (listeners) {
+      listeners.addFirst(listener);
+    }
+  }
+
+  /**
+   * Remove a listener from the listener list.
+   */
+  public void removeListener(RunListener listener) {
+    synchronized (listeners) {
+      listeners.remove(listener);
+    }
+  }
+  
+  /**
+   * Notify listeners in the requested order
+   */
+  private abstract class SafeNotifier {
+    void run() {
+      run(false);
+    }
+
+    void run(boolean reversedOrder) {
+      synchronized (listeners) {
+        final Iterator<RunListener> i;
+        if (reversedOrder) {
+          i = listeners.descendingIterator();
+        } else {
+          i = listeners.iterator();
+        }
+
+        while (i.hasNext()) {
+          try {
+            notifyListener(i.next());
+          } catch (Exception e) {
+            i.remove(); // Remove the offending listener.
+            fireTestFailure(new Failure(Description.TEST_MECHANISM, e));
+          }
+        }
+      }
+    }
+
+    abstract protected void notifyListener(RunListener each) throws Exception;
+  }
+
+  /**
+   * Do not invoke.
+   */
+  public void fireTestRunStarted(final Description description) {
+    new SafeNotifier() {
+      @Override
+      protected void notifyListener(RunListener each) throws Exception {
+        each.testRunStarted(description);
+      };
+    }.run();
+  }
+  
+  /**
+   * Do not invoke.
+   */
+  public void fireTestRunFinished(final Result result) {
+    new SafeNotifier() {
+      @Override
+      protected void notifyListener(RunListener each) throws Exception {
+        each.testRunFinished(result);
+      };
+    }.run(true);
+  }
+  
+  /**
+   * Invoke to tell listeners that an atomic test is about to start.
+   * 
+   * @param description
+   *          the description of the atomic test (generally a class and method
+   *          name)
+   * @throws StoppedByUserException
+   *           thrown if a user has requested that the test run stop
+   */
+  public void fireTestStarted(final Description description) throws StoppedByUserException {
+    if (stopRequested) throw new StoppedByUserException();
+
+    new SafeNotifier() {
+      @Override
+      protected void notifyListener(RunListener each) throws Exception {
+        each.testStarted(description);
+      };
+    }.run();
+  }
+  
+  /**
+   * Invoke to tell listeners that an atomic test failed.
+   * 
+   * @param failure
+   *          the description of the test that failed and the exception thrown
+   */
+  public void fireTestFailure(final Failure failure) {
+    new SafeNotifier() {
+      @Override
+      protected void notifyListener(RunListener each) throws Exception {
+        each.testFailure(failure);
+      };
+    }.run(true);
+  }
+  
+  /**
+   * Invoke to tell listeners that an atomic test flagged that it assumed
+   * something false.
+   * 
+   * @param failure
+   *          the description of the test that failed and the
+   *          {@link AssumptionViolatedException} thrown
+   */
+  public void fireTestAssumptionFailed(final Failure failure) {
+    new SafeNotifier() {
+      @Override
+      protected void notifyListener(RunListener each) throws Exception {
+        each.testAssumptionFailure(failure);
+      };
+    }.run(true);
+  }
+  
+  /**
+   * Invoke to tell listeners that an atomic test was ignored.
+   * 
+   * @param description
+   *          the description of the ignored test
+   */
+  public void fireTestIgnored(final Description description) {
+    new SafeNotifier() {
+      @Override
+      protected void notifyListener(RunListener each) throws Exception {
+        each.testIgnored(description);
+      }
+    }.run(true);
+  }
+  
+  /**
+   * Invoke to tell listeners that an atomic test finished. Always invoke
+   * {@link #fireTestFinished(Description)} if you invoke
+   * {@link #fireTestStarted(Description)} as listeners are likely to expect
+   * them to come in pairs.
+   * 
+   * @param description
+   *          the description of the test that finished
+   */
+  public void fireTestFinished(final Description description) {
+    new SafeNotifier() {
+      @Override
+      protected void notifyListener(RunListener each) throws Exception {
+        each.testFinished(description);
+      };
+    }.run(true);
+  }
+  
+  /**
+   * Ask that the tests run stop before starting the next test. Phrased politely
+   * because the test currently running will not be interrupted. It seems a
+   * little odd to put this functionality here, but the <code>RunNotifier</code>
+   * is the only object guaranteed to be shared amongst the many runners
+   * involved.
+   */
+  public void pleaseStop() {
+    stopRequested = true;
+  }
+}

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/forked/RunListenerEmitter.java Added

@@ -0,0 +1,123 @@
+package com.carrotsearch.ant.tasks.junit4.forked;
+
+import java.io.IOException;
+
+import org.junit.Ignore;
+import org.junit.runner.Description;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+
+import com.carrotsearch.ant.tasks.junit4.events.*;
+
+/**
+ * Serialize test execution events. Attempts to handle
+ * certain corner cases that are not cleanly handled by
+ * JUnit itself (reporting the cause of ignored methods, 
+ * etc.).
+ */
+public class RunListenerEmitter extends RunListener {
+  private final Serializer serializer;
+  private Description suiteDescription;
+  private long start;
+  private long suiteStart;
+
+  /** 
+   * A failure signaled at the suite level. Most likely will result
+   * in ignored methods.
+   */
+  private Failure suiteAssumption;
+
+  public RunListenerEmitter(Serializer serializer) {
+    this.serializer = serializer;
+  }
+
+  @Override
+  public void testRunStarted(Description description) throws Exception {
+    this.suiteDescription = description;
+    this.suiteStart = System.currentTimeMillis();
+    this.suiteAssumption = null;
+    serializer.serialize(new SuiteStartedEvent(description, suiteStart));
+  }
+
+  @Override
+  public void testStarted(Description description) throws Exception {
+    serializer.serialize(new TestStartedEvent(description));
+    start = System.currentTimeMillis();
+  }
+
+  @Override
+  public void testFailure(Failure failure) throws Exception {
+    if (suiteDescription.equals(failure.getDescription())) {
+      serializer.serialize(new SuiteFailureEvent(failure));
+    } else {
+      serializer.serialize(new TestFailureEvent(failure));
+    }
+  }
+
+  @Override
+  public void testAssumptionFailure(Failure failure) {
+    try {
+      // Check for class-level assumption failures that may result
+      // in message-less ignored tests. See GH-103. 
+      if (suiteDescription != null && 
+          suiteDescription.equals(failure.getDescription())) {
+        suiteAssumption = failure;
+      }
+
+      serializer.serialize(new TestIgnoredAssumptionEvent(failure));
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  public void testIgnored(Description description) throws Exception {
+    if (suiteDescription.equals(description)) {
+      // JUnitCore has built-in precedence of runners and handles @Ignore
+      // with a different runner, regardless of what is declared in @RunWith. This is
+      // bad.
+    } else {
+      // GH-82: try to determine the reason why the test has been ignored and populate
+      // the cause message. This really should be passed from the runner but the API does
+      // not allow it.
+      String cause = "Unknown reason for ignore status.";
+      
+      // GH-103: check suite-level assumptions.
+      if (suiteAssumption != null) {
+        String msg = suiteAssumption.getMessage();
+        cause = (msg != null ? msg : "Class assumption-ignored.");
+      }
+
+      try {
+        Ignore ignoreAnn = description.getAnnotation(Ignore.class);
+        if ((ignoreAnn = description.getAnnotation(Ignore.class)) != null) {
+          cause = "Annotated @Ignore(" + ignoreAnn.value() + ")"; 
+        } else {
+          // Try class.
+          ignoreAnn = description.getTestClass().getAnnotation(Ignore.class);
+          if (ignoreAnn != null) {
+            cause = "Class annotated @Ignore(" + ignoreAnn.value() + ")";
+          }
+        }
+      } catch (Throwable t) {
+        // Never fail on this.
+      }
+      serializer.serialize(new TestIgnoredEvent(description, cause));
+    }
+  }
+
+  @Override
+  public void testFinished(Description description) throws Exception {
+    long executionTime = System.currentTimeMillis() - start;
+    serializer.serialize(new TestFinishedEvent(description, executionTime, start));
+  }
+
+  @Override
+  public void testRunFinished(Result result) throws Exception {
+    suiteAssumption = null;
+    final long duration = System.currentTimeMillis() - suiteStart;
+    serializer.serialize(
+        new SuiteCompletedEvent(suiteDescription, suiteStart, duration));
+  }  
+}

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/forked/StdInLineIterator.java Added

@@ -0,0 +1,37 @@
+package com.carrotsearch.ant.tasks.junit4.forked;
+
+import java.io.*;
+import java.nio.charset.Charset;
+
+import com.carrotsearch.ant.tasks.junit4.events.IdleEvent;
+import com.carrotsearch.ant.tasks.junit4.events.Serializer;
+import com.google.common.collect.AbstractIterator;
+
+/**
+ * Iterates over lines from standard input. 
+ */
+class StdInLineIterator extends AbstractIterator<String> {
+  private BufferedReader reader;
+  private Serializer serializer;
+
+  public StdInLineIterator(Serializer serializer) {
+    this.serializer = serializer;
+    this.reader = new BufferedReader(
+      new InputStreamReader(
+          System.in,
+          Charset.defaultCharset()));
+  }
+
+  @Override
+  protected String computeNext() {
+    try {
+      serializer.serialize(new IdleEvent());
+      serializer.flush();
+
+      String line = reader.readLine();
+      return line != null ? line : endOfData();
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/forked/StreamFlusherDecorator.java Added

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/listeners/StackTraceFilter.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/listeners/StackTraceFilter.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/listeners/TextReport.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/listeners/TextReport.java Changed

@@ -367,9 +367,9 @@
     logShort("Executing " +
         totalSuites + Pluralize.pluralize(totalSuites, " suite") +
         " with " + 
-        e.getSlaveCount() + Pluralize.pluralize(e.getSlaveCount(), " JVM") + ".\n", false);
+        e.getForkedJvmCount() + Pluralize.pluralize(e.getForkedJvmCount(), " JVM") + ".\n", false);
 
-    forkedJvmCount = e.getSlaveCount();
+    forkedJvmCount = e.getForkedJvmCount();
     jvmIdFormat = " J%-" + (1 + (int) Math.floor(Math.log10(forkedJvmCount))) + "d";
 
     outWriter = new PrefixedWriter(stdoutIndent, output, DEFAULT_MAX_LINE_WIDTH);
@@ -378,12 +378,12 @@
 
   @Subscribe
   public void onChildBootstrap(ChildBootstrap e) throws IOException {
-      logShort("Started J" + e.getSlave().id + " PID(" + e.getSlave().getPidString() + ").");
+      logShort("Started J" + e.getForkedJvmInfo().id + " PID(" + e.getForkedJvmInfo().getPidString() + ").");
   }
 
   @Subscribe
   public void onHeartbeat(HeartBeatEvent e) throws IOException {
-      logShort("HEARTBEAT J" + e.getSlave().id + " PID(" + e.getSlave().getPidString() + "): " +
+      logShort("HEARTBEAT J" + e.getForkedJvmInfo().id + " PID(" + e.getForkedJvmInfo().getPidString() + "): " +
           formatTime(e.getCurrentTime()) + ", stalled for " +
           formatDurationInSeconds(e.getNoEventDuration()) + " at: " +
           (e.getDescription() == null ? "<unknown>" : formatDescription(e.getDescription())));
@@ -414,7 +414,7 @@
 
   @Subscribe
   public void onSuiteStart(AggregatedSuiteStartedEvent e) throws IOException {
-    final Charset charset = e.getSlave().getCharset();
+    final Charset charset = e.getForkedJvmInfo().getCharset();
     outStream = new WriterOutputStream(outWriter, charset, DEFAULT_MAX_LINE_WIDTH, true);
     errStream = new WriterOutputStream(errWriter, charset, DEFAULT_MAX_LINE_WIDTH, true);
 
@@ -443,11 +443,11 @@
 
   @Subscribe
   public void onJvmOutput(JvmOutputEvent e) throws IOException {
-    final String id = Integer.toString(e.getSlave().id);
+    final String id = Integer.toString(e.getForkedJvmInfo().id);
     output.append(">>> JVM J").append(id)
           .append(" emitted unexpected output (verbatim) ----\n");
 
-    try (Reader r = Files.newReader(e.getJvmOutputFile(), e.getSlave().getCharset())) {
+    try (Reader r = Files.newReader(e.getJvmOutputFile(), e.getForkedJvmInfo().getCharset())) {
       CharStreams.copy(r, output);
     }
     output.append("<<< JVM J" + id + ": EOF ----\n");    
@@ -575,7 +575,7 @@
         suitesCompleted,
         totalSuites,
         totalErrors == 0 ? "" : " (" + totalErrors + "!)",
-        e.getSlave().slaves > 1 ? " on J" + e.getSlave().id : "",
+        e.getForkedJvmInfo().forkedJvmCount > 1 ? " on J" + e.getForkedJvmInfo().id : "",
         e.getExecutionTime() / 1000.0d));
     b.append(e.getTests().size()).append(Pluralize.pluralize(e.getTests().size(), " test"));
 
@@ -612,7 +612,7 @@
     line.append(Strings.padEnd(statusNames.get(status), 8, ' '));
     line.append(formatDurationInSeconds(timeMillis));
     if (forkedJvmCount > 1) {
-      line.append(String.format(Locale.ROOT, jvmIdFormat, result.getSlave().id));
+      line.append(String.format(Locale.ROOT, jvmIdFormat, result.getForkedJvmInfo().id));
     }
     line.append(" | ");

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/listeners/antxml/AntXmlReport.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/listeners/antxml/AntXmlReport.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/listeners/json/JsonReport.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/java/com/carrotsearch/ant/tasks/junit4/listeners/json/JsonReport.java Changed

@@ -40,7 +40,7 @@
 
   private String projectName;
   
-  private Map<Integer, ForkedJvmInfo> slaves = new TreeMap<>();
+  private Map<Integer, ForkedJvmInfo> forkedJvms = new TreeMap<>();
   private OutputStreamWriter writer;
 
   private static enum OutputMethod {
@@ -202,7 +202,7 @@
       if (jsonWriter == null)
         return;
 
-      slaves.put(e.getSlave().id, e.getSlave());
+      forkedJvms.put(e.getForkedJvmInfo().id, e.getForkedJvmInfo());
       e.serialize(jsonWriter, outputStreams);
     } catch (Exception ex) {
       ex.printStackTrace();
@@ -231,9 +231,9 @@
     try {
       jsonWriter.endArray();
 
-      jsonWriter.name("slaves");
+      jsonWriter.name("forkedJvms");
       jsonWriter.beginObject();
-      for (Map.Entry<Integer, ForkedJvmInfo> entry : slaves.entrySet()) {
+      for (Map.Entry<Integer, ForkedJvmInfo> entry : forkedJvms.entrySet()) {
         jsonWriter.name(Integer.toString(entry.getKey()));
         entry.getValue().serialize(jsonWriter);
       }

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/resources/com/carrotsearch/ant/tasks/junit4/templates/json/css/style.css -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/resources/com/carrotsearch/ant/tasks/junit4/templates/json/css/style.css Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/resources/com/carrotsearch/ant/tasks/junit4/templates/json/ideas.txt -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/resources/com/carrotsearch/ant/tasks/junit4/templates/json/ideas.txt Changed

@@ -7,7 +7,7 @@
 
 * Console output generated by package, class and method
 * Unified (linear) console log view across all tests (alternative to package/class/method view)
-* Showing information about slaves
+* Showing information about forked JVMs
 * Showing RR-specific annotations
 * Indication next to package/class/method that there was console output
 * Display of global overrides
@@ -19,8 +19,7 @@
     * repetitions
     * timeout
     * expected exceptions
-  * slave
-  * staus: ok, ignored by assumption, ignored by annotation, failed, error
+  * status: ok, ignored by assumption, ignored by annotation, failed, error
   * execution time
   * stack trace
   * console output
@@ -51,7 +50,7 @@
 * Generation of markup in JS makes things easy, but is terrible for indexing in search engines.
   Maybe there should be some pre-rendered version as well?
 
-* Showing aggregations by the slave they ran on (like by package/method)?
+* Showing aggregations by the forked they ran on (like by package/method)?
 
 * Mobile version?
 
@@ -70,7 +69,7 @@
 
 DONE:
 
-* Showing test in the execution order (only in method view), per slave order
+* Showing test in the execution order (only in method view), per forked jvm order
 * Showing failing tests first (if any test failed/errored)
 * General indication of ok / failure in document title
 * A "bulb" indication of general ok / failure (green/red, like in Bamboo)

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/resources/com/carrotsearch/ant/tasks/junit4/templates/json/js/script.js -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/resources/com/carrotsearch/ant/tasks/junit4/templates/json/js/script.js Changed

@@ -138,7 +138,7 @@
       if (suite.suiteFailures.length > 0) {
         $.each(suite.suiteFailures, function(i, failure) {
           suite.tests.push({
-            slave: suite.slave,
+            forkedJvm: suite.forkedJvm,
             startTimestamp: suite.startTimestamp,
             executionTime: 1,
             description: {
@@ -349,7 +349,7 @@
             },
             type: "result"
           },
-          numericColumn("slave", "JVM"),
+          numericColumn("forkedJvm", "JVM"),
           {
             id: "timestamp",
             label: "Start",
@@ -388,7 +388,7 @@
               signature: test.description.packageClassMethodName,
               result: test.status,
               time: test.executionTime,
-              slave: test.slave,
+              forkedJvm: test.forkedJvm,
               timestamp: test.startTimestamp,
               test: test
             })
@@ -761,7 +761,7 @@
   // Refreshes the summary box based on the current parameters
   function refreshSummary() {
     var counts = aggregate(data, testCount, { "global":global, "byStatus":byStatus }, currentFilter);
-    var times = aggregate(data, totalTime, { "global":global, "bySlave":bySlave }, currentFilter);
+    var times = aggregate(data, totalTime, { "global":global, "byForkedJvm":byForkedJvm }, currentFilter);
 
     var $summary = $("#summary").html("").attr("class", "");
     if ((counts.global || 0) == 0) {
@@ -771,10 +771,10 @@
     $("<p />").html(tmpl("\
         #{tests} executed in\
         #{time} ms on\
-        <a href='#'>#{slaves}</a>.", {
+        <a href='#'>#{forkedJvms}</a>.", {
       tests: countText(counts.global || 0, "test"),
       time: times.global,
-      slaves: countText(keys(times.bySlave).length, "slave")
+      forkedJvms: countText(keys(times.byForkedJvm).length, "forked JVM")
     })).appendTo($summary);
 
     var html = "";
@@ -1093,8 +1093,8 @@
     return test.status;
   }
 
-  function bySlave(test) {
-    return test.slave;
+  function byForkedJvm(test) {
+    return test.forkedJvm;
   }
 
   function byPackage(test) {

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/resources/com/carrotsearch/ant/tasks/junit4/templates/json/report.json Added

@@ -0,0 +1,643 @@
+{
+  "junit4": {
+    "tests.seed": "84784D1BB9382FB8",
+    "project.name": "junit4"
+  },
+  "suites": 
+    {
+      "forkedJvm": 0,
+      "startTimestamp": 1656407943240,
+      "startTimestampDate": "2022-06-28T11:19:03.240",
+      "executionTime": 11,
+      "description": {
+        "id": "ID#com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+        "displayName": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+        "methodName": null,
+        "className": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+        "children": 
+          {
+            "id": "ID#failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "displayName": "failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "methodName": "failure",
+            "className": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+            "children": 
+          },
+          {
+            "id": "ID#ok(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "displayName": "ok(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "methodName": "ok",
+            "className": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+            "children": 
+          },
+          {
+            "id": "ID#error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "displayName": "error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "methodName": "error",
+            "className": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+            "children": 
+          },
+          {
+            "id": "ID#ignored_a(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "displayName": "ignored_a(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "methodName": "ignored_a",
+            "className": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+            "children": 
+          },
+          {
+            "id": "ID#ignored(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "displayName": "ignored(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "methodName": "ignored",
+            "className": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+            "children": 
+          }
+        
+      },
+      "tests": 
+        {
+          "forkedJvm": 0,
+          "startTimestamp": 1656407943243,
+          "startTimestampDate": "2022-06-28T11:19:03.243",
+          "executionTime": 4,
+          "description": "ID#failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "status": "FAILURE",
+          "testFailures": 
+            {
+              "throwableClass": "java.lang.AssertionError",
+              "throwableString": "java.lang.AssertionError",
+              "stackTrace": "java.lang.AssertionError\r\n\tat org.junit.Assert.fail(Assert.java:87)\r\n\tat org.junit.Assert.assertTrue(Assert.java:42)\r\n\tat org.junit.Assert.assertTrue(Assert.java:53)\r\n\tat com.carrotsearch.ant.tasks.junit4.tests.TestStatuses.failure(TestStatuses.java:24)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n\tat java.lang.reflect.Method.invoke(Method.java:498)\r\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)\r\n\tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\r\n\tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)\r\n\tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)\r\n\tat org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)\r\n\tat org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)\r\n\tat org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)\r\n\tat org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)\r\n\tat org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)\r\n\tat org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.ParentRunner.run(ParentRunner.java:413)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.execute(ForkedMain.java:265)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.main(ForkedMain.java:390)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMainSafe.main(ForkedMainSafe.java:13)\r\n",
+              "kind": "assertion"
+            }
+          
+        },
+        {
+          "forkedJvm": 0,
+          "startTimestamp": 1656407943247,
+          "startTimestampDate": "2022-06-28T11:19:03.247",
+          "executionTime": 0,
+          "description": "ID#ok(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "status": "OK",
+          "testFailures": 
+        },
+        {
+          "forkedJvm": 0,
+          "startTimestamp": 1656407943247,
+          "startTimestampDate": "2022-06-28T11:19:03.247",
+          "executionTime": 1,
+          "description": "ID#error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "status": "ERROR",
+          "testFailures": 
+            {
+              "throwableClass": "java.lang.RuntimeException",
+              "throwableString": "java.lang.RuntimeException",
+              "stackTrace": "java.lang.RuntimeException\r\n\tat com.carrotsearch.ant.tasks.junit4.tests.TestStatuses.error(TestStatuses.java:29)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n\tat java.lang.reflect.Method.invoke(Method.java:498)\r\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)\r\n\tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\r\n\tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)\r\n\tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)\r\n\tat org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)\r\n\tat org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)\r\n\tat org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)\r\n\tat org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)\r\n\tat org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)\r\n\tat org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.ParentRunner.run(ParentRunner.java:413)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.execute(ForkedMain.java:265)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.main(ForkedMain.java:390)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMainSafe.main(ForkedMainSafe.java:13)\r\n",
+              "kind": "error"
+            }
+          
+        },
+        {
+          "forkedJvm": 0,
+          "startTimestamp": 1656407943248,
+          "startTimestampDate": "2022-06-28T11:19:03.248",
+          "executionTime": 3,
+          "description": "ID#ignored_a(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "status": "IGNORED_ASSUMPTION",
+          "testFailures": 
+            {
+              "throwableClass": "org.junit.AssumptionViolatedException",
+              "throwableString": "org.junit.AssumptionViolatedException: got: <false>, expected: is <true>",
+              "stackTrace": "org.junit.AssumptionViolatedException: got: <false>, expected: is <true>\r\n\tat org.junit.Assume.assumeThat(Assume.java:106)\r\n\tat org.junit.Assume.assumeTrue(Assume.java:50)\r\n\tat com.carrotsearch.ant.tasks.junit4.tests.TestStatuses.ignored_a(TestStatuses.java:19)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n\tat java.lang.reflect.Method.invoke(Method.java:498)\r\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)\r\n\tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\r\n\tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)\r\n\tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)\r\n\tat org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)\r\n\tat org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)\r\n\tat org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)\r\n\tat org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)\r\n\tat org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)\r\n\tat org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.ParentRunner.run(ParentRunner.java:413)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.execute(ForkedMain.java:265)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.main(ForkedMain.java:390)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMainSafe.main(ForkedMainSafe.java:13)\r\n",
+              "kind": "assumption"
+            }
+          
+        },
+        {
+          "forkedJvm": 0,
+          "startTimestamp": 1656407943251,
+          "startTimestampDate": "2022-06-28T11:19:03.251",
+          "executionTime": 0,
+          "description": "ID#ignored(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "status": "IGNORED",
+          "testFailures": 
+        }
+      ,
+      "suiteFailures": ,
+      "executionEvents": 
+        {
+          "event": "TEST_STARTED",
+          "description": "ID#failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_FAILURE",
+          "description": "ID#failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "failure": {
+            "description": "ID#failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "message": null,
+            "trace": "java.lang.AssertionError\r\n\tat org.junit.Assert.fail(Assert.java:87)\r\n\tat org.junit.Assert.assertTrue(Assert.java:42)\r\n\tat org.junit.Assert.assertTrue(Assert.java:53)\r\n\tat com.carrotsearch.ant.tasks.junit4.tests.TestStatuses.failure(TestStatuses.java:24)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n\tat java.lang.reflect.Method.invoke(Method.java:498)\r\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)\r\n\tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\r\n\tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)\r\n\tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)\r\n\tat org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)\r\n\tat org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)\r\n\tat org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)\r\n\tat org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)\r\n\tat org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)\r\n\tat org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.ParentRunner.run(ParentRunner.java:413)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.execute(ForkedMain.java:265)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.main(ForkedMain.java:390)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMainSafe.main(ForkedMainSafe.java:13)\r\n",
+            "throwableString": "java.lang.AssertionError",
+            "throwableClass": "java.lang.AssertionError",
+            "assertionViolation": true,
+            "assumptionViolation": false
+          }
+        },
+        {
+          "event": "TEST_FINISHED",
+          "description": "ID#failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_STARTED",
+          "description": "ID#ok(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_FINISHED",
+          "description": "ID#ok(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_STARTED",
+          "description": "ID#error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_FAILURE",
+          "description": "ID#error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "failure": {
+            "description": "ID#error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "message": null,
+            "trace": "java.lang.RuntimeException\r\n\tat com.carrotsearch.ant.tasks.junit4.tests.TestStatuses.error(TestStatuses.java:29)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n\tat java.lang.reflect.Method.invoke(Method.java:498)\r\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)\r\n\tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\r\n\tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)\r\n\tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)\r\n\tat org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)\r\n\tat org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)\r\n\tat org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)\r\n\tat org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)\r\n\tat org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)\r\n\tat org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.ParentRunner.run(ParentRunner.java:413)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.execute(ForkedMain.java:265)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.main(ForkedMain.java:390)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMainSafe.main(ForkedMainSafe.java:13)\r\n",
+            "throwableString": "java.lang.RuntimeException",
+            "throwableClass": "java.lang.RuntimeException",
+            "assertionViolation": false,
+            "assumptionViolation": false
+          }
+        },
+        {
+          "event": "TEST_FINISHED",
+          "description": "ID#error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_STARTED",
+          "description": "ID#ignored_a(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_IGNORED_ASSUMPTION",
+          "description": "ID#ignored_a(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "failure": {
+            "description": "ID#ignored_a(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "message": "got: <false>, expected: is <true>",
+            "trace": "org.junit.AssumptionViolatedException: got: <false>, expected: is <true>\r\n\tat org.junit.Assume.assumeThat(Assume.java:106)\r\n\tat org.junit.Assume.assumeTrue(Assume.java:50)\r\n\tat com.carrotsearch.ant.tasks.junit4.tests.TestStatuses.ignored_a(TestStatuses.java:19)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n\tat java.lang.reflect.Method.invoke(Method.java:498)\r\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)\r\n\tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\r\n\tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)\r\n\tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)\r\n\tat org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)\r\n\tat org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)\r\n\tat org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)\r\n\tat org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)\r\n\tat org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)\r\n\tat org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.ParentRunner.run(ParentRunner.java:413)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.execute(ForkedMain.java:265)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.main(ForkedMain.java:390)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMainSafe.main(ForkedMainSafe.java:13)\r\n",
+            "throwableString": "org.junit.AssumptionViolatedException: got: <false>, expected: is <true>",
+            "throwableClass": "org.junit.AssumptionViolatedException",
+            "assertionViolation": false,
+            "assumptionViolation": true
+          }
+        },
+        {
+          "event": "TEST_FINISHED",
+          "description": "ID#ignored_a(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_IGNORED",
+          "description": "ID#ignored(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        }

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/main/resources/com/carrotsearch/ant/tasks/junit4/templates/json/tests-output.jsonp -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/main/resources/com/carrotsearch/ant/tasks/junit4/templates/json/tests-output.jsonp Changed

@@ -1,33 +1,220 @@
 testData({
   "junit4": {
-    "tests.seed": "B19FBD1BB1231191",
+    "tests.seed": "84784D1BB9382FB8",
     "project.name": "Nice project"
   },
   "suites": 
     {
-      "slave": 0,
-      "startTimestamp": 1331889914622,
-      "startTimestampDate": "2012-03-16T10:25:14.622",
-      "executionTime": 109,
+      "forkedJvm": 0,
+      "startTimestamp": 1656407943240,
+      "startTimestampDate": "2022-06-28T11:19:03.240",
+      "executionTime": 11,
       "description": {
-        "id": "id#com.carrotsearch.ant.tasks.junit4.tests.TestBeforeClassError0",
+        "id": "ID#com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+        "displayName": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+        "methodName": null,
+        "className": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+        "children": 
+          {
+            "id": "ID#failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "displayName": "failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "methodName": "failure",
+            "className": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+            "children": 
+          },
+          {
+            "id": "ID#ok(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "displayName": "ok(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "methodName": "ok",
+            "className": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+            "children": 
+          },
+          {
+            "id": "ID#error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "displayName": "error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "methodName": "error",
+            "className": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+            "children": 
+          },
+          {
+            "id": "ID#ignored_a(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "displayName": "ignored_a(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "methodName": "ignored_a",
+            "className": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+            "children": 
+          },
+          {
+            "id": "ID#ignored(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "displayName": "ignored(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "methodName": "ignored",
+            "className": "com.carrotsearch.ant.tasks.junit4.tests.TestStatuses",
+            "children": 
+          }
+        
+      },
+      "tests": 
+        {
+          "forkedJvm": 0,
+          "startTimestamp": 1656407943243,
+          "startTimestampDate": "2022-06-28T11:19:03.243",
+          "executionTime": 4,
+          "description": "ID#failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "status": "FAILURE",
+          "testFailures": 
+            {
+              "throwableClass": "java.lang.AssertionError",
+              "throwableString": "java.lang.AssertionError",
+              "stackTrace": "java.lang.AssertionError\r\n\tat org.junit.Assert.fail(Assert.java:87)\r\n\tat org.junit.Assert.assertTrue(Assert.java:42)\r\n\tat org.junit.Assert.assertTrue(Assert.java:53)\r\n\tat com.carrotsearch.ant.tasks.junit4.tests.TestStatuses.failure(TestStatuses.java:24)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n\tat java.lang.reflect.Method.invoke(Method.java:498)\r\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)\r\n\tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\r\n\tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)\r\n\tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)\r\n\tat org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)\r\n\tat org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)\r\n\tat org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)\r\n\tat org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)\r\n\tat org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)\r\n\tat org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.ParentRunner.run(ParentRunner.java:413)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.execute(ForkedMain.java:265)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.main(ForkedMain.java:390)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMainSafe.main(ForkedMainSafe.java:13)\r\n",
+              "kind": "assertion"
+            }
+          
+        },
+        {
+          "forkedJvm": 0,
+          "startTimestamp": 1656407943247,
+          "startTimestampDate": "2022-06-28T11:19:03.247",
+          "executionTime": 0,
+          "description": "ID#ok(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "status": "OK",
+          "testFailures": 
+        },
+        {
+          "forkedJvm": 0,
+          "startTimestamp": 1656407943247,
+          "startTimestampDate": "2022-06-28T11:19:03.247",
+          "executionTime": 1,
+          "description": "ID#error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "status": "ERROR",
+          "testFailures": 
+            {
+              "throwableClass": "java.lang.RuntimeException",
+              "throwableString": "java.lang.RuntimeException",
+              "stackTrace": "java.lang.RuntimeException\r\n\tat com.carrotsearch.ant.tasks.junit4.tests.TestStatuses.error(TestStatuses.java:29)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n\tat java.lang.reflect.Method.invoke(Method.java:498)\r\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)\r\n\tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\r\n\tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)\r\n\tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)\r\n\tat org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)\r\n\tat org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)\r\n\tat org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)\r\n\tat org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)\r\n\tat org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)\r\n\tat org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.ParentRunner.run(ParentRunner.java:413)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.execute(ForkedMain.java:265)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.main(ForkedMain.java:390)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMainSafe.main(ForkedMainSafe.java:13)\r\n",
+              "kind": "error"
+            }
+          
+        },
+        {
+          "forkedJvm": 0,
+          "startTimestamp": 1656407943248,
+          "startTimestampDate": "2022-06-28T11:19:03.248",
+          "executionTime": 3,
+          "description": "ID#ignored_a(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "status": "IGNORED_ASSUMPTION",
+          "testFailures": 
+            {
+              "throwableClass": "org.junit.AssumptionViolatedException",
+              "throwableString": "org.junit.AssumptionViolatedException: got: <false>, expected: is <true>",
+              "stackTrace": "org.junit.AssumptionViolatedException: got: <false>, expected: is <true>\r\n\tat org.junit.Assume.assumeThat(Assume.java:106)\r\n\tat org.junit.Assume.assumeTrue(Assume.java:50)\r\n\tat com.carrotsearch.ant.tasks.junit4.tests.TestStatuses.ignored_a(TestStatuses.java:19)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n\tat java.lang.reflect.Method.invoke(Method.java:498)\r\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)\r\n\tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\r\n\tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)\r\n\tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)\r\n\tat org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)\r\n\tat org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)\r\n\tat org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)\r\n\tat org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)\r\n\tat org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)\r\n\tat org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.ParentRunner.run(ParentRunner.java:413)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.execute(ForkedMain.java:265)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.main(ForkedMain.java:390)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMainSafe.main(ForkedMainSafe.java:13)\r\n",
+              "kind": "assumption"
+            }
+          
+        },
+        {
+          "forkedJvm": 0,
+          "startTimestamp": 1656407943251,
+          "startTimestampDate": "2022-06-28T11:19:03.251",
+          "executionTime": 0,
+          "description": "ID#ignored(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "status": "IGNORED",
+          "testFailures": 
+        }
+      ,
+      "suiteFailures": ,
+      "executionEvents": 
+        {
+          "event": "TEST_STARTED",
+          "description": "ID#failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_FAILURE",
+          "description": "ID#failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "failure": {
+            "description": "ID#failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "message": null,
+            "trace": "java.lang.AssertionError\r\n\tat org.junit.Assert.fail(Assert.java:87)\r\n\tat org.junit.Assert.assertTrue(Assert.java:42)\r\n\tat org.junit.Assert.assertTrue(Assert.java:53)\r\n\tat com.carrotsearch.ant.tasks.junit4.tests.TestStatuses.failure(TestStatuses.java:24)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n\tat java.lang.reflect.Method.invoke(Method.java:498)\r\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)\r\n\tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\r\n\tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)\r\n\tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)\r\n\tat org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)\r\n\tat org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)\r\n\tat org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)\r\n\tat org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)\r\n\tat org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)\r\n\tat org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.ParentRunner.run(ParentRunner.java:413)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.execute(ForkedMain.java:265)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.main(ForkedMain.java:390)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMainSafe.main(ForkedMainSafe.java:13)\r\n",
+            "throwableString": "java.lang.AssertionError",
+            "throwableClass": "java.lang.AssertionError",
+            "assertionViolation": true,
+            "assumptionViolation": false
+          }
+        },
+        {
+          "event": "TEST_FINISHED",
+          "description": "ID#failure(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_STARTED",
+          "description": "ID#ok(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_FINISHED",
+          "description": "ID#ok(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_STARTED",
+          "description": "ID#error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_FAILURE",
+          "description": "ID#error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "failure": {
+            "description": "ID#error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "message": null,
+            "trace": "java.lang.RuntimeException\r\n\tat com.carrotsearch.ant.tasks.junit4.tests.TestStatuses.error(TestStatuses.java:29)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n\tat java.lang.reflect.Method.invoke(Method.java:498)\r\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)\r\n\tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\r\n\tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)\r\n\tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)\r\n\tat org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)\r\n\tat org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)\r\n\tat org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)\r\n\tat org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)\r\n\tat org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)\r\n\tat org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.ParentRunner.run(ParentRunner.java:413)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.execute(ForkedMain.java:265)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.main(ForkedMain.java:390)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMainSafe.main(ForkedMainSafe.java:13)\r\n",
+            "throwableString": "java.lang.RuntimeException",
+            "throwableClass": "java.lang.RuntimeException",
+            "assertionViolation": false,
+            "assumptionViolation": false
+          }
+        },
+        {
+          "event": "TEST_FINISHED",
+          "description": "ID#error(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_STARTED",
+          "description": "ID#ignored_a(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)"
+        },
+        {
+          "event": "TEST_IGNORED_ASSUMPTION",
+          "description": "ID#ignored_a(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+          "failure": {
+            "description": "ID#ignored_a(com.carrotsearch.ant.tasks.junit4.tests.TestStatuses)",
+            "message": "got: <false>, expected: is <true>",
+            "trace": "org.junit.AssumptionViolatedException: got: <false>, expected: is <true>\r\n\tat org.junit.Assume.assumeThat(Assume.java:106)\r\n\tat org.junit.Assume.assumeTrue(Assume.java:50)\r\n\tat com.carrotsearch.ant.tasks.junit4.tests.TestStatuses.ignored_a(TestStatuses.java:19)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\r\n\tat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\r\n\tat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\r\n\tat java.lang.reflect.Method.invoke(Method.java:498)\r\n\tat org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)\r\n\tat org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)\r\n\tat org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)\r\n\tat org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)\r\n\tat org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)\r\n\tat org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)\r\n\tat org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)\r\n\tat org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)\r\n\tat org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)\r\n\tat org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)\r\n\tat org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)\r\n\tat org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)\r\n\tat org.junit.runners.ParentRunner.run(ParentRunner.java:413)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.execute(ForkedMain.java:265)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMain.main(ForkedMain.java:390)\r\n\tat com.carrotsearch.ant.tasks.junit4.forked.ForkedMainSafe.main(ForkedMainSafe.java:13)\r\n",
+            "throwableString": "org.junit.AssumptionViolatedException: got: <false>, expected: is <true>",
+            "throwableClass": "org.junit.AssumptionViolatedException",
+            "assertionViolation": false,
+            "assumptionViolation": true
+          }
+        },
+        {
+          "event": "TEST_FINISHED",

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/tasks/Tasks/junit4.html -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/tasks/Tasks/junit4.html Changed

@@ -196,7 +196,7 @@
   <tr>
     <td valign="top">tempdir</td>
     <td valign="top">Specify where to store temporary files. These temporary files include a list of suites passed
-      to each slave JVM so it is usually wise to just leave this attribute unset - the default is to take the value of the
+      to each forked JVM so it is usually wise to just leave this attribute unset - the default is to take the value of the
       <code>dir</code> attribute or the project's basedir.
     </td>
     <td align="center" valign="top">No</td>
@@ -230,7 +230,7 @@
   <tr class="junit4">
     <td valign="top">parallelism</td>
     <td valign="top">
-      The number of parallel slaves. Can be set to a constant <strong><code>max</code></strong> for the
+      The number of parallel forked JVMs. Can be set to a constant <strong><code>max</code></strong> for the
       maximum number of cores returned from <code>Runtime.availableProcessors</code> or 
       <strong><code>auto</code></strong> for sensible defaults depending on the number of cores.
       
@@ -245,7 +245,7 @@
     <td valign="top">dynamicAssignmentRatio</td>
     <td valign="top">
       Specifies the ratio of suites moved to dynamic assignment list (job-stealing). A dynamic
-      assignment list dispatches suites to the first idle slave JVM. Theoretically
+      assignment list dispatches suites to the first idle forked JVM. Theoretically
       this is an optimal strategy, but it is usually better to have some static assignments
       to avoid communication costs.
    
@@ -255,7 +255,7 @@
       <p>The list of dynamic assignments is sorted by decreasing cost (always) and
       is inherently prone to race conditions in distributing suites. Should there
       be an error based on suite-dependency it will not be directly repeatable. In such
-      case use the per-slave-jvm list of suites file dumped to disk for each slave JVM.
+      case use the per-forked-jvm list of suites file dumped to disk for each forked JVM.
       See <code>leaveTemporary</code> attribute.
     </td>
     <td align="center" valign="top">No; default is '0.25' (25% of all suites are assigned dynamically).</td>
@@ -267,7 +267,7 @@
       Specify random seed for anything that is randomized in <code>junit4</code>. The order of suites
       execution and suite-JVM assignments are a result of this seed for example.
 
-      <p>The master seed is also passed to slave JVMs as a system property (to bootstrap randomized runner).</p>
+      <p>The main seed is also passed to forked JVMs as a system property (to bootstrap randomized runner).</p>
     </td>
     <td align="center" valign="top">No; default is a randomly generated seed.</td>
   </tr>
@@ -282,10 +282,10 @@
   </tr>
 
   <tr class="junit4">
-    <td valign="top">shuffleOnSlave</td>
+    <td valign="top">shuffleOnForkedJvm</td>
     <td valign="top">
     Predictably shuffle tests order after balancing. This will help in spreading
-    lighter and heavier tests over a single slave's execution timeline while
+    lighter and heavier tests over a single forked JVM execution timeline while
     still keeping the same tests order depending on the seed. See nested elements
     for configuring load balancers.
     </td>
@@ -658,7 +658,7 @@
 
 <h3>Capturing original JVM output</h3>
 
-<p>JUnit4 has been designed to run reports and aggregation of test events on the master
+<p>JUnit4 has been designed to run reports and aggregation of test events on the main
 JVM, not on the forked JVMs. This slightly complicates things when diagnostic JVM messages
 are used because these messages are printed directly to original stream descriptors
 by the JVM, bypassing System.out or System.err substitutions.</p>

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/TestEventBusSanityCheck.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/TestEventBusSanityCheck.java Changed

@@ -25,7 +25,7 @@
 @ThreadLeakScope(Scope.SUITE)
 @ThreadLeakLingering(linger = 1000)
 public class TestEventBusSanityCheck extends RandomizedTest {
-  static class SlaveIdle {
+  static class ForkedJvmIdle {
     public void finished() {
       sleep(randomIntBetween(1, 50));
     }
@@ -53,7 +53,7 @@
       volatile Thread foo;
 
       @Subscribe
-      public void onSlaveIdle(SlaveIdle slave) {
+      public void onForkedJvmIdle(ForkedJvmIdle forkedJvmIdle) {
         final Thread other = foo;
         if (other != null) {
           hadErrors.set(true);
@@ -63,10 +63,10 @@
         foo = Thread.currentThread();
         
         if (stealingQueue.isEmpty()) {
-          slave.finished();
+          forkedJvmIdle.finished();
         } else {
           String suiteName = stealingQueue.pop();
-          slave.newSuite(suiteName);
+          forkedJvmIdle.newSuite(suiteName);
         }
         
         foo = null;
@@ -75,17 +75,17 @@
 
     // stress.
     ExecutorService executor = Executors.newCachedThreadPool();
-    final List<Callable<Void>> slaves = new ArrayList<>();
+    final List<Callable<Void>> forkedJvms = new ArrayList<>();
     for (int i = 0; i < randomIntBetween(1, 10); i++) {
-      slaves.add(new Callable<Void>() {
+      forkedJvms.add(new Callable<Void>() {
         @Override
         public Void call() throws Exception {
-          aggregatedBus.post(new SlaveIdle());
+          aggregatedBus.post(new ForkedJvmIdle());
           return null;
         }
       });
     }
-    for (Future<Void> f : executor.invokeAll(slaves)) {
+    for (Future<Void> f : executor.invokeAll(forkedJvms)) {
       f.get();
     }
     executor.shutdown();

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/it/TestCrashesAndExceptions.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/it/TestCrashesAndExceptions.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/it/TestShutdownHookDeadlock.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/it/TestShutdownHookDeadlock.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/it/TestTextReport.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/it/TestTextReport.java Changed

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/it/TestUnhandledForkedJvmFailure.java Added

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/tests/FireUnhandledRunnerException.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/tests/FireUnhandledRunnerException.java Changed

_service:tar_scm:2.8.1.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/tests/ForkedJvmHangingBackgroundThreads.java Added

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/tests/ShutdownHook.java -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/test/java/com/carrotsearch/ant/tasks/junit4/tests/ShutdownHook.java Changed

_service:tar_scm:2.7.4.tar.gz/junit4-ant/src/test/resources/junit4.xml -> _service:tar_scm:2.8.1.tar.gz/junit4-ant/src/test/resources/junit4.xml Changed

@@ -24,7 +24,7 @@
     </taskdef>
 
     <presetdef name="junit4.preconf">
-        <junit4:junit4 haltonfailure="true" parallelism="1" shuffleOnSlave="true" onNonEmptyWorkDirectory="wipe">
+        <junit4:junit4 haltonfailure="true" parallelism="1" shuffleOnForkedJvm="true" onNonEmptyWorkDirectory="wipe">
             <classpath refid="tests.classpath" />
 
             <listeners>
@@ -637,10 +637,10 @@
         </junit4.preconf>
     </target>
 
-    <target name="slavehanging">
+    <target name="forkedjvmhanging">
         <junit4.preconf haltonfailure="false" parallelism="1">
             <fileset dir="${basedir}">
-                <include name="**/SlaveHanging*.class" />
+                <include name="**/ForkedJvmHanging*.class" />
                 <exclude name="**/*$*" />
             </fileset>
         </junit4.preconf>
@@ -931,7 +931,7 @@
     </target>
   
     <target name="randomsysproperty">
-        
+        
         <local name="tests.seed" />
         <junit4:pickseed property="tests.seed" />
 
@@ -1074,7 +1074,7 @@
    </target>
 
    <target name="sysoutoom">
-      <junit4:junit4 onNonEmptyWorkDirectory="wipe" haltonfailure="true" parallelism="2" shuffleOnSlave="true">
+      <junit4:junit4 onNonEmptyWorkDirectory="wipe" haltonfailure="true" parallelism="2" shuffleOnForkedJvm="true">
           <classpath refid="tests.classpath" />
 
           <fileset dir="${basedir}">
@@ -1096,7 +1096,7 @@
    </target>
    
    <target name="sysouts_passthrough">
-      <junit4:junit4 onNonEmptyWorkDirectory="wipe" haltonfailure="true" parallelism="1" shuffleOnSlave="true">
+      <junit4:junit4 onNonEmptyWorkDirectory="wipe" haltonfailure="true" parallelism="1" shuffleOnForkedJvm="true">
           <classpath refid="tests.classpath" />
 
           <fileset dir="${basedir}">
@@ -1111,7 +1111,7 @@
       <delete file="${basedir}/large.log" />
    </target>
 
-    <target name="slavemainfailure">
+    <target name="forkedmainfailure">
         <junit4.preconf haltonfailure="true">
             <fileset dir="${basedir}">
                 <include name="**/FireUnhandledRunnerException.class" />
@@ -1245,10 +1245,7 @@
       <listeners>
         <junit4:report-text>
           <junit4:filtertrace>
-            
+            
           </junit4:filtertrace>
         </junit4:report-text>
       </listeners>
@@ -1266,7 +1263,7 @@
       <listeners>
         <junit4:report-text>
           <junit4:filtertrace defaults="false">
-              <containsstring contains=".SlaveMain." /> 
+              <containsstring contains=".ForkedMain." />
               <containsregex pattern="^(\s+at )(org\.junit\.)" /> 
           </junit4:filtertrace>
         </junit4:report-text>

_service:tar_scm:2.7.4.tar.gz/junit4-maven-plugin-tests/pom.xml -> _service:tar_scm:2.8.1.tar.gz/junit4-maven-plugin-tests/pom.xml Changed

_service:tar_scm:2.7.4.tar.gz/junit4-maven-plugin-tests/src/it/01-basic-test/pom.xml -> _service:tar_scm:2.8.1.tar.gz/junit4-maven-plugin-tests/src/it/01-basic-test/pom.xml Changed

_service:tar_scm:2.7.4.tar.gz/junit4-maven-plugin/pom.xml -> _service:tar_scm:2.8.1.tar.gz/junit4-maven-plugin/pom.xml Changed

_service:tar_scm:2.7.4.tar.gz/junit4-maven-plugin/src/main/java/com/carrotsearch/maven/plugins/junit4/JUnit4Mojo.java -> _service:tar_scm:2.8.1.tar.gz/junit4-maven-plugin/src/main/java/com/carrotsearch/maven/plugins/junit4/JUnit4Mojo.java Changed

@@ -86,7 +86,7 @@
   private MavenProject project;
 
   /**
-   * Base directory to invoke slave VMs in. Also note <code>isolateWorkingDirectories</code>
+   * Base directory to invoke forked VMs in. Also note <code>isolateWorkingDirectories</code>
    * parameter.
    */
   @Parameter(
@@ -135,12 +135,23 @@
 
   /**
    * Predictably shuffle tests order after balancing. This will help in spreading
-   * lighter and heavier tests over a single slave's execution timeline while
+   * lighter and heavier tests over a single forked JVM execution timeline while
    * still keeping the same tests order depending on the seed.
+   *
+   * @deprecated Use {@link #shuffleOnForkedJvm}
    */
   @Parameter(defaultValue = "true")
-  private boolean shuffleOnSlave = JUnit4.DEFAULT_SHUFFLE_ON_SLAVE;
-  
+  @Deprecated
+  private boolean shuffleOnSlave = JUnit4.DEFAULT_SHUFFLE_ON_FORKED_JVM;
+
+  /**
+   * Predictably shuffle tests order after balancing. This will help in spreading
+   * lighter and heavier tests over a single forked JVM execution timeline while
+   * still keeping the same tests order depending on the seed.
+   */
+  @Parameter(defaultValue = "true")
+  private boolean shuffleOnForkedJvm = JUnit4.DEFAULT_SHUFFLE_ON_FORKED_JVM;
+
   /**
    * Prints the summary of all executed, ignored etc. tests at the end.
    */
@@ -182,7 +193,7 @@
   
   /**
    * Specifies the ratio of suites moved to dynamic assignment list. A dynamic
-   * assignment list dispatches suites to the first idle slave JVM. Theoretically
+   * assignment list dispatches suites to the first idle forked JVM. Theoretically
    * this is an optimal strategy, but it is usually better to have some static assignments
    * to avoid communication costs.
    * 
@@ -192,7 +203,7 @@
    * <p>The list of dynamic assignments is sorted by decreasing cost (always) and
    * is inherently prone to race conditions in distributing suites. Should there
    * be an error based on suite-dependency it will not be directly repeatable. In such
-   * case use the per-slave-jvm list of suites file dumped to disk for each slave JVM.
+   * case use the per-forked-jvm list of suites file dumped to disk for each forked JVM.
    * (see <code>leaveTemporary</code> parameter).
    */
   @Parameter(defaultValue = "0.25")
@@ -608,7 +619,7 @@
     if (statsPropertyPrefix != null) junit4.addAttribute("statsPropertyPrefix", statsPropertyPrefix);
     if (onNonEmptyWorkDirectory != null) junit4.addAttribute("onNonEmptyWorkDirectory", onNonEmptyWorkDirectory);
 
-    junit4.addAttribute("shuffleOnSlave", Boolean.toString(shuffleOnSlave));
+    junit4.addAttribute("shuffleOnForkedJvm", Boolean.toString(shuffleOnSlave && shuffleOnForkedJvm));
     junit4.addAttribute("printSummary", Boolean.toString(printSummary));
     junit4.addAttribute("isolateWorkingDirectories", Boolean.toString(isolateWorkingDirectories));
     junit4.addAttribute("haltOnFailure", Boolean.toString(haltOnFailure));

_service:tar_scm:2.7.4.tar.gz/pom.xml -> _service:tar_scm:2.8.1.tar.gz/pom.xml Changed

@@ -11,7 +11,7 @@
 
   <groupId>com.carrotsearch.randomizedtesting</groupId>
   <artifactId>randomizedtesting-parent</artifactId>
-  <version>2.7.4</version>
+  <version>2.8.1</version>
   <packaging>pom</packaging>
 
   <name>RandomizedTesting Parent POM</name>
@@ -65,8 +65,8 @@
 
     <gpg.passphrase></gpg.passphrase>
 
-    <version.junit>4.12</version.junit>
-    <version.ant>1.9.11</version.ant>
+    <version.junit>4.13.1</version.junit>
+    <version.ant>1.10.11</version.ant>
     <version.assertj>2.2.0</version.assertj>
 
     <version.maven-antrun-plugin>1.8</version.maven-antrun-plugin>
@@ -104,13 +104,13 @@
       <dependency>
         <groupId>org.dom4j</groupId>
         <artifactId>dom4j</artifactId>
-        <version>2.1.1</version>
+        <version>2.1.3</version>
       </dependency>
 
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>25.0-jre</version>
+        <version>25.1-jre</version>
         <exclusions>
           <exclusion>
             <artifactId>jsr305</artifactId>
@@ -134,12 +134,12 @@
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm</artifactId>
-        <version>6.2.1</version>
+        <version>9.2</version>
       </dependency>
 
       <dependency>
-        <groupId>org.simpleframework</groupId>
-        <artifactId>simple-xml</artifactId>
+        <groupId>com.carrotsearch.thirdparty</groupId>
+        <artifactId>simple-xml-safe</artifactId>
         <version>2.7.1</version>
       </dependency>
 
@@ -550,7 +550,7 @@
         <repository>
           <id>sonatype-nexus-staging</id>
           <name>Sonatype Nexus Releases</name>
-          <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+          <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2</url>
         </repository>
       </distributionManagement>

_service:tar_scm:2.7.4.tar.gz/randomized-runner/pom.xml -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/pom.xml Changed

_service:tar_scm:2.8.1.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/DeadlineClock.java Added

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/MixWithSuiteName.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/MixWithSuiteName.java Changed

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/RandomizedContext.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/RandomizedContext.java Changed

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/RandomizedRunner.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/RandomizedRunner.java Changed

@@ -104,7 +104,7 @@
  *   methods declared in superclasses are called after methods declared in subclasses,</li>
  *   <li>{@link BeforeClass}, {@link Before}, {@link AfterClass}, {@link After}
  *   methods declared within the same class are called in <b>randomized</b> order
- *   derived from the master seed (repeatable with the same seed),</li>
+ *   derived from the main seed (repeatable with the same seed),</li>
  * </ul>
  * 
  * <p>Deviations from "standard" JUnit:
@@ -223,11 +223,11 @@
   /** The class with test methods (suite). */
   private final Class<?> suiteClass;
 
-  /** The runner's seed (master). */
+  /** The runner's seed (main seed). */
   final Randomness runnerRandomness;
 
   /** 
-   * If {@link SysGlobals#SYSPROP_RANDOM_SEED} property is used with two arguments (master:method)
+   * If {@link SysGlobals#SYSPROP_RANDOM_SEED} property is used with two arguments (main:method)
    * then this field contains method-level override. 
    */
   private Randomness testCaseRandomnessOverride;
@@ -324,7 +324,7 @@
     // behavior slightly.
     this.containerRunner = detectContainer();
 
-    // Initialize the runner's master seed/ randomness source.
+    // Initialize the runner's main seed/ randomness source.
     {
       List<SeedDecorator> decorators = new ArrayList<SeedDecorator>();
       for (SeedDecorators decAnn : getAnnotationsFromClassHierarchy(testClass, SeedDecorators.class)) {
@@ -388,7 +388,11 @@
 
       // GH-251: Apply suite and test filters early so that the returned Description gets updated.
       if (emptyToNull(System.getProperty(SYSPROP_TESTMETHOD())) != null) {
-        filter(new MethodGlobFilter(System.getProperty(SYSPROP_TESTMETHOD())));
+        try {
+          filter(new MethodGlobFilter(System.getProperty(SYSPROP_TESTMETHOD())));
+        } catch (NoTestsRemainException e) {
+          // Ignore the exception in the constructor.
+        }
       }
       
       if (emptyToNull(System.getProperty(SYSPROP_TESTCLASS())) != null) {
@@ -460,6 +464,10 @@
     }
 
     suiteDescription = prune(suiteDescription, descriptions);
+
+    if (testCandidates.isEmpty()) {
+      throw new NoTestsRemainException();
+    }
   }
 
   private static Description prune(Description suite, Set<Description> permitted) {
@@ -921,7 +929,7 @@
   }
 
   /**
-   * Runs a single test in the "master" test thread.
+   * Runs a single test in the "main" test thread.
    */
   void runSingleTest(final RunNotifier notifier, 
                      final TestCandidate c,

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/RandomizedTest.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/RandomizedTest.java Changed

@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.text.SimpleDateFormat;
@@ -48,10 +49,10 @@
 
   /* Commonly used charsets (these must be supported by every JVM). */
 
-  protected static final Charset UTF8 = Charset.forName("UTF-8");
-  protected static final Charset UTF16 = Charset.forName("UTF-16");
-  protected static final Charset ISO8859_1 = Charset.forName("ISO-8859-1");
-  protected static final Charset US_ASCII = Charset.forName("US-ASCII");
+  protected static final Charset UTF8 = StandardCharsets.UTF_8;
+  protected static final Charset UTF16 = StandardCharsets.UTF_16;
+  protected static final Charset ISO8859_1 = StandardCharsets.ISO_8859_1;
+  protected static final Charset US_ASCII = StandardCharsets.US_ASCII;
 
   /* This charset does not need to be supported, but I don't know any JVM under which it wouldn't be. */

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/ThreadLeakControl.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/ThreadLeakControl.java Changed

@@ -1,14 +1,27 @@
 package com.carrotsearch.randomizedtesting;
 
-import static com.carrotsearch.randomizedtesting.RandomizedRunner.DEFAULT_KILLATTEMPTS;
-import static com.carrotsearch.randomizedtesting.RandomizedRunner.DEFAULT_KILLWAIT;
-import static com.carrotsearch.randomizedtesting.RandomizedRunner.DEFAULT_TIMEOUT;
-import static com.carrotsearch.randomizedtesting.RandomizedRunner.DEFAULT_TIMEOUT_SUITE;
-import static com.carrotsearch.randomizedtesting.RandomizedTest.systemPropertyAsInt;
-import static com.carrotsearch.randomizedtesting.SysGlobals.SYSPROP_KILLATTEMPTS;
-import static com.carrotsearch.randomizedtesting.SysGlobals.SYSPROP_KILLWAIT;
-import static com.carrotsearch.randomizedtesting.SysGlobals.SYSPROP_TIMEOUT;
-import static com.carrotsearch.randomizedtesting.SysGlobals.SYSPROP_TIMEOUT_SUITE;
+import com.carrotsearch.randomizedtesting.RandomizedRunner.*;
+import com.carrotsearch.randomizedtesting.annotations.SuppressForbidden;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction.Action;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakGroup;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies;
+import com.carrotsearch.randomizedtesting.annotations.Timeout;
+import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
+import org.junit.AssumptionViolatedException;
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+import org.junit.runner.notification.RunNotifier;
+import org.junit.runner.notification.StoppedByUserException;
+import org.junit.runners.model.MultipleFailureException;
+import org.junit.runners.model.Statement;
 
 import java.lang.annotation.Annotation;
 import java.lang.management.ManagementFactory;
@@ -29,33 +42,14 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.LockSupport;
 import java.util.logging.Logger;
 
-import org.junit.Test;
-import org.junit.AssumptionViolatedException;
-import org.junit.runner.Description;
-import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
-import org.junit.runner.notification.RunListener;
-import org.junit.runner.notification.RunNotifier;
-import org.junit.runner.notification.StoppedByUserException;
-import org.junit.runners.model.MultipleFailureException;
-import org.junit.runners.model.Statement;
-
-import com.carrotsearch.randomizedtesting.RandomizedRunner.TestCandidate;
-import com.carrotsearch.randomizedtesting.RandomizedRunner.UncaughtException;
-import com.carrotsearch.randomizedtesting.annotations.SuppressForbidden;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction.Action;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakGroup;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies;
-import com.carrotsearch.randomizedtesting.annotations.Timeout;
-import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
+import static com.carrotsearch.randomizedtesting.RandomizedRunner.*;
+import static com.carrotsearch.randomizedtesting.RandomizedTest.systemPropertyAsInt;
+import static com.carrotsearch.randomizedtesting.SysGlobals.*;
 
 /**
  * Everything corresponding to thread leak control. This is very, very fragile to changes
@@ -63,27 +57,30 @@
  */
 @SuppressWarnings("resource")
 class ThreadLeakControl {
-  /** A dummy class serving as the source of defaults for annotations. */
+  /**
+   * A dummy class serving as the source of defaults for annotations.
+   */
   @ThreadLeakScope
   @ThreadLeakAction
   @ThreadLeakLingering
   @ThreadLeakZombies
   @ThreadLeakFilters
   @ThreadLeakGroup
-  private static class DefaultAnnotationValues {}
+  private static class DefaultAnnotationValues {
+  }
 
   /**
    * Shared LOGGER.
    */
   private final static Logger LOGGER = RandomizedRunner.logger;
 
-  /** 
+  /**
    * How many attempts to interrupt and then kill a runaway thread before giving up?
    */
   private final int killAttempts;
 
   /**
-   * How long to wait between attempts to kill a runaway thread (millis). 
+   * How long to wait between attempts to kill a runaway thread (millis).
    */
   private final int killWait;
 
@@ -98,7 +95,7 @@
   private final Set<Thread> expectedSuiteState;
 
   /**
-   * Atomic section for passing notifier events.  
+   * Atomic section for passing notifier events.
    */
   private final Object notifierLock = new Object();
 
@@ -111,7 +108,7 @@
    * Test timeout.
    */
   private TimeoutValue testTimeout;
-  
+
   /**
    * Suite timeout.
    */
@@ -121,7 +118,7 @@
    * Built-in filters.
    */
   private final List<ThreadFilter> builtinFilters;
-  
+
   /**
    * User filter (compound).
    */
@@ -150,15 +147,29 @@
     Description testInProgress;
 
     @Override
-    public void addListener(RunListener listener) { throw new UnsupportedOperationException(); }
+    public void addListener(RunListener listener) {
+      throw new UnsupportedOperationException();
+    }
+
     @Override
-    public void addFirstListener(RunListener listener) { throw new UnsupportedOperationException(); }
+    public void addFirstListener(RunListener listener) {
+      throw new UnsupportedOperationException();
+    }
+
     @Override
-    public void removeListener(RunListener listener) { throw new UnsupportedOperationException(); }
+    public void removeListener(RunListener listener) {
+      throw new UnsupportedOperationException();
+    }
+
     @Override
-    public void fireTestRunFinished(Result result) { throw new UnsupportedOperationException(); }
+    public void fireTestRunFinished(Result result) {
+      throw new UnsupportedOperationException();
+    }
+
     @Override
-    public void fireTestRunStarted(Description description) { throw new UnsupportedOperationException(); }
+    public void fireTestRunStarted(Description description) {
+      throw new UnsupportedOperationException();
+    }
 
     @Override
     public void fireTestStarted(Description description) throws StoppedByUserException {
@@ -184,7 +195,7 @@
         targetNotifier.fireTestFailure(failure);
       }
     }
-    
+
     @Override
     public void fireTestIgnored(Description description) {
       synchronized (notifierLock) {
@@ -246,7 +257,9 @@
     }
   }
 
-  /** */
+  /**
+   *
+   */
   private static class ThisThreadFilter implements ThreadFilter {
     private final Thread t;
 
@@ -259,7 +272,7 @@
       return this.t == t;
     }
   }
-  
+
   private static ThreadFilter or(final ThreadFilter... filters) {

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/annotations/SeedDecorators.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/annotations/SeedDecorators.java Changed

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/rules/SystemPropertiesRestoreRule.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/main/java/com/carrotsearch/randomizedtesting/rules/SystemPropertiesRestoreRule.java Changed

@@ -24,13 +24,31 @@
   /**
    * Ignored property keys.
    */
-  private final HashSet<String> ignoredProperties;
+  private final Set<String> ignoredProperties;
+
+  /** properties we set up front for the duration of the test */
+  private final Map<String, String> setProperties;
 
   /**
    * Restores all properties.
    */
   public SystemPropertiesRestoreRule() {
-    this(Collections.<String>emptySet());
+    this.ignoredProperties = Collections.emptySet();
+    this.setProperties = Collections.emptyMap();
+  }
+
+  /** Equivalent to calling {@link System#setProperty(String, String)} when the test starts. */
+  public SystemPropertiesRestoreRule(String key, String value) {
+    this(Collections.singletonMap(key, value));
+  }
+
+  /**
+   * Equivalent to calling {@link System#setProperty(String, String)} on each of the provided
+   * properties when the test starts.
+   */
+  public SystemPropertiesRestoreRule(Map<String, String> setProperties) {
+    this.setProperties = new HashMap<>(setProperties);//defensive clone
+    this.ignoredProperties = Collections.emptySet();
   }
 
   /**
@@ -38,6 +56,7 @@
    */
   public SystemPropertiesRestoreRule(Set<String> ignoredProperties) {
     this.ignoredProperties = new HashSet<String>(ignoredProperties);
+    this.setProperties = Collections.emptyMap();
   }
 
   /**
@@ -45,6 +64,7 @@
    */
   public SystemPropertiesRestoreRule(String... ignoredProperties) {
     this.ignoredProperties = new HashSet<String>(Arrays.asList(ignoredProperties));
+    this.setProperties = Collections.emptyMap();
   }
 
   @Override
@@ -54,6 +74,9 @@
       public void evaluate() throws Throwable {
         TreeMap<String,String> before = systemPropertiesAsMap();
         try {
+          for (Map.Entry<String, String> entry : setProperties.entrySet()) {
+            System.setProperty(entry.getKey(), entry.getValue());
+          }
           s.evaluate();
         } finally {
           TreeMap<String,String> after = systemPropertiesAsMap();

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/TestContextRandom.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/TestContextRandom.java Changed

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/TestSeedDecorator.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/TestSeedDecorator.java Changed

@@ -50,11 +50,11 @@
   }
 
   @Test
-  public void testDecoratedMaster() {
-    String masterSeed = SeedUtils.formatSeed(new Random().nextLong());
-    System.setProperty(SysGlobals.SYSPROP_RANDOM_SEED(), masterSeed);
+  public void testDecoratedMainSeed() {
+    String mainSeed = SeedUtils.formatSeed(new Random().nextLong());
+    System.setProperty(SysGlobals.SYSPROP_RANDOM_SEED(), mainSeed);
 
-    // These classes should get a different master seed (perturbed by decorator).
+    // These classes should get a different main seed (perturbed by decorator).
     runTests(Nested1.class, Nested2.class, Nested3.class, Nested4.class);
 
     // All four classes get the same initial "runner" seed.
@@ -62,7 +62,7 @@
     Assert.assertEquals(1, new HashSet<String>(runnerSeeds).toArray().length);
 
     // @BeforeClass scope strings for Nested1 and Nested2 should be the same
-    // because these classes share identical master seed.
+    // because these classes share identical main seed.
     Assertions.assertThat(strings.get(1)).isEqualTo(strings.get(0));
     // but Nested3 and Nested4 have a seed decorator so strings there
     // should be different.

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/WithNestedTestClass.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/WithNestedTestClass.java Changed

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/generators/TestRealisticUnicodeGenerator.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/generators/TestRealisticUnicodeGenerator.java Changed

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/timeouts/Test012RunawayThreadsKilledAtOnce.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/timeouts/Test012RunawayThreadsKilledAtOnce.java Changed

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/timeouts/Test015TimeoutOverride.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/timeouts/Test015TimeoutOverride.java Changed

@@ -9,6 +9,8 @@
 import com.carrotsearch.randomizedtesting.WithNestedTestClass;
 import com.carrotsearch.randomizedtesting.annotations.Timeout;
 
+import java.util.concurrent.TimeUnit;
+
 
 /**
  * Test global timeout override (-Dtests.timeout=1000!).
@@ -35,22 +37,22 @@
   @Test
   public void testTimeoutOverride() {
     System.setProperty(SysGlobals.SYSPROP_TIMEOUT(), "200!");
-    long start = System.currentTimeMillis();
+    long start = System.nanoTime();
     FullResult result = runTests(Nested.class);
-    long end = System.currentTimeMillis();
+    long end = System.nanoTime();
     Assert.assertEquals(1, result.getFailureCount());
-    Assert.assertTrue(end - start < 3000);
+    Assert.assertTrue(TimeUnit.NANOSECONDS.toMillis(end - start) < 3000);
   }
   
   @Test
   public void testDisableTimeout() {
     System.setProperty(SysGlobals.SYSPROP_TIMEOUT(), "0!");
 
-    long start = System.currentTimeMillis();
+    long start = System.nanoTime();
     FullResult result = runTests(Nested2.class);
-    long end = System.currentTimeMillis();
+    long end = System.nanoTime();
     Assert.assertEquals(0, result.getFailureCount());
-    Assert.assertTrue(end - start > 900);
+    Assert.assertTrue(TimeUnit.NANOSECONDS.toMillis(end - start) > 900);
   }
   
   @After

_service:tar_scm:2.7.4.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/timeouts/Test021SuiteTimeoutHanging.java -> _service:tar_scm:2.8.1.tar.gz/randomized-runner/src/test/java/com/carrotsearch/randomizedtesting/timeouts/Test021SuiteTimeoutHanging.java Changed

_service:tar_scm:randomizedtesting-2.8.0.tar.gz Deleted

Changes of Revision 3