Soft limit on the sysout bytes instead of a yes/no switch.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/LUCENE-5622@1591214 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java b/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java
index dbf93fc..4852bd8 100644
--- a/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java
+++ b/lucene/analysis/stempel/src/test/org/egothor/stemmer/TestCompile.java
@@ -72,7 +72,6 @@
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks;
-@SuppressSysoutChecks(bugUrl = "External tool.")
public class TestCompile extends LuceneTestCase {
public void testCompile() throws Exception {
diff --git a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java
index 4da3a98..5921006 100644
--- a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java
+++ b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java
@@ -42,7 +42,6 @@
/**
* Testcase for {@link UIMABaseAnalyzer}
*/
-@SuppressSysoutChecks(bugUrl = "UIMA logs via ju.logging")
public class UIMABaseAnalyzerTest extends BaseTokenStreamTestCase {
private UIMABaseAnalyzer analyzer;
diff --git a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java
index 0b9598c..454e45e 100644
--- a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java
+++ b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java
@@ -27,7 +27,6 @@
/**
* Testcase for {@link UIMATypeAwareAnalyzer}
*/
-@SuppressSysoutChecks(bugUrl = "UIMA logs via ju.logging")
public class UIMATypeAwareAnalyzerTest extends BaseTokenStreamTestCase {
private UIMATypeAwareAnalyzer analyzer;
diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java
index edb7c8b..ae0ae9c 100644
--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java
+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java
@@ -31,7 +31,6 @@
import org.junit.BeforeClass;
/** Base class for all Benchmark unit tests. */
-@SuppressSysoutChecks(bugUrl = "Output expected.")
public abstract class BenchmarkTestCase extends LuceneTestCase {
private static File WORKDIR;
diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
index 66dc846..5fc7f82 100644
--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
@@ -67,7 +67,6 @@
/**
* Test very simply that perf tasks - simple algorithms - are doing what they should.
*/
-@SuppressSysoutChecks(bugUrl = "Output expected.")
public class TestPerfTasksLogic extends BenchmarkTestCase {
@Override
diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java
index 426020e..6754522 100644
--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java
+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java
@@ -42,7 +42,6 @@
import conf.ConfLoader;
/** Test very simply that perf tasks are parses as expected. */
-@SuppressSysoutChecks(bugUrl = "Output expected.")
public class TestPerfTasksParse extends LuceneTestCase {
static final String NEW_LINE = System.getProperty("line.separator");
diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java
index 2574ff5..5f101a6 100644
--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java
+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java
@@ -44,7 +44,6 @@
* this test will not work correctly, as it does not dynamically
* generate its test trec topics/qrels!
*/
-@SuppressSysoutChecks(bugUrl = "Output expected.")
public class TestQualityRun extends BenchmarkTestCase {
@Override
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index cd44cf9..71ff92b 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -1008,7 +1008,6 @@
<propertyref prefix="tests.leavetmpdir" />
<propertyref prefix="tests.leaveTemporary" />
<propertyref prefix="tests.leavetemporary" />
- <propertyref prefix="tests.sysouts" />
<propertyref prefix="solr.test.leavetmpdir" />
</syspropertyset>
diff --git a/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastCompressionMode.java b/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastCompressionMode.java
index ab1500f..4fd3471 100644
--- a/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastCompressionMode.java
+++ b/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastCompressionMode.java
@@ -24,5 +24,4 @@
super.setUp();
mode = CompressionMode.FAST;
}
-
}
diff --git a/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java b/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java
index c9a2b02..88d6641 100644
--- a/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java
+++ b/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java
@@ -18,7 +18,6 @@
*/
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.JUnitCore;
@@ -30,8 +29,7 @@
public TestFailIfDirectoryNotClosed() {
super(true);
}
-
- @SuppressSysoutChecks(bugUrl = "Expected.")
+
public static class Nested1 extends WithNestedTests.AbstractNestedTest {
public void testDummy() throws Exception {
Directory dir = newDirectory();
diff --git a/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSameRandomnessLocalePassedOrNot.java b/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSameRandomnessLocalePassedOrNot.java
index 0dbfc31..459f344 100644
--- a/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSameRandomnessLocalePassedOrNot.java
+++ b/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSameRandomnessLocalePassedOrNot.java
@@ -43,7 +43,6 @@
super(true);
}
- @SuppressSysoutChecks(bugUrl = "Expected.")
public static class Nested extends WithNestedTests.AbstractNestedTest {
public static String pickString;
public static Locale defaultLocale;
diff --git a/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSeedFromUncaught.java b/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSeedFromUncaught.java
index fcf71bf..361f10b 100644
--- a/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSeedFromUncaught.java
+++ b/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestSeedFromUncaught.java
@@ -30,7 +30,6 @@
* console.
*/
public class TestSeedFromUncaught extends WithNestedTests {
- @SuppressSysoutChecks(bugUrl = "Expected.")
public static class ThrowInUncaught extends AbstractNestedTest {
@Test
public void testFoo() throws Exception {
diff --git a/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java b/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java
index 85604ac..b759033 100644
--- a/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java
+++ b/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java
@@ -25,7 +25,6 @@
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks;
-@SuppressSysoutChecks(bugUrl = "Output expected.")
public class TestDemo extends LuceneTestCase {
private void testOneSearch(File indexPath, String query, int expectedHitCount) throws Exception {
diff --git a/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java b/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
index 648d2af..3db6c4c 100644
--- a/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
+++ b/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
@@ -24,7 +24,6 @@
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks;
-@SuppressSysoutChecks(bugUrl = "Output expected (external tool).")
public class TestMultiPassIndexSplitter extends LuceneTestCase {
IndexReader input;
int NUM_DOCS = 11;
diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
index e22d7cf..055b370 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
@@ -230,6 +230,7 @@
@ThreadLeakFilters(defaultFilters = true, filters = {
QuickPatchThreadsFilter.class
})
+@TestRuleLimitSysouts.Limit(bytes = TestRuleLimitSysouts.DEFAULT_SYSOUT_BYTES_THRESHOLD)
public abstract class LuceneTestCase extends Assert {
// --------------------------------------------------------------------
@@ -248,13 +249,6 @@
/** @see #ignoreAfterMaxFailures*/
public static final String SYSPROP_FAILFAST = "tests.failfast";
-
- /**
- * If true, enables assertions on writing to system streams.
- *
- * @see TestRuleLimitSysouts
- */
- public static final String SYSPROP_SYSOUTS = "tests.sysouts";
/**
* Annotation for tests that should only be run during nightly builds.
@@ -356,8 +350,8 @@
}
/**
- * Marks any suite which is known to print to {@link System#out} or {@link System#err},
- * even when {@link #VERBOSE} is disabled.
+ * Ignore {@link TestRuleLimitSysouts} for any suite which is known to print
+ * over the default limit of bytes to {@link System#out} or {@link System#err}.
*
* @see TestRuleLimitSysouts
*/
@@ -369,7 +363,7 @@
/** Point to JIRA entry. */
public String bugUrl();
}
-
+
// -----------------------------------------------------------------
// Truly immutable fields and constants, initialized once and valid
// for all suites ever since.
diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java b/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java
index 6a1624b..6041d22 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java
@@ -154,9 +154,6 @@
addVmOpt(b, "testcase", RandomizedContext.current().getTargetClass().getSimpleName());
addVmOpt(b, "tests.method", testName);
addVmOpt(b, "tests.seed", RandomizedContext.current().getRunnerSeedAsString());
-
- // Misc switches.
- addVmOpt(b, SYSPROP_SYSOUTS, System.getProperty(SYSPROP_SYSOUTS));
// Test groups and multipliers.
if (RANDOM_MULTIPLIER > 1) addVmOpt(b, "tests.multiplier", RANDOM_MULTIPLIER);
diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleDisallowSysouts.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleDisallowSysouts.java
deleted file mode 100644
index 7549ac0..0000000
--- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleDisallowSysouts.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package org.apache.lucene.util;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks;
-
-import com.carrotsearch.randomizedtesting.RandomizedTest;
-import com.carrotsearch.randomizedtesting.rules.TestRuleAdapter;
-
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Fails the suite if it prints anything to {@link System#out} or {@link System#err},
- * unless the condition is not enforced (see {@link #isEnforced()}).
- */
-public class TestRuleDisallowSysouts extends TestRuleAdapter {
- /**
- * Stack trace of any thread that wrote something to sysout or syserr.
- */
- private final static AtomicReference<StackTraceElement[]> firstWriteStack = new AtomicReference<StackTraceElement[]>();
-
- private final static DelegateStream capturedSystemOut;
- private final static DelegateStream capturedSystemErr;
-
- static {
- System.out.flush();
- System.err.flush();
-
- final String csn = Charset.defaultCharset().name();
- capturedSystemOut = new DelegateStream(System.out, csn, firstWriteStack);
- capturedSystemErr = new DelegateStream(System.err, csn, firstWriteStack);
-
- System.setOut(capturedSystemOut.printStream);
- System.setErr(capturedSystemErr.printStream);
- }
-
- /**
- * Test failures from any tests or rules before.
- */
- private final TestRuleMarkFailure failureMarker;
-
- /**
- * Sets {@link #firstWriteStack} to the current stack trace upon the first actual write
- * to an underlying stream.
- */
- static class DelegateStream extends FilterOutputStream {
- private final AtomicReference<StackTraceElement[]> firstWriteStack;
- final PrintStream printStream;
-
- public DelegateStream(OutputStream delegate, String charset, AtomicReference<StackTraceElement[]> firstWriteStack) {
- super(delegate);
- try {
- this.firstWriteStack = firstWriteStack;
- this.printStream = new PrintStream(this, true, charset);
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- }
-
- // Do override all three write() methods to make sure nothing slips through.
-
- @Override
- public void write(byte[] b) throws IOException {
- if (b.length > 0) {
- bytesWritten();
- }
- super.write(b);
- }
-
- @Override
- public void write(byte[] b, int off, int len) throws IOException {
- if (len > 0) {
- bytesWritten();
- }
- super.write(b, off, len);
- }
-
- @Override
- public void write(int b) throws IOException {
- bytesWritten();
- super.write(b);
- }
-
- private void bytesWritten() {
- // This check isn't really needed, but getting the stack is expensive and may involve
- // jit deopts, so we'll do it anyway.
- if (firstWriteStack.get() == null) {
- firstWriteStack.compareAndSet(null, Thread.currentThread().getStackTrace());
- }
- }
- }
-
- public TestRuleDisallowSysouts(TestRuleMarkFailure failureMarker) {
- this.failureMarker = failureMarker;
- }
-
-
- /** */
- @Override
- protected void before() throws Throwable {
- if (isEnforced()) {
- checkCaptureStreams();
- }
- resetCaptureState();
- }
-
- /**
- * Ensures {@link System#out} and {@link System#err} point to delegate streams.
- */
- public static void checkCaptureStreams() {
- // Make sure we still hold the right references to wrapper streams.
- if (System.out != capturedSystemOut.printStream) {
- throw new AssertionError("Something has changed System.out to: " + System.out.getClass().getName());
- }
- if (System.err != capturedSystemErr.printStream) {
- throw new AssertionError("Something has changed System.err to: " + System.err.getClass().getName());
- }
- }
-
- protected boolean isEnforced() {
- if (LuceneTestCase.VERBOSE ||
- LuceneTestCase.INFOSTREAM ||
- RandomizedTest.getContext().getTargetClass().isAnnotationPresent(SuppressSysoutChecks.class)) {
- return false;
- }
-
- return !RandomizedTest.systemPropertyAsBoolean(LuceneTestCase.SYSPROP_SYSOUTS, true);
- }
-
- /**
- * We're only interested in failing the suite if it was successful. Otherwise
- * just propagate the original problem and don't bother.
- */
- @Override
- protected void afterIfSuccessful() throws Throwable {
- if (isEnforced()) {
- checkCaptureStreams();
-
- // Flush any buffers.
- capturedSystemOut.printStream.flush();
- capturedSystemErr.printStream.flush();
-
- // And check for offenders, but only if everything was successful so far.
- StackTraceElement[] offenderStack = firstWriteStack.get();
- if (offenderStack != null && failureMarker.wasSuccessful()) {
- AssertionError e = new AssertionError("The test or suite printed information to stdout or stderr," +
- " even though verbose mode is turned off and it's not annotated with @" +
- SuppressSysoutChecks.class.getSimpleName() + ". This exception contains the stack" +
- " trace of the first offending call.");
- e.setStackTrace(offenderStack);
- throw e;
- }
- }
- }
-
- /**
- * Restore original streams.
- */
- @Override
- protected void afterAlways(List<Throwable> errors) throws Throwable {
- resetCaptureState();
- }
-
- private void resetCaptureState() {
- capturedSystemOut.printStream.flush();
- capturedSystemErr.printStream.flush();
- firstWriteStack.set(null);
- }
-}
-
diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleLimitSysouts.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleLimitSysouts.java
new file mode 100644
index 0000000..5298d7d
--- /dev/null
+++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleLimitSysouts.java
@@ -0,0 +1,236 @@
+package org.apache.lucene.util;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.nio.charset.Charset;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks;
+
+import com.carrotsearch.randomizedtesting.RandomizedTest;
+import com.carrotsearch.randomizedtesting.rules.TestRuleAdapter;
+
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Fails the suite if it prints over the given limit of bytes to either
+ * {@link System#out} or {@link System#err},
+ * unless the condition is not enforced (see {@link #isEnforced()}).
+ */
+public class TestRuleLimitSysouts extends TestRuleAdapter {
+ /**
+ * Max limit of bytes printed to either {@link System#out} or {@link System#err}.
+ * This limit is enforced per-class (suite).
+ */
+ public final static int DEFAULT_SYSOUT_BYTES_THRESHOLD = 8 * 1024;
+
+ /**
+ * An annotation specifying the limit of bytes per class.
+ */
+ @Documented
+ @Inherited
+ @Retention(RetentionPolicy.RUNTIME)
+ @Target(ElementType.TYPE)
+ public static @interface Limit {
+ public int bytes();
+ }
+
+ private final static AtomicInteger bytesWritten = new AtomicInteger();
+
+ private final static DelegateStream capturedSystemOut;
+ private final static DelegateStream capturedSystemErr;
+
+ /**
+ * We capture system output and error streams as early as possible because
+ * certain components (like the Java logging system) steal these references and
+ * never refresh them.
+ *
+ * Also, for this exact reason, we cannot change delegate streams for every suite.
+ * This isn't as elegant as it should be, but there's no workaround for this.
+ */
+ static {
+ System.out.flush();
+ System.err.flush();
+
+ final String csn = Charset.defaultCharset().name();
+ capturedSystemOut = new DelegateStream(System.out, csn, bytesWritten);
+ capturedSystemErr = new DelegateStream(System.err, csn, bytesWritten);
+
+ System.setOut(capturedSystemOut.printStream);
+ System.setErr(capturedSystemErr.printStream);
+ }
+
+ /**
+ * Test failures from any tests or rules before.
+ */
+ private final TestRuleMarkFailure failureMarker;
+
+ /**
+ * Tracks the number of bytes written to an underlying stream by
+ * incrementing an {@link AtomicInteger}.
+ */
+ static class DelegateStream extends FilterOutputStream {
+ final PrintStream printStream;
+ final AtomicInteger bytesCounter;
+
+ public DelegateStream(OutputStream delegate, String charset, AtomicInteger bytesCounter) {
+ super(delegate);
+ try {
+ this.printStream = new PrintStream(this, true, charset);
+ this.bytesCounter = bytesCounter;
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ // Do override all three write() methods to make sure nothing slips through.
+
+ @Override
+ public void write(byte[] b) throws IOException {
+ if (b.length > 0) {
+ bytesCounter.addAndGet(b.length);
+ }
+ super.write(b);
+ }
+
+ @Override
+ public void write(byte[] b, int off, int len) throws IOException {
+ if (len > 0) {
+ bytesCounter.addAndGet(len);
+ }
+ super.write(b, off, len);
+ }
+
+ @Override
+ public void write(int b) throws IOException {
+ bytesCounter.incrementAndGet();
+ super.write(b);
+ }
+ }
+
+ public TestRuleLimitSysouts(TestRuleMarkFailure failureMarker) {
+ this.failureMarker = failureMarker;
+ }
+
+
+ /** */
+ @Override
+ protected void before() throws Throwable {
+ if (isEnforced()) {
+ checkCaptureStreams();
+ }
+ resetCaptureState();
+ validateClassAnnotations();
+ }
+
+ private void validateClassAnnotations() {
+ Class<?> target = RandomizedTest.getContext().getTargetClass();
+ if (target.isAnnotationPresent(Limit.class)) {
+ int bytes = target.getAnnotation(Limit.class).bytes();
+ if (bytes < 0 || bytes > 1 * 1024 * 1024) {
+ throw new AssertionError("The sysout limit is insane. Did you want to use "
+ + "@" + LuceneTestCase.SuppressSysoutChecks.class.getName() + " annotation to "
+ + "avoid sysout checks entirely?");
+ }
+ }
+ }
+
+ /**
+ * Ensures {@link System#out} and {@link System#err} point to delegate streams.
+ */
+ public static void checkCaptureStreams() {
+ // Make sure we still hold the right references to wrapper streams.
+ if (System.out != capturedSystemOut.printStream) {
+ throw new AssertionError("Something has changed System.out to: " + System.out.getClass().getName());
+ }
+ if (System.err != capturedSystemErr.printStream) {
+ throw new AssertionError("Something has changed System.err to: " + System.err.getClass().getName());
+ }
+ }
+
+ protected boolean isEnforced() {
+ Class<?> target = RandomizedTest.getContext().getTargetClass();
+
+ if (LuceneTestCase.VERBOSE ||
+ LuceneTestCase.INFOSTREAM ||
+ target.isAnnotationPresent(SuppressSysoutChecks.class)) {
+ return false;
+ }
+
+ if (!target.isAnnotationPresent(Limit.class)) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * We're only interested in failing the suite if it was successful. Otherwise
+ * just propagate the original problem and don't bother.
+ */
+ @Override
+ protected void afterIfSuccessful() throws Throwable {
+ if (isEnforced()) {
+ checkCaptureStreams();
+
+ // Flush any buffers.
+ capturedSystemOut.printStream.flush();
+ capturedSystemErr.printStream.flush();
+
+ // Check for offenders, but only if everything was successful so far.
+ int limit = RandomizedTest.getContext().getTargetClass().getAnnotation(Limit.class).bytes();
+ if (bytesWritten.get() >= limit && failureMarker.wasSuccessful()) {
+ throw new AssertionError(String.format(Locale.ENGLISH,
+ "The test or suite printed %d bytes to stdout and stderr," +
+ " even though the limit was set to %d bytes. Increase the limit with @%s, ignore it completely" +
+ " with @%s or run with -Dtests.verbose=true",
+ bytesWritten.get(),
+ limit,
+ Limit.class.getSimpleName(),
+ SuppressSysoutChecks.class.getSimpleName()));
+ }
+ }
+ }
+
+ /**
+ * Restore original streams.
+ */
+ @Override
+ protected void afterAlways(List<Throwable> errors) throws Throwable {
+ resetCaptureState();
+ }
+
+ private void resetCaptureState() {
+ capturedSystemOut.printStream.flush();
+ capturedSystemErr.printStream.flush();
+ bytesWritten.set(0);
+ }
+}
+
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index a01f02d..cc2f476 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -119,7 +119,7 @@
SolrIgnoredThreadsFilter.class,
QuickPatchThreadsFilter.class
})
-@SuppressSysoutChecks(bugUrl = "Solr dumps logs to console.")
+@SuppressSysoutChecks(bugUrl = "Solr dumps tons of logs to console.")
public abstract class SolrTestCaseJ4 extends LuceneTestCase {
private static String coreName = ConfigSolrXmlOld.DEFAULT_DEFAULT_CORE_NAME;
public static int DEFAULT_CONNECTION_TIMEOUT = 60000; // default socket connection timeout in ms
