Apache Lucene open-source search software
Fix TestSysoutLimits by making nested test classes not extend LuceneTestCase (#14309)
Dawid Weiss1130a29f4fec
diff --git a/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestSysoutsLimits.java b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestSysoutsLimits.javaindex b2c0c0763a7..3d2ef8b0d4d 100644--- a/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestSysoutsLimits.java+++ b/lucene/test-framework/src/test/org/apache/lucene/tests/util/TestSysoutsLimits.java@@ -18,10 +18,13 @@ package org.apache.lucene.tests.util;import com.carrotsearch.randomizedtesting.RandomizedTest;import java.util.stream.Collectors;-import org.apache.lucene.internal.vectorization.VectorizationProvider;import org.junit.Assert;+import org.junit.Assume;import org.junit.BeforeClass;+import org.junit.ClassRule;import org.junit.Test;+import org.junit.rules.RuleChain;+import org.junit.rules.TestRule;import org.junit.runner.JUnitCore;import org.junit.runner.Result;@@ -31,23 +34,32 @@ import org.junit.runner.Result;public class TestSysoutsLimits extends WithNestedTests {public TestSysoutsLimits() {super(false);-- // vectorization provider may print a warning during initialization,- // and we count sysout/syserr bytes exactly so bootstrap any- // initializations early.- VectorizationProvider.getInstance();}- public static class ParentNestedTest extends LuceneTestCase+ @TestRuleLimitSysouts.Limit(+ bytes = TestRuleLimitSysouts.DEFAULT_LIMIT,+ hardLimit = TestRuleLimitSysouts.DEFAULT_HARD_LIMIT)+ public static class ParentNestedTest extends RandomizedTestimplements TestRuleIgnoreTestSuites.NestedTestSuite {+ @ClassRule public static final TestRule classRules;++ static {+ var suiteFailureMarker = new TestRuleMarkFailure();+ classRules =+ RuleChain.outerRule(new TestRuleIgnoreTestSuites())+ .around(suiteFailureMarker)+ .around(new TestRuleLimitSysouts(suiteFailureMarker));+ }+@BeforeClasspublic static void onlyWhenNested() {- assumeTrue("Only runs when nested", TestRuleIgnoreTestSuites.isRunningNested());+ Assume.assumeTrue("Only runs when nested", TestRuleIgnoreTestSuites.isRunningNested());}}@TestRuleLimitSysouts.Limit(bytes = 10)public static class OverSoftLimit extends ParentNestedTest {+ @Testpublic void testWrite() {System.out.print(RandomizedTest.randomAsciiLettersOfLength(10));}@@ -68,6 +80,7 @@ public class TestSysoutsLimits extends WithNestedTests {@TestRuleLimitSysouts.Limit(bytes = 10)public static class UnderLimit extends ParentNestedTest {+ @Testpublic void testWrite() {System.out.print(RandomizedTest.randomAsciiLettersOfLength(9));}@@ -88,6 +101,7 @@ public class TestSysoutsLimits extends WithNestedTests {@TestRuleLimitSysouts.Limit(bytes = 10, hardLimit = 20)public static class OverHardLimit extends ParentNestedTest {+ @Testpublic void testWrite() {System.out.print("1234567890");System.out.print("-marker1-");