diff --git a/src/test/java/tools/jackson/core/Base64VariantTest.java b/src/test/java/tools/jackson/core/Base64VariantTest.java index 0c93921b2a..a07836027e 100644 --- a/src/test/java/tools/jackson/core/Base64VariantTest.java +++ b/src/test/java/tools/jackson/core/Base64VariantTest.java @@ -13,7 +13,7 @@ * @see Base64Variant **/ @SuppressWarnings("resource") -public class Base64VariantTest extends JUnit5TestBase +public class Base64VariantTest extends JacksonCoreTestBase { @Test public void testDecodeTaking2ArgumentsThrowsIllegalArgumentException() { diff --git a/src/test/java/tools/jackson/core/ComponentVersionsTest.java b/src/test/java/tools/jackson/core/ComponentVersionsTest.java index 2ac5496119..bf885f1017 100644 --- a/src/test/java/tools/jackson/core/ComponentVersionsTest.java +++ b/src/test/java/tools/jackson/core/ComponentVersionsTest.java @@ -12,7 +12,7 @@ * Tests to verify functioning of {@link Version} class. */ class ComponentVersionsTest - extends JUnit5TestBase + extends JacksonCoreTestBase { @Test void coreVersions() throws Exception diff --git a/src/test/java/tools/jackson/core/ErrorReportConfigurationMaxRawContentLengthTest.java b/src/test/java/tools/jackson/core/ErrorReportConfigurationMaxRawContentLengthTest.java index 3f1be7f25f..0d06c5c9c1 100644 --- a/src/test/java/tools/jackson/core/ErrorReportConfigurationMaxRawContentLengthTest.java +++ b/src/test/java/tools/jackson/core/ErrorReportConfigurationMaxRawContentLengthTest.java @@ -8,7 +8,7 @@ * Unit tests for class {@link ErrorReportConfiguration#getMaxRawContentLength()}. */ public class ErrorReportConfigurationMaxRawContentLengthTest - extends JUnit5TestBase + extends JacksonCoreTestBase { /* /********************************************************** diff --git a/src/test/java/tools/jackson/core/ErrorReportConfigurationTest.java b/src/test/java/tools/jackson/core/ErrorReportConfigurationTest.java index 74428bd8c4..c1ce1cedde 100644 --- a/src/test/java/tools/jackson/core/ErrorReportConfigurationTest.java +++ b/src/test/java/tools/jackson/core/ErrorReportConfigurationTest.java @@ -14,7 +14,7 @@ * Unit tests for class {@link ErrorReportConfiguration}. */ class ErrorReportConfigurationTest - extends JUnit5TestBase + extends JacksonCoreTestBase { /* /********************************************************** diff --git a/src/test/java/tools/jackson/core/ExceptionsTest.java b/src/test/java/tools/jackson/core/ExceptionsTest.java index 05e9ac513b..8f290713d7 100644 --- a/src/test/java/tools/jackson/core/ExceptionsTest.java +++ b/src/test/java/tools/jackson/core/ExceptionsTest.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.*; class ExceptionsTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/JDKSerializabilityTest.java b/src/test/java/tools/jackson/core/JDKSerializabilityTest.java index 0ee18855a7..bf810e4b1a 100644 --- a/src/test/java/tools/jackson/core/JDKSerializabilityTest.java +++ b/src/test/java/tools/jackson/core/JDKSerializabilityTest.java @@ -19,7 +19,7 @@ * may be JDK serialized/deserialized. */ class JDKSerializabilityTest - extends JUnit5TestBase + extends JacksonCoreTestBase { /* /********************************************************************** diff --git a/src/test/java/tools/jackson/core/JUnit5TestBase.java b/src/test/java/tools/jackson/core/JacksonCoreTestBase.java similarity index 99% rename from src/test/java/tools/jackson/core/JUnit5TestBase.java rename to src/test/java/tools/jackson/core/JacksonCoreTestBase.java index c3a6a564f9..832276154e 100644 --- a/src/test/java/tools/jackson/core/JUnit5TestBase.java +++ b/src/test/java/tools/jackson/core/JacksonCoreTestBase.java @@ -15,7 +15,7 @@ *

* NOTE: replacement of Jackson 2.x JUnit4-based {@code BaseTest} */ -public class JUnit5TestBase +public class JacksonCoreTestBase extends JacksonTestUtilBase { protected final static String FIELD_BASENAME = "f"; diff --git a/src/test/java/tools/jackson/core/JsonpCharacterEscapesTest.java b/src/test/java/tools/jackson/core/JsonpCharacterEscapesTest.java index 6cc7aac792..7fd393bd49 100644 --- a/src/test/java/tools/jackson/core/JsonpCharacterEscapesTest.java +++ b/src/test/java/tools/jackson/core/JsonpCharacterEscapesTest.java @@ -13,7 +13,7 @@ * @see JsonpCharacterEscapes */ class JsonpCharacterEscapesTest - extends JUnit5TestBase + extends JacksonCoreTestBase { @Test void getEscapeSequenceOne() { diff --git a/src/test/java/tools/jackson/core/ParserFeatureDefaultsTest.java b/src/test/java/tools/jackson/core/ParserFeatureDefaultsTest.java index ae005e9110..ecc5f7f981 100644 --- a/src/test/java/tools/jackson/core/ParserFeatureDefaultsTest.java +++ b/src/test/java/tools/jackson/core/ParserFeatureDefaultsTest.java @@ -1,6 +1,6 @@ package tools.jackson.core; -public class ParserFeatureDefaultsTest extends JUnit5TestBase +public class ParserFeatureDefaultsTest extends JacksonCoreTestBase { // 25-Jun-2022, tatu: Seems only relevant for 2.x, but leave the class here, // just in case it might be needed in future. diff --git a/src/test/java/tools/jackson/core/TokenStreamLocationTest.java b/src/test/java/tools/jackson/core/TokenStreamLocationTest.java index 46769082de..2826062f92 100644 --- a/src/test/java/tools/jackson/core/TokenStreamLocationTest.java +++ b/src/test/java/tools/jackson/core/TokenStreamLocationTest.java @@ -18,7 +18,7 @@ * as opposed to accuracy of reported location information by parsers. */ class TokenStreamLocationTest - extends JUnit5TestBase + extends JacksonCoreTestBase { static class Foobar { } diff --git a/src/test/java/tools/jackson/core/VersionClassTest.java b/src/test/java/tools/jackson/core/VersionClassTest.java index 7206f7c959..5a54838eff 100644 --- a/src/test/java/tools/jackson/core/VersionClassTest.java +++ b/src/test/java/tools/jackson/core/VersionClassTest.java @@ -9,7 +9,7 @@ * Unit tests for class {@link Version}. */ class VersionClassTest - extends JUnit5TestBase + extends JacksonCoreTestBase { @Test void equalsAndHashCode() { diff --git a/src/test/java/tools/jackson/core/async/AsyncTestBase.java b/src/test/java/tools/jackson/core/async/AsyncTestBase.java index 719059a68f..a81c8d9222 100644 --- a/src/test/java/tools/jackson/core/async/AsyncTestBase.java +++ b/src/test/java/tools/jackson/core/async/AsyncTestBase.java @@ -6,7 +6,7 @@ import tools.jackson.core.testutil.AsyncReaderWrapperForByteArray; import tools.jackson.core.testutil.AsyncReaderWrapperForByteBuffer; -public abstract class AsyncTestBase extends JUnit5TestBase +public abstract class AsyncTestBase extends JacksonCoreTestBase { final static String SPACES = " "; diff --git a/src/test/java/tools/jackson/core/base/FactoryBaseImplsTest.java b/src/test/java/tools/jackson/core/base/FactoryBaseImplsTest.java index a613ba3c22..47ce57580a 100644 --- a/src/test/java/tools/jackson/core/base/FactoryBaseImplsTest.java +++ b/src/test/java/tools/jackson/core/base/FactoryBaseImplsTest.java @@ -13,7 +13,7 @@ // // In future might add some actual tests too @SuppressWarnings("serial") -class FactoryBaseImplsTest extends JUnit5TestBase +class FactoryBaseImplsTest extends JacksonCoreTestBase { static class ToyBinaryFormatFactory extends BinaryTSFactory diff --git a/src/test/java/tools/jackson/core/base64/Base64BinaryParsingTest.java b/src/test/java/tools/jackson/core/base64/Base64BinaryParsingTest.java index 111c4d11be..eead7bd9d0 100644 --- a/src/test/java/tools/jackson/core/base64/Base64BinaryParsingTest.java +++ b/src/test/java/tools/jackson/core/base64/Base64BinaryParsingTest.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.*; class Base64BinaryParsingTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/base64/Base64CodecTest.java b/src/test/java/tools/jackson/core/base64/Base64CodecTest.java index afba5dc06d..896b020dd6 100644 --- a/src/test/java/tools/jackson/core/base64/Base64CodecTest.java +++ b/src/test/java/tools/jackson/core/base64/Base64CodecTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.*; class Base64CodecTest - extends JUnit5TestBase + extends JacksonCoreTestBase { @Test void variantAccess() diff --git a/src/test/java/tools/jackson/core/base64/Base64GenerationTest.java b/src/test/java/tools/jackson/core/base64/Base64GenerationTest.java index 5d9179fa60..939999f350 100644 --- a/src/test/java/tools/jackson/core/base64/Base64GenerationTest.java +++ b/src/test/java/tools/jackson/core/base64/Base64GenerationTest.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class Base64GenerationTest - extends JUnit5TestBase + extends JacksonCoreTestBase { /* The usual sample input string, from Thomas Hobbes's "Leviathan" * (via Wikipedia) diff --git a/src/test/java/tools/jackson/core/base64/Base64Padding912Test.java b/src/test/java/tools/jackson/core/base64/Base64Padding912Test.java index 5bb0efd797..855ce7eec5 100644 --- a/src/test/java/tools/jackson/core/base64/Base64Padding912Test.java +++ b/src/test/java/tools/jackson/core/base64/Base64Padding912Test.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; class Base64Padding912Test - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/constraints/DeeplyNestedContentReadTest.java b/src/test/java/tools/jackson/core/constraints/DeeplyNestedContentReadTest.java index 60c3a72a62..b442f1d61d 100644 --- a/src/test/java/tools/jackson/core/constraints/DeeplyNestedContentReadTest.java +++ b/src/test/java/tools/jackson/core/constraints/DeeplyNestedContentReadTest.java @@ -12,7 +12,7 @@ * wrt maximum nesting depth. */ public class DeeplyNestedContentReadTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/constraints/LargeNameReadTest.java b/src/test/java/tools/jackson/core/constraints/LargeNameReadTest.java index a150f0c0d0..1a34f0872a 100644 --- a/src/test/java/tools/jackson/core/constraints/LargeNameReadTest.java +++ b/src/test/java/tools/jackson/core/constraints/LargeNameReadTest.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.fail; // [core#1047]: Add max-name-length constraints -class LargeNameReadTest extends JUnit5TestBase +class LargeNameReadTest extends JacksonCoreTestBase { private final JsonFactory JSON_F_DEFAULT = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/constraints/LargeNumberReadTest.java b/src/test/java/tools/jackson/core/constraints/LargeNumberReadTest.java index 2715f2e0b9..c892322e42 100644 --- a/src/test/java/tools/jackson/core/constraints/LargeNumberReadTest.java +++ b/src/test/java/tools/jackson/core/constraints/LargeNumberReadTest.java @@ -18,7 +18,7 @@ @SuppressWarnings("resource") class LargeNumberReadTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { private final JsonFactory JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/constraints/LargeNumberWriteTest.java b/src/test/java/tools/jackson/core/constraints/LargeNumberWriteTest.java index 470fff7a05..45df52d3bf 100644 --- a/src/test/java/tools/jackson/core/constraints/LargeNumberWriteTest.java +++ b/src/test/java/tools/jackson/core/constraints/LargeNumberWriteTest.java @@ -19,7 +19,7 @@ * * @since 2.15 */ -class LargeNumberWriteTest extends JUnit5TestBase +class LargeNumberWriteTest extends JacksonCoreTestBase { private final JsonFactory VANILLA_JSON_F = new JsonFactory(); diff --git a/src/test/java/tools/jackson/core/constraints/TokenCountTest.java b/src/test/java/tools/jackson/core/constraints/TokenCountTest.java index d24036d52c..612b8221b2 100644 --- a/src/test/java/tools/jackson/core/constraints/TokenCountTest.java +++ b/src/test/java/tools/jackson/core/constraints/TokenCountTest.java @@ -15,7 +15,7 @@ * Set of basic unit tests for verifying that the token count * functionality works as expected. */ -public class TokenCountTest extends JUnit5TestBase { +public class TokenCountTest extends JacksonCoreTestBase { private final static JsonFactory JSON_FACTORY = JsonFactory.builder() .streamReadConstraints(StreamReadConstraints.builder().maxTokenCount(Long.MAX_VALUE).build()) .build(); diff --git a/src/test/java/tools/jackson/core/filter/BasicGeneratorFilteringTest.java b/src/test/java/tools/jackson/core/filter/BasicGeneratorFilteringTest.java index d9442aa0f2..6d5d86bf3e 100644 --- a/src/test/java/tools/jackson/core/filter/BasicGeneratorFilteringTest.java +++ b/src/test/java/tools/jackson/core/filter/BasicGeneratorFilteringTest.java @@ -19,7 +19,7 @@ * filtering. */ @SuppressWarnings("resource") -class BasicGeneratorFilteringTest extends JUnit5TestBase +class BasicGeneratorFilteringTest extends JacksonCoreTestBase { static final TokenFilter INCLUDE_ALL_SCALARS = new TokenFilter(); diff --git a/src/test/java/tools/jackson/core/filter/BasicParserFilteringTest.java b/src/test/java/tools/jackson/core/filter/BasicParserFilteringTest.java index 66dc556c7a..dd6434df20 100644 --- a/src/test/java/tools/jackson/core/filter/BasicParserFilteringTest.java +++ b/src/test/java/tools/jackson/core/filter/BasicParserFilteringTest.java @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.*; @SuppressWarnings("resource") -class BasicParserFilteringTest extends JUnit5TestBase +class BasicParserFilteringTest extends JacksonCoreTestBase { static class NameMatchFilter extends TokenFilter { diff --git a/src/test/java/tools/jackson/core/filter/GeneratorFiltering609Test.java b/src/test/java/tools/jackson/core/filter/GeneratorFiltering609Test.java index 7b3e32db3d..782aed1c32 100644 --- a/src/test/java/tools/jackson/core/filter/GeneratorFiltering609Test.java +++ b/src/test/java/tools/jackson/core/filter/GeneratorFiltering609Test.java @@ -11,7 +11,7 @@ // for [core#609] class GeneratorFiltering609Test - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { static class NullExcludingTokenFilter extends TokenFilter { static final NullExcludingTokenFilter INSTANCE = diff --git a/src/test/java/tools/jackson/core/filter/GeneratorFiltering890Test.java b/src/test/java/tools/jackson/core/filter/GeneratorFiltering890Test.java index 6a6d558414..111b52c7c3 100644 --- a/src/test/java/tools/jackson/core/filter/GeneratorFiltering890Test.java +++ b/src/test/java/tools/jackson/core/filter/GeneratorFiltering890Test.java @@ -16,7 +16,7 @@ // for [core#890] class GeneratorFiltering890Test - extends JUnit5TestBase + extends JacksonCoreTestBase { private static final class OrTokenFilter extends TokenFilter { diff --git a/src/test/java/tools/jackson/core/filter/JsonPointerGeneratorFilteringTest.java b/src/test/java/tools/jackson/core/filter/JsonPointerGeneratorFilteringTest.java index 2dfe6b1250..4ea215e03a 100644 --- a/src/test/java/tools/jackson/core/filter/JsonPointerGeneratorFilteringTest.java +++ b/src/test/java/tools/jackson/core/filter/JsonPointerGeneratorFilteringTest.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; @SuppressWarnings("resource") -class JsonPointerGeneratorFilteringTest extends tools.jackson.core.JUnit5TestBase +class JsonPointerGeneratorFilteringTest extends tools.jackson.core.JacksonCoreTestBase { private final JsonFactory JSON_F = new JsonFactory(); diff --git a/src/test/java/tools/jackson/core/filter/JsonPointerParserFilteringTest.java b/src/test/java/tools/jackson/core/filter/JsonPointerParserFilteringTest.java index 7ec87f68ba..ad4b9c8f3a 100644 --- a/src/test/java/tools/jackson/core/filter/JsonPointerParserFilteringTest.java +++ b/src/test/java/tools/jackson/core/filter/JsonPointerParserFilteringTest.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -class JsonPointerParserFilteringTest extends tools.jackson.core.JUnit5TestBase +class JsonPointerParserFilteringTest extends tools.jackson.core.JacksonCoreTestBase { private final JsonFactory JSON_F = new JsonFactory(); diff --git a/src/test/java/tools/jackson/core/filter/ParserFiltering700Test.java b/src/test/java/tools/jackson/core/filter/ParserFiltering700Test.java index 79e8d26b67..dc896dcc09 100644 --- a/src/test/java/tools/jackson/core/filter/ParserFiltering700Test.java +++ b/src/test/java/tools/jackson/core/filter/ParserFiltering700Test.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.*; @SuppressWarnings("resource") -class ParserFiltering700Test extends JUnit5TestBase +class ParserFiltering700Test extends JacksonCoreTestBase { static class NoTypeFilter extends TokenFilter { @Override diff --git a/src/test/java/tools/jackson/core/fuzz/Fuzz32208UTF32ParseTest.java b/src/test/java/tools/jackson/core/fuzz/Fuzz32208UTF32ParseTest.java index 09757a9cda..27dc6b7545 100644 --- a/src/test/java/tools/jackson/core/fuzz/Fuzz32208UTF32ParseTest.java +++ b/src/test/java/tools/jackson/core/fuzz/Fuzz32208UTF32ParseTest.java @@ -16,7 +16,7 @@ // Trying to repro: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=32216 // but so far without success (fails on seemingly legit validation problem) -class Fuzz32208UTF32ParseTest extends JUnit5TestBase +class Fuzz32208UTF32ParseTest extends JacksonCoreTestBase { private final byte[] DOC = readResource("/data/fuzz-json-utf32-32208.json"); diff --git a/src/test/java/tools/jackson/core/fuzz/Fuzz34435ParseTest.java b/src/test/java/tools/jackson/core/fuzz/Fuzz34435ParseTest.java index 367c1d6efd..1d5990f886 100644 --- a/src/test/java/tools/jackson/core/fuzz/Fuzz34435ParseTest.java +++ b/src/test/java/tools/jackson/core/fuzz/Fuzz34435ParseTest.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.fail; // Trying to repro: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34435 -class Fuzz34435ParseTest extends JUnit5TestBase +class Fuzz34435ParseTest extends JacksonCoreTestBase { private final byte[] DOC = readResource("/data/fuzz-json-34435.json"); diff --git a/src/test/java/tools/jackson/core/fuzz/Fuzz52688ParseTest.java b/src/test/java/tools/jackson/core/fuzz/Fuzz52688ParseTest.java index 7be61255b6..4e6cc2fa00 100644 --- a/src/test/java/tools/jackson/core/fuzz/Fuzz52688ParseTest.java +++ b/src/test/java/tools/jackson/core/fuzz/Fuzz52688ParseTest.java @@ -15,7 +15,7 @@ // Reproducing: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=52688 // (reported as [core#834] -class Fuzz52688ParseTest extends JUnit5TestBase +class Fuzz52688ParseTest extends JacksonCoreTestBase { private final JsonFactory JSON_F = new JsonFactory(); diff --git a/src/test/java/tools/jackson/core/fuzz/Fuzz61198_1169_NumberParseTest.java b/src/test/java/tools/jackson/core/fuzz/Fuzz61198_1169_NumberParseTest.java index 4f4a663121..ef0b91740c 100644 --- a/src/test/java/tools/jackson/core/fuzz/Fuzz61198_1169_NumberParseTest.java +++ b/src/test/java/tools/jackson/core/fuzz/Fuzz61198_1169_NumberParseTest.java @@ -13,7 +13,7 @@ // // * [core#1169], // * https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=61198 -class Fuzz61198_1169_NumberParseTest extends JUnit5TestBase +class Fuzz61198_1169_NumberParseTest extends JacksonCoreTestBase { // NOTE! Not enough to enable just first, but both it seem private final JsonFactory JSON_F = JsonFactory.builder() diff --git a/src/test/java/tools/jackson/core/io/BigDecimalParserTest.java b/src/test/java/tools/jackson/core/io/BigDecimalParserTest.java index 8781628be1..fb96613f89 100644 --- a/src/test/java/tools/jackson/core/io/BigDecimalParserTest.java +++ b/src/test/java/tools/jackson/core/io/BigDecimalParserTest.java @@ -5,11 +5,11 @@ import ch.randelshofer.fastdoubleparser.JavaBigDecimalParser; import org.junit.jupiter.api.Test; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import static org.junit.jupiter.api.Assertions.*; -class BigDecimalParserTest extends JUnit5TestBase +class BigDecimalParserTest extends JacksonCoreTestBase { @Test void longInvalidStringParse() { diff --git a/src/test/java/tools/jackson/core/io/BigIntegerParserTest.java b/src/test/java/tools/jackson/core/io/BigIntegerParserTest.java index 361315a9fe..d70a3f91e6 100644 --- a/src/test/java/tools/jackson/core/io/BigIntegerParserTest.java +++ b/src/test/java/tools/jackson/core/io/BigIntegerParserTest.java @@ -2,12 +2,12 @@ import org.junit.jupiter.api.Test; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -class BigIntegerParserTest extends JUnit5TestBase { +class BigIntegerParserTest extends JacksonCoreTestBase { @Test void fastParseBigIntegerFailsWithENotation() { diff --git a/src/test/java/tools/jackson/core/io/BufferRecyclerPoolTest.java b/src/test/java/tools/jackson/core/io/BufferRecyclerPoolTest.java index 63fdf38ecf..be3289621d 100644 --- a/src/test/java/tools/jackson/core/io/BufferRecyclerPoolTest.java +++ b/src/test/java/tools/jackson/core/io/BufferRecyclerPoolTest.java @@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.*; // Tests for [core#1064] wrt custom `BufferRecycler` -class BufferRecyclerPoolTest extends JUnit5TestBase +class BufferRecyclerPoolTest extends JacksonCoreTestBase { @Test void noOp() throws Exception { diff --git a/src/test/java/tools/jackson/core/io/MergedStreamTest.java b/src/test/java/tools/jackson/core/io/MergedStreamTest.java index 3cd0cbbc9d..1bc9ed6d62 100644 --- a/src/test/java/tools/jackson/core/io/MergedStreamTest.java +++ b/src/test/java/tools/jackson/core/io/MergedStreamTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.*; class MergedStreamTest - extends JUnit5TestBase + extends JacksonCoreTestBase { @Test void simple() throws Exception diff --git a/src/test/java/tools/jackson/core/io/NumberInputTest.java b/src/test/java/tools/jackson/core/io/NumberInputTest.java index 84538d7769..ffdc81b976 100644 --- a/src/test/java/tools/jackson/core/io/NumberInputTest.java +++ b/src/test/java/tools/jackson/core/io/NumberInputTest.java @@ -4,12 +4,12 @@ import org.junit.jupiter.api.Test; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import static org.junit.jupiter.api.Assertions.*; class NumberInputTest - extends JUnit5TestBase + extends JacksonCoreTestBase { @Test void nastySmallDouble() diff --git a/src/test/java/tools/jackson/core/io/SegmentedStringWriterTest.java b/src/test/java/tools/jackson/core/io/SegmentedStringWriterTest.java index bafcdf3033..4eb72a845f 100644 --- a/src/test/java/tools/jackson/core/io/SegmentedStringWriterTest.java +++ b/src/test/java/tools/jackson/core/io/SegmentedStringWriterTest.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.*; class SegmentedStringWriterTest - extends JUnit5TestBase + extends JacksonCoreTestBase { @Test void simple() throws Exception diff --git a/src/test/java/tools/jackson/core/io/TestCharTypes.java b/src/test/java/tools/jackson/core/io/TestCharTypes.java index 90db6fc95c..ced938ce62 100644 --- a/src/test/java/tools/jackson/core/io/TestCharTypes.java +++ b/src/test/java/tools/jackson/core/io/TestCharTypes.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class TestCharTypes - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { @Test void appendQuoted031() diff --git a/src/test/java/tools/jackson/core/io/TestIOContext.java b/src/test/java/tools/jackson/core/io/TestIOContext.java index ac02786874..edc7c83273 100644 --- a/src/test/java/tools/jackson/core/io/TestIOContext.java +++ b/src/test/java/tools/jackson/core/io/TestIOContext.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; class TestIOContext - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { @Test void allocations() throws Exception diff --git a/src/test/java/tools/jackson/core/io/TestJsonStringEncoder.java b/src/test/java/tools/jackson/core/io/TestJsonStringEncoder.java index 60239c59d4..3d578d6b8f 100644 --- a/src/test/java/tools/jackson/core/io/TestJsonStringEncoder.java +++ b/src/test/java/tools/jackson/core/io/TestJsonStringEncoder.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class TestJsonStringEncoder - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { @Test void quoteAsString() throws Exception diff --git a/src/test/java/tools/jackson/core/io/UTF8WriterTest.java b/src/test/java/tools/jackson/core/io/UTF8WriterTest.java index 9459d04fee..5761b5bf69 100644 --- a/src/test/java/tools/jackson/core/io/UTF8WriterTest.java +++ b/src/test/java/tools/jackson/core/io/UTF8WriterTest.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.*; class UTF8WriterTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { @Test void simple() throws Exception diff --git a/src/test/java/tools/jackson/core/json/BoundsChecksWithJsonFactoryTest.java b/src/test/java/tools/jackson/core/json/BoundsChecksWithJsonFactoryTest.java index 8538110438..81d2570982 100644 --- a/src/test/java/tools/jackson/core/json/BoundsChecksWithJsonFactoryTest.java +++ b/src/test/java/tools/jackson/core/json/BoundsChecksWithJsonFactoryTest.java @@ -8,7 +8,7 @@ import static org.junit.jupiter.api.Assertions.fail; class BoundsChecksWithJsonFactoryTest - extends JUnit5TestBase + extends JacksonCoreTestBase { interface ByteBackedCreation { void call(byte[] data, int offset, int len) throws Exception; diff --git a/src/test/java/tools/jackson/core/json/CustomQuoteCharTest.java b/src/test/java/tools/jackson/core/json/CustomQuoteCharTest.java index c74071fa49..a1be763e42 100644 --- a/src/test/java/tools/jackson/core/json/CustomQuoteCharTest.java +++ b/src/test/java/tools/jackson/core/json/CustomQuoteCharTest.java @@ -11,7 +11,7 @@ // For [core#549], ability to use alternate quote characters class CustomQuoteCharTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { final JsonFactory JSON_F = streamFactoryBuilder() .quoteChar('\'') diff --git a/src/test/java/tools/jackson/core/json/GeneratorFailFromReaderTest.java b/src/test/java/tools/jackson/core/json/GeneratorFailFromReaderTest.java index 87233316d0..8892a0e655 100644 --- a/src/test/java/tools/jackson/core/json/GeneratorFailFromReaderTest.java +++ b/src/test/java/tools/jackson/core/json/GeneratorFailFromReaderTest.java @@ -15,7 +15,7 @@ import static org.junit.jupiter.api.Assertions.fail; class GeneratorFailFromReaderTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { private final JsonFactory F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/json/GeneratorFailTest.java b/src/test/java/tools/jackson/core/json/GeneratorFailTest.java index 975bf83b01..c1512e0b2f 100644 --- a/src/test/java/tools/jackson/core/json/GeneratorFailTest.java +++ b/src/test/java/tools/jackson/core/json/GeneratorFailTest.java @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.fail; class GeneratorFailTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { private final JsonFactory F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/json/InputStreamInitTest.java b/src/test/java/tools/jackson/core/json/InputStreamInitTest.java index 6a8e2222fd..ed48519ee3 100644 --- a/src/test/java/tools/jackson/core/json/InputStreamInitTest.java +++ b/src/test/java/tools/jackson/core/json/InputStreamInitTest.java @@ -13,7 +13,7 @@ // [core#763] (and [databind#3455] class InputStreamInitTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { static class FailingInputStream extends InputStream { public boolean closed = false; diff --git a/src/test/java/tools/jackson/core/json/JsonFactoryTest.java b/src/test/java/tools/jackson/core/json/JsonFactoryTest.java index d18ca3fdb1..56355b5efc 100644 --- a/src/test/java/tools/jackson/core/json/JsonFactoryTest.java +++ b/src/test/java/tools/jackson/core/json/JsonFactoryTest.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.*; public class JsonFactoryTest - extends JUnit5TestBase + extends JacksonCoreTestBase { static class BogusSchema implements FormatSchema { diff --git a/src/test/java/tools/jackson/core/json/JsonReadContextTest.java b/src/test/java/tools/jackson/core/json/JsonReadContextTest.java index 11a84891b2..f9a47c17a7 100644 --- a/src/test/java/tools/jackson/core/json/JsonReadContextTest.java +++ b/src/test/java/tools/jackson/core/json/JsonReadContextTest.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import tools.jackson.core.JsonGenerator; import tools.jackson.core.exc.StreamReadException; import tools.jackson.core.io.ContentReference; @@ -12,7 +12,7 @@ /** * Unit tests for class {@link JsonReadContext}. */ -class JsonReadContextTest extends JUnit5TestBase +class JsonReadContextTest extends JacksonCoreTestBase { @Test void setCurrentNameTwiceWithSameNameRaisesJsonParseException() throws Exception diff --git a/src/test/java/tools/jackson/core/json/JsonReadFeaturesTest.java b/src/test/java/tools/jackson/core/json/JsonReadFeaturesTest.java index 1066de81bc..78a82d58a9 100644 --- a/src/test/java/tools/jackson/core/json/JsonReadFeaturesTest.java +++ b/src/test/java/tools/jackson/core/json/JsonReadFeaturesTest.java @@ -13,7 +13,7 @@ * settings work as expected. */ class JsonReadFeaturesTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory JSON_F = sharedStreamFactory(); diff --git a/src/test/java/tools/jackson/core/json/OutputStreamInitTest.java b/src/test/java/tools/jackson/core/json/OutputStreamInitTest.java index ff39756e22..9bf401983f 100644 --- a/src/test/java/tools/jackson/core/json/OutputStreamInitTest.java +++ b/src/test/java/tools/jackson/core/json/OutputStreamInitTest.java @@ -12,7 +12,7 @@ //[core#764] (and [databind#3508] class OutputStreamInitTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { static class FailingOutputStream extends OutputStream { public int written = 0; diff --git a/src/test/java/tools/jackson/core/json/ParserOverridesTest.java b/src/test/java/tools/jackson/core/json/ParserOverridesTest.java index 071b15c689..2b98f79a11 100644 --- a/src/test/java/tools/jackson/core/json/ParserOverridesTest.java +++ b/src/test/java/tools/jackson/core/json/ParserOverridesTest.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.*; -public class ParserOverridesTest extends JUnit5TestBase +public class ParserOverridesTest extends JacksonCoreTestBase { /* /********************************************************** diff --git a/src/test/java/tools/jackson/core/json/RawValueWithSurrogatesTest.java b/src/test/java/tools/jackson/core/json/RawValueWithSurrogatesTest.java index ce99f1cf90..9559df2eb0 100644 --- a/src/test/java/tools/jackson/core/json/RawValueWithSurrogatesTest.java +++ b/src/test/java/tools/jackson/core/json/RawValueWithSurrogatesTest.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; class RawValueWithSurrogatesTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { final String SURROGATES_307; { diff --git a/src/test/java/tools/jackson/core/json/StreamWriteFeaturesTest.java b/src/test/java/tools/jackson/core/json/StreamWriteFeaturesTest.java index d70b6bc381..9d17528d25 100644 --- a/src/test/java/tools/jackson/core/json/StreamWriteFeaturesTest.java +++ b/src/test/java/tools/jackson/core/json/StreamWriteFeaturesTest.java @@ -16,7 +16,7 @@ * functionality works as expected. */ class GeneratorFeaturesTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { private final JsonFactory JSON_F = new JsonFactory(); diff --git a/src/test/java/tools/jackson/core/json/StringGenerationFromReaderTest.java b/src/test/java/tools/jackson/core/json/StringGenerationFromReaderTest.java index 8936516279..6848ca1a81 100644 --- a/src/test/java/tools/jackson/core/json/StringGenerationFromReaderTest.java +++ b/src/test/java/tools/jackson/core/json/StringGenerationFromReaderTest.java @@ -14,7 +14,7 @@ * generation, including character escaping, works as expected. */ class StringGenerationFromReaderTest - extends JUnit5TestBase + extends JacksonCoreTestBase { final static String[] SAMPLES = new String[] { "\"test\"", diff --git a/src/test/java/tools/jackson/core/json/StringGenerationTest.java b/src/test/java/tools/jackson/core/json/StringGenerationTest.java index d80c6b8279..475de40cce 100644 --- a/src/test/java/tools/jackson/core/json/StringGenerationTest.java +++ b/src/test/java/tools/jackson/core/json/StringGenerationTest.java @@ -14,7 +14,7 @@ * generation, including character escaping, works as expected. */ class StringGenerationTest - extends JUnit5TestBase + extends JacksonCoreTestBase { final static String[] SAMPLES = new String[] { "\"test\"", diff --git a/src/test/java/tools/jackson/core/json/TestCharEscaping.java b/src/test/java/tools/jackson/core/json/TestCharEscaping.java index ec9df32bcc..420bd7a249 100644 --- a/src/test/java/tools/jackson/core/json/TestCharEscaping.java +++ b/src/test/java/tools/jackson/core/json/TestCharEscaping.java @@ -16,7 +16,7 @@ * functionality works as expected. */ class TestCharEscaping - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { @SuppressWarnings("serial") private final static CharacterEscapes ESC_627 = new CharacterEscapes() { diff --git a/src/test/java/tools/jackson/core/json/TestCustomEscaping.java b/src/test/java/tools/jackson/core/json/TestCustomEscaping.java index a3f80b977c..91ca2833ec 100644 --- a/src/test/java/tools/jackson/core/json/TestCustomEscaping.java +++ b/src/test/java/tools/jackson/core/json/TestCustomEscaping.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -class TestCustomEscaping extends tools.jackson.core.JUnit5TestBase +class TestCustomEscaping extends tools.jackson.core.JacksonCoreTestBase { final static int TWO_BYTE_ESCAPED = 0x111; final static int THREE_BYTE_ESCAPED = 0x1111; diff --git a/src/test/java/tools/jackson/core/json/TestDecorators.java b/src/test/java/tools/jackson/core/json/TestDecorators.java index bc1c52cb14..035870b57a 100644 --- a/src/test/java/tools/jackson/core/json/TestDecorators.java +++ b/src/test/java/tools/jackson/core/json/TestDecorators.java @@ -19,7 +19,7 @@ * expected */ @SuppressWarnings("serial") -class TestDecorators extends tools.jackson.core.JUnit5TestBase +class TestDecorators extends tools.jackson.core.JacksonCoreTestBase { /* /********************************************************** diff --git a/src/test/java/tools/jackson/core/json/TestMaxErrorSize.java b/src/test/java/tools/jackson/core/json/TestMaxErrorSize.java index 03763443de..de9284c991 100644 --- a/src/test/java/tools/jackson/core/json/TestMaxErrorSize.java +++ b/src/test/java/tools/jackson/core/json/TestMaxErrorSize.java @@ -11,7 +11,7 @@ * Test size of parser error messages */ public class TestMaxErrorSize - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { private final static int EXPECTED_MAX_TOKEN_LEN = 256; // ParserBase.MAX_ERROR_TOKEN_LENGTH diff --git a/src/test/java/tools/jackson/core/json/TestRootValues.java b/src/test/java/tools/jackson/core/json/TestRootValues.java index 05c3294d13..17a5dac31c 100644 --- a/src/test/java/tools/jackson/core/json/TestRootValues.java +++ b/src/test/java/tools/jackson/core/json/TestRootValues.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.*; class TestRootValues - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { static class Issue516InputStream extends InputStream { diff --git a/src/test/java/tools/jackson/core/json/TestUnicode.java b/src/test/java/tools/jackson/core/json/TestUnicode.java index fb2d00ca3c..2c6d9f4adc 100644 --- a/src/test/java/tools/jackson/core/json/TestUnicode.java +++ b/src/test/java/tools/jackson/core/json/TestUnicode.java @@ -8,7 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -class TestUnicode extends tools.jackson.core.JUnit5TestBase +class TestUnicode extends tools.jackson.core.JacksonCoreTestBase { @Test void surrogates() throws Exception diff --git a/src/test/java/tools/jackson/core/json/TestWithTonsaSymbols.java b/src/test/java/tools/jackson/core/json/TestWithTonsaSymbols.java index f0325a61a0..f686f8de7b 100644 --- a/src/test/java/tools/jackson/core/json/TestWithTonsaSymbols.java +++ b/src/test/java/tools/jackson/core/json/TestWithTonsaSymbols.java @@ -13,7 +13,7 @@ * deals with symbol (table) management. */ class TestWithTonsaSymbols - extends JUnit5TestBase + extends JacksonCoreTestBase { /** * How many fields to generate? Since maximum symbol table diff --git a/src/test/java/tools/jackson/core/jsonptr/Fuzz51806JsonPointerParse818Test.java b/src/test/java/tools/jackson/core/jsonptr/Fuzz51806JsonPointerParse818Test.java index 431e0a65df..552369ee0f 100644 --- a/src/test/java/tools/jackson/core/jsonptr/Fuzz51806JsonPointerParse818Test.java +++ b/src/test/java/tools/jackson/core/jsonptr/Fuzz51806JsonPointerParse818Test.java @@ -9,7 +9,7 @@ // For https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=51806 // (reported as [core#818] -class Fuzz51806JsonPointerParse818Test extends JUnit5TestBase +class Fuzz51806JsonPointerParse818Test extends JacksonCoreTestBase { // Before fix, StackOverflowError with 6_000 or so, // and OOME with 20_000. diff --git a/src/test/java/tools/jackson/core/jsonptr/JsonPointer1168Test.java b/src/test/java/tools/jackson/core/jsonptr/JsonPointer1168Test.java index 9108a251a4..669c7784fa 100644 --- a/src/test/java/tools/jackson/core/jsonptr/JsonPointer1168Test.java +++ b/src/test/java/tools/jackson/core/jsonptr/JsonPointer1168Test.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -class JsonPointer1168Test extends JUnit5TestBase +class JsonPointer1168Test extends JacksonCoreTestBase { // [core#1168] @Test diff --git a/src/test/java/tools/jackson/core/jsonptr/JsonPointer1328Test.java b/src/test/java/tools/jackson/core/jsonptr/JsonPointer1328Test.java index 9d08bbb603..1816bb709c 100644 --- a/src/test/java/tools/jackson/core/jsonptr/JsonPointer1328Test.java +++ b/src/test/java/tools/jackson/core/jsonptr/JsonPointer1328Test.java @@ -2,13 +2,13 @@ import org.junit.jupiter.api.Test; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import tools.jackson.core.JsonPointer; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.assertj.core.api.Assertions.assertThat; -class JsonPointer1328Test extends JUnit5TestBase +class JsonPointer1328Test extends JacksonCoreTestBase { // 5k enough on some systems to reproduce; use 10k private final static int DEPTH = 10_000; diff --git a/src/test/java/tools/jackson/core/jsonptr/JsonPointerOOME736Test.java b/src/test/java/tools/jackson/core/jsonptr/JsonPointerOOME736Test.java index 78cdd68397..ecb3651d36 100644 --- a/src/test/java/tools/jackson/core/jsonptr/JsonPointerOOME736Test.java +++ b/src/test/java/tools/jackson/core/jsonptr/JsonPointerOOME736Test.java @@ -8,7 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -class JsonPointerOOME736Test extends JUnit5TestBase +class JsonPointerOOME736Test extends JacksonCoreTestBase { // such as https://github.com/nst/JSONTestSuite/blob/master/test_parsing/n_structure_100000_opening_arrays.json @Test diff --git a/src/test/java/tools/jackson/core/jsonptr/JsonPointerTest.java b/src/test/java/tools/jackson/core/jsonptr/JsonPointerTest.java index 300701d927..51e50525db 100644 --- a/src/test/java/tools/jackson/core/jsonptr/JsonPointerTest.java +++ b/src/test/java/tools/jackson/core/jsonptr/JsonPointerTest.java @@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.*; -class JsonPointerTest extends JUnit5TestBase +class JsonPointerTest extends JacksonCoreTestBase { private final JsonPointer EMPTY_PTR = JsonPointer.empty(); diff --git a/src/test/java/tools/jackson/core/jsonptr/PointerFromContextTest.java b/src/test/java/tools/jackson/core/jsonptr/PointerFromContextTest.java index abd6b7a14c..4ee5f82714 100644 --- a/src/test/java/tools/jackson/core/jsonptr/PointerFromContextTest.java +++ b/src/test/java/tools/jackson/core/jsonptr/PointerFromContextTest.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.*; -public class PointerFromContextTest extends JUnit5TestBase +public class PointerFromContextTest extends JacksonCoreTestBase { /* /********************************************************** diff --git a/src/test/java/tools/jackson/core/read/ArrayParsingTest.java b/src/test/java/tools/jackson/core/read/ArrayParsingTest.java index 2f8463139e..4ec4b64d1b 100644 --- a/src/test/java/tools/jackson/core/read/ArrayParsingTest.java +++ b/src/test/java/tools/jackson/core/read/ArrayParsingTest.java @@ -12,7 +12,7 @@ * edge cases. */ public class ArrayParsingTest - extends JUnit5TestBase + extends JacksonCoreTestBase { public void testValidEmpty() throws Exception { diff --git a/src/test/java/tools/jackson/core/read/CommentParsingTest.java b/src/test/java/tools/jackson/core/read/CommentParsingTest.java index 0a532e8948..5f5059a0ea 100644 --- a/src/test/java/tools/jackson/core/read/CommentParsingTest.java +++ b/src/test/java/tools/jackson/core/read/CommentParsingTest.java @@ -16,7 +16,7 @@ * works as expected. */ class CommentParsingTest - extends JUnit5TestBase + extends JacksonCoreTestBase { final static String DOC_WITH_SLASHSTAR_COMMENT = "[ /* comment:\n ends here */ 1 /* one more ok to have \"unquoted\" and non-ascii: \u3456 \u00A0 */ ]" diff --git a/src/test/java/tools/jackson/core/read/DataInputTest.java b/src/test/java/tools/jackson/core/read/DataInputTest.java index 385a30f481..8dcf647085 100644 --- a/src/test/java/tools/jackson/core/read/DataInputTest.java +++ b/src/test/java/tools/jackson/core/read/DataInputTest.java @@ -12,7 +12,7 @@ * challenges for parsing. */ class DataInputTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory JSON_F = new JsonFactory(); diff --git a/src/test/java/tools/jackson/core/read/FloatParsingTest.java b/src/test/java/tools/jackson/core/read/FloatParsingTest.java index 42a355d38d..d6f0c7245b 100644 --- a/src/test/java/tools/jackson/core/read/FloatParsingTest.java +++ b/src/test/java/tools/jackson/core/read/FloatParsingTest.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; // for [core#755] -class FloatParsingTest extends JUnit5TestBase +class FloatParsingTest extends JacksonCoreTestBase { private final byte[] FLOATS_DOC = readResource("/data/floats-755.json"); diff --git a/src/test/java/tools/jackson/core/read/NextNameParserTest.java b/src/test/java/tools/jackson/core/read/NextNameParserTest.java index 4b90fdd135..7e1447cc7c 100644 --- a/src/test/java/tools/jackson/core/read/NextNameParserTest.java +++ b/src/test/java/tools/jackson/core/read/NextNameParserTest.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import tools.jackson.core.JsonParser; import tools.jackson.core.JsonToken; @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; class NextNameParserTest - extends JUnit5TestBase + extends JacksonCoreTestBase { @Test void basicNextNameWithReader() throws Exception diff --git a/src/test/java/tools/jackson/core/read/NextNameWithMatcherTest.java b/src/test/java/tools/jackson/core/read/NextNameWithMatcherTest.java index 99dca0d120..8c3b3a4a4f 100644 --- a/src/test/java/tools/jackson/core/read/NextNameWithMatcherTest.java +++ b/src/test/java/tools/jackson/core/read/NextNameWithMatcherTest.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.*; public class NextNameWithMatcherTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory JSON_F = new JsonFactory(); diff --git a/src/test/java/tools/jackson/core/read/NextXxxAccessTest.java b/src/test/java/tools/jackson/core/read/NextXxxAccessTest.java index a4ddf2b3b4..244854323f 100644 --- a/src/test/java/tools/jackson/core/read/NextXxxAccessTest.java +++ b/src/test/java/tools/jackson/core/read/NextXxxAccessTest.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.*; class NextXxxAccessTest - extends JUnit5TestBase + extends JacksonCoreTestBase { /* /******************************************************** diff --git a/src/test/java/tools/jackson/core/read/NonStandardAposQuotedNamesTest.java b/src/test/java/tools/jackson/core/read/NonStandardAposQuotedNamesTest.java index c65d779ebc..e271df3c42 100644 --- a/src/test/java/tools/jackson/core/read/NonStandardAposQuotedNamesTest.java +++ b/src/test/java/tools/jackson/core/read/NonStandardAposQuotedNamesTest.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import tools.jackson.core.JsonParser; import tools.jackson.core.JsonToken; import tools.jackson.core.exc.StreamReadException; @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.fail; class NonStandardAposQuotedNamesTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory STD_F = sharedStreamFactory(); diff --git a/src/test/java/tools/jackson/core/read/NonStandardJsonReadFeaturesTest.java b/src/test/java/tools/jackson/core/read/NonStandardJsonReadFeaturesTest.java index 049eba0409..a0acbfaf68 100644 --- a/src/test/java/tools/jackson/core/read/NonStandardJsonReadFeaturesTest.java +++ b/src/test/java/tools/jackson/core/read/NonStandardJsonReadFeaturesTest.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.*; class NonStandardParserFeaturesTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory STD_F = sharedStreamFactory(); diff --git a/src/test/java/tools/jackson/core/read/NonStandardNumberParsingTest.java b/src/test/java/tools/jackson/core/read/NonStandardNumberParsingTest.java index d2dab905a3..567f2d9dfb 100644 --- a/src/test/java/tools/jackson/core/read/NonStandardNumberParsingTest.java +++ b/src/test/java/tools/jackson/core/read/NonStandardNumberParsingTest.java @@ -16,7 +16,7 @@ // easier to read on IDE @TestMethodOrder(MethodName.class) class NonStandardNumberParsingTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory JSON_F = JsonFactory.builder() .enable(JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS) diff --git a/src/test/java/tools/jackson/core/read/NonStandardUnquotedNamesTest.java b/src/test/java/tools/jackson/core/read/NonStandardUnquotedNamesTest.java index 5954f1fca7..13b73d5ac4 100644 --- a/src/test/java/tools/jackson/core/read/NonStandardUnquotedNamesTest.java +++ b/src/test/java/tools/jackson/core/read/NonStandardUnquotedNamesTest.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.fail; class NonStandardUnquotedNamesTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory UNQUOTED_NAMES_F = JsonFactory.builder() .enable(JsonReadFeature.ALLOW_UNQUOTED_PROPERTY_NAMES) diff --git a/src/test/java/tools/jackson/core/read/NumberCoercionTest.java b/src/test/java/tools/jackson/core/read/NumberCoercionTest.java index bbe5e42258..8e16b430d1 100644 --- a/src/test/java/tools/jackson/core/read/NumberCoercionTest.java +++ b/src/test/java/tools/jackson/core/read/NumberCoercionTest.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -class NumberCoercionTest extends JUnit5TestBase +class NumberCoercionTest extends JacksonCoreTestBase { /* /********************************************************** diff --git a/src/test/java/tools/jackson/core/read/NumberDeferredReadTest.java b/src/test/java/tools/jackson/core/read/NumberDeferredReadTest.java index f4cc292f96..239492993b 100644 --- a/src/test/java/tools/jackson/core/read/NumberDeferredReadTest.java +++ b/src/test/java/tools/jackson/core/read/NumberDeferredReadTest.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; class NumberDeferredReadTest - extends JUnit5TestBase + extends JacksonCoreTestBase { protected JsonFactory jsonFactory() { return sharedStreamFactory(); diff --git a/src/test/java/tools/jackson/core/read/NumberOverflowTest.java b/src/test/java/tools/jackson/core/read/NumberOverflowTest.java index b387c427bf..7a629aa507 100644 --- a/src/test/java/tools/jackson/core/read/NumberOverflowTest.java +++ b/src/test/java/tools/jackson/core/read/NumberOverflowTest.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.fail; class NumberOverflowTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory FACTORY = JsonFactory.builder() .streamReadConstraints(StreamReadConstraints.builder().maxNumberLength(1000000).build()) diff --git a/src/test/java/tools/jackson/core/read/NumberParsingTest.java b/src/test/java/tools/jackson/core/read/NumberParsingTest.java index f1fa2f3189..c866968cd5 100644 --- a/src/test/java/tools/jackson/core/read/NumberParsingTest.java +++ b/src/test/java/tools/jackson/core/read/NumberParsingTest.java @@ -23,7 +23,7 @@ */ @SuppressWarnings("resource") class NumberParsingTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final static JsonFactory VANILLA_F = JsonFactory.builder().build(); /* diff --git a/src/test/java/tools/jackson/core/read/ParserClosingTest.java b/src/test/java/tools/jackson/core/read/ParserClosingTest.java index 7d625f4d5c..c848be835f 100644 --- a/src/test/java/tools/jackson/core/read/ParserClosingTest.java +++ b/src/test/java/tools/jackson/core/read/ParserClosingTest.java @@ -15,7 +15,7 @@ * by documentation. */ class ParserClosingTest - extends JUnit5TestBase + extends JacksonCoreTestBase { /** * This unit test checks the default behaviour; with no auto-close, no diff --git a/src/test/java/tools/jackson/core/read/ParserDupHandlingTest.java b/src/test/java/tools/jackson/core/read/ParserDupHandlingTest.java index 2ae2f50a06..f09465f611 100644 --- a/src/test/java/tools/jackson/core/read/ParserDupHandlingTest.java +++ b/src/test/java/tools/jackson/core/read/ParserDupHandlingTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.*; class ParserDupHandlingTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final String[] DUP_DOCS = new String[] { "{ 'a':1, 'a':2 }", diff --git a/src/test/java/tools/jackson/core/read/ParserErrorHandlingTest.java b/src/test/java/tools/jackson/core/read/ParserErrorHandlingTest.java index b599ae9ecf..7b0922670b 100644 --- a/src/test/java/tools/jackson/core/read/ParserErrorHandlingTest.java +++ b/src/test/java/tools/jackson/core/read/ParserErrorHandlingTest.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import tools.jackson.core.JsonParser; import tools.jackson.core.JsonToken; import tools.jackson.core.exc.StreamReadException; @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.fail; class ParserErrorHandlingTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/read/ParserErrorRecovery1173Test.java b/src/test/java/tools/jackson/core/read/ParserErrorRecovery1173Test.java index 599773bda4..fb32e7e525 100644 --- a/src/test/java/tools/jackson/core/read/ParserErrorRecovery1173Test.java +++ b/src/test/java/tools/jackson/core/read/ParserErrorRecovery1173Test.java @@ -11,7 +11,7 @@ // Test(s) to see that limited amount of recovery is possible over // content: specifically, most single-character problems. class ParserErrorRecovery1173Test - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/read/ParserLinefeedsTest.java b/src/test/java/tools/jackson/core/read/ParserLinefeedsTest.java index 62fba977d9..97d5f9a012 100644 --- a/src/test/java/tools/jackson/core/read/ParserLinefeedsTest.java +++ b/src/test/java/tools/jackson/core/read/ParserLinefeedsTest.java @@ -13,7 +13,7 @@ * functionality works as expected. */ class ParserLinefeedsTest - extends JUnit5TestBase + extends JacksonCoreTestBase { @Test void cr() throws Exception diff --git a/src/test/java/tools/jackson/core/read/ParserPrecisionLoss730Test.java b/src/test/java/tools/jackson/core/read/ParserPrecisionLoss730Test.java index c6eee6bf9d..69d8a7d8db 100644 --- a/src/test/java/tools/jackson/core/read/ParserPrecisionLoss730Test.java +++ b/src/test/java/tools/jackson/core/read/ParserPrecisionLoss730Test.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; // [jackson-core#730] -class ParserPrecisionLoss730Test extends JUnit5TestBase +class ParserPrecisionLoss730Test extends JacksonCoreTestBase { private final JsonFactory JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/read/ParserScopeMatchingTest.java b/src/test/java/tools/jackson/core/read/ParserScopeMatchingTest.java index 85481a9b25..e680b5fcfe 100644 --- a/src/test/java/tools/jackson/core/read/ParserScopeMatchingTest.java +++ b/src/test/java/tools/jackson/core/read/ParserScopeMatchingTest.java @@ -12,7 +12,7 @@ * Set of basic unit tests for verifying that Array/Object scopes * are properly matched. */ -public class ParserScopeMatchingTest extends JUnit5TestBase +public class ParserScopeMatchingTest extends JacksonCoreTestBase { @Test void unclosedArray() throws Exception diff --git a/src/test/java/tools/jackson/core/read/ParserSequenceTest.java b/src/test/java/tools/jackson/core/read/ParserSequenceTest.java index 8d9c245584..bf431de118 100644 --- a/src/test/java/tools/jackson/core/read/ParserSequenceTest.java +++ b/src/test/java/tools/jackson/core/read/ParserSequenceTest.java @@ -9,7 +9,7 @@ @SuppressWarnings("resource") class ParserSequenceTest - extends JUnit5TestBase + extends JacksonCoreTestBase { @Test void simple() throws Exception diff --git a/src/test/java/tools/jackson/core/read/ParserSymbolHandlingTest.java b/src/test/java/tools/jackson/core/read/ParserSymbolHandlingTest.java index 6c19023c3e..aed6fe1e19 100644 --- a/src/test/java/tools/jackson/core/read/ParserSymbolHandlingTest.java +++ b/src/test/java/tools/jackson/core/read/ParserSymbolHandlingTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.fail; class ParserSymbolHandlingTest - extends JUnit5TestBase + extends JacksonCoreTestBase { // For [core#148] @Test diff --git a/src/test/java/tools/jackson/core/read/ParserWithObjectsTest.java b/src/test/java/tools/jackson/core/read/ParserWithObjectsTest.java index 9781baae21..5dcb95c2f7 100644 --- a/src/test/java/tools/jackson/core/read/ParserWithObjectsTest.java +++ b/src/test/java/tools/jackson/core/read/ParserWithObjectsTest.java @@ -12,7 +12,7 @@ * be accessed using JsonParser. */ public class ParserWithObjectsTest - extends JUnit5TestBase + extends JacksonCoreTestBase { /* /********************************************************** diff --git a/src/test/java/tools/jackson/core/read/SimpleParserTest.java b/src/test/java/tools/jackson/core/read/SimpleParserTest.java index 9e62b35697..ff48e6f19d 100644 --- a/src/test/java/tools/jackson/core/read/SimpleParserTest.java +++ b/src/test/java/tools/jackson/core/read/SimpleParserTest.java @@ -20,7 +20,7 @@ * functionality works as expected. */ @SuppressWarnings("resource") -class SimpleParserTest extends JUnit5TestBase +class SimpleParserTest extends JacksonCoreTestBase { @Test void config() throws Exception diff --git a/src/test/java/tools/jackson/core/read/TestReadHumongousString.java b/src/test/java/tools/jackson/core/read/TestReadHumongousString.java index 2a5f6caeac..0841f117e9 100644 --- a/src/test/java/tools/jackson/core/read/TestReadHumongousString.java +++ b/src/test/java/tools/jackson/core/read/TestReadHumongousString.java @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; // https://github.com/FasterXML/jackson-core/pull/1352 -class TestReadHumongousString extends JUnit5TestBase +class TestReadHumongousString extends JacksonCoreTestBase { // disabled because it takes too much memory to run @Disabled diff --git a/src/test/java/tools/jackson/core/read/TrailingCommas616Test.java b/src/test/java/tools/jackson/core/read/TrailingCommas616Test.java index f13844cb02..5bf1c9b002 100644 --- a/src/test/java/tools/jackson/core/read/TrailingCommas616Test.java +++ b/src/test/java/tools/jackson/core/read/TrailingCommas616Test.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.fail; -class TrailingCommas616Test extends JUnit5TestBase +class TrailingCommas616Test extends JacksonCoreTestBase { private final JsonFactory JSON_F_ALLOW_MISSING = JsonFactory.builder() .enable(JsonReadFeature.ALLOW_MISSING_VALUES) diff --git a/src/test/java/tools/jackson/core/read/TrailingCommasTest.java b/src/test/java/tools/jackson/core/read/TrailingCommasTest.java index 0b98135b19..5085ec8a10 100644 --- a/src/test/java/tools/jackson/core/read/TrailingCommasTest.java +++ b/src/test/java/tools/jackson/core/read/TrailingCommasTest.java @@ -16,7 +16,7 @@ import static org.junit.jupiter.api.Assertions.*; @SuppressWarnings("resource") -public class TrailingCommasTest extends JUnit5TestBase +public class TrailingCommasTest extends JacksonCoreTestBase { JsonFactory factory; Set features; diff --git a/src/test/java/tools/jackson/core/read/UTF32ParseTest.java b/src/test/java/tools/jackson/core/read/UTF32ParseTest.java index 9da4330672..1b9fe20aac 100644 --- a/src/test/java/tools/jackson/core/read/UTF32ParseTest.java +++ b/src/test/java/tools/jackson/core/read/UTF32ParseTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.fail; // Tests from [jackson-core#382] -class UTF32ParseTest extends JUnit5TestBase +class UTF32ParseTest extends JacksonCoreTestBase { private final JsonFactory FACTORY = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/read/UTF8NamesParseTest.java b/src/test/java/tools/jackson/core/read/UTF8NamesParseTest.java index 04bd5f69fc..a458647db7 100644 --- a/src/test/java/tools/jackson/core/read/UTF8NamesParseTest.java +++ b/src/test/java/tools/jackson/core/read/UTF8NamesParseTest.java @@ -15,7 +15,7 @@ * functionality works as expected. */ public class UTF8NamesParseTest - extends JUnit5TestBase + extends JacksonCoreTestBase { final static String[] UTF8_2BYTE_STRINGS = new String[] { // This may look funny, but UTF8 scanner has fairly elaborate decoding diff --git a/src/test/java/tools/jackson/core/read/ValueConversionsTest.java b/src/test/java/tools/jackson/core/read/ValueConversionsTest.java index 570d22b60b..6e19a63e07 100644 --- a/src/test/java/tools/jackson/core/read/ValueConversionsTest.java +++ b/src/test/java/tools/jackson/core/read/ValueConversionsTest.java @@ -2,14 +2,14 @@ import org.junit.jupiter.api.Test; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import tools.jackson.core.JsonParser; import tools.jackson.core.JsonToken; import static org.junit.jupiter.api.Assertions.*; public class ValueConversionsTest - extends JUnit5TestBase + extends JacksonCoreTestBase { @Test void asInt() throws Exception diff --git a/src/test/java/tools/jackson/core/read/loc/LocationDuringReaderParsingTest.java b/src/test/java/tools/jackson/core/read/loc/LocationDuringReaderParsingTest.java index dcc41882ca..713e14fa6a 100644 --- a/src/test/java/tools/jackson/core/read/loc/LocationDuringReaderParsingTest.java +++ b/src/test/java/tools/jackson/core/read/loc/LocationDuringReaderParsingTest.java @@ -14,7 +14,7 @@ * parsing. */ class LocationDuringReaderParsingTest - extends JUnit5TestBase + extends JacksonCoreTestBase { @Test void locationAtEndOfParse() throws Exception diff --git a/src/test/java/tools/jackson/core/read/loc/LocationDuringStreamParsingTest.java b/src/test/java/tools/jackson/core/read/loc/LocationDuringStreamParsingTest.java index b71096f494..76818bedd5 100644 --- a/src/test/java/tools/jackson/core/read/loc/LocationDuringStreamParsingTest.java +++ b/src/test/java/tools/jackson/core/read/loc/LocationDuringStreamParsingTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import tools.jackson.core.TokenStreamLocation; import tools.jackson.core.JsonParser; @@ -15,7 +15,7 @@ * Set of tests that checks getCurrentLocation() and getTokenLocation() are as expected during * parsing. */ -class LocationDuringStreamParsingTest extends JUnit5TestBase +class LocationDuringStreamParsingTest extends JacksonCoreTestBase { @Test void locationAtEndOfParse() throws Exception diff --git a/src/test/java/tools/jackson/core/read/loc/LocationInArrayTest.java b/src/test/java/tools/jackson/core/read/loc/LocationInArrayTest.java index eff7a797b2..29971b6a1b 100644 --- a/src/test/java/tools/jackson/core/read/loc/LocationInArrayTest.java +++ b/src/test/java/tools/jackson/core/read/loc/LocationInArrayTest.java @@ -8,7 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; // Tests mostly for [core#229] -class LocationInArrayTest extends JUnit5TestBase +class LocationInArrayTest extends JacksonCoreTestBase { final JsonFactory JSON_F = new JsonFactory(); diff --git a/src/test/java/tools/jackson/core/read/loc/LocationInObjectTest.java b/src/test/java/tools/jackson/core/read/loc/LocationInObjectTest.java index 21b881c314..a5086f1129 100644 --- a/src/test/java/tools/jackson/core/read/loc/LocationInObjectTest.java +++ b/src/test/java/tools/jackson/core/read/loc/LocationInObjectTest.java @@ -8,7 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; // tests for [core#37] -class LocationInObjectTest extends JUnit5TestBase +class LocationInObjectTest extends JacksonCoreTestBase { @Test void offsetWithObjectFieldsUsingUTF8() throws Exception diff --git a/src/test/java/tools/jackson/core/read/loc/LocationOfError1173Test.java b/src/test/java/tools/jackson/core/read/loc/LocationOfError1173Test.java index 0a1e61f5d5..ec037dbde7 100644 --- a/src/test/java/tools/jackson/core/read/loc/LocationOfError1173Test.java +++ b/src/test/java/tools/jackson/core/read/loc/LocationOfError1173Test.java @@ -21,7 +21,7 @@ * Tests that the {@link TokenStreamLocation} attached to a thrown {@link StreamReadException} * due to invalid JSON points to the correct character. */ -class LocationOfError1173Test extends JUnit5TestBase +class LocationOfError1173Test extends JacksonCoreTestBase { static final JsonFactory JSON_F = new JsonFactory(); diff --git a/src/test/java/tools/jackson/core/read/loc/LocationOffsets455Test.java b/src/test/java/tools/jackson/core/read/loc/LocationOffsets455Test.java index fd48a22ef8..508016403c 100644 --- a/src/test/java/tools/jackson/core/read/loc/LocationOffsets455Test.java +++ b/src/test/java/tools/jackson/core/read/loc/LocationOffsets455Test.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -class LocationOffsets455Test extends JUnit5TestBase +class LocationOffsets455Test extends JacksonCoreTestBase { // for [jackson-core#455] @Test diff --git a/src/test/java/tools/jackson/core/read/loc/LocationOffsetsTest.java b/src/test/java/tools/jackson/core/read/loc/LocationOffsetsTest.java index d8b99fa684..af0913a67c 100644 --- a/src/test/java/tools/jackson/core/read/loc/LocationOffsetsTest.java +++ b/src/test/java/tools/jackson/core/read/loc/LocationOffsetsTest.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -class LocationOffsetsTest extends JUnit5TestBase +class LocationOffsetsTest extends JacksonCoreTestBase { final JsonFactory JSON_F = new JsonFactory(); diff --git a/src/test/java/tools/jackson/core/sym/BinaryNameHashTest.java b/src/test/java/tools/jackson/core/sym/BinaryNameHashTest.java index 164fee77af..2a4f445b64 100644 --- a/src/test/java/tools/jackson/core/sym/BinaryNameHashTest.java +++ b/src/test/java/tools/jackson/core/sym/BinaryNameHashTest.java @@ -4,12 +4,12 @@ import java.util.Arrays; import java.util.List; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import static org.junit.jupiter.api.Assertions.assertEquals; // Specific tests that try to verify proper hashing goodness -public class BinaryNameHashTest extends JUnit5TestBase +public class BinaryNameHashTest extends JacksonCoreTestBase { public void testSuffix1() { // 14-Nov-2017, tatu: Slightly optimized hashing with shifting, to reduce diff --git a/src/test/java/tools/jackson/core/sym/BinaryNameMatcherTest.java b/src/test/java/tools/jackson/core/sym/BinaryNameMatcherTest.java index 9b36ef1f2b..48a2bcb403 100644 --- a/src/test/java/tools/jackson/core/sym/BinaryNameMatcherTest.java +++ b/src/test/java/tools/jackson/core/sym/BinaryNameMatcherTest.java @@ -4,11 +4,11 @@ import java.util.Arrays; import java.util.List; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import static org.junit.jupiter.api.Assertions.*; -public class BinaryNameMatcherTest extends JUnit5TestBase +public class BinaryNameMatcherTest extends JacksonCoreTestBase { public void testSmallMatching() { diff --git a/src/test/java/tools/jackson/core/sym/PlaceholderSymbolTableTest.java b/src/test/java/tools/jackson/core/sym/PlaceholderSymbolTableTest.java index 5fb4e1627a..3690df4851 100644 --- a/src/test/java/tools/jackson/core/sym/PlaceholderSymbolTableTest.java +++ b/src/test/java/tools/jackson/core/sym/PlaceholderSymbolTableTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.*; // Simple tests to verify "placeholder" variant added in 2.13 -class PlaceholderSymbolTableTest extends tools.jackson.core.JUnit5TestBase +class PlaceholderSymbolTableTest extends tools.jackson.core.JacksonCoreTestBase { // Test to verify it is ok to try to find names, and that none // are ever found diff --git a/src/test/java/tools/jackson/core/sym/PropertyNameMatchersTest.java b/src/test/java/tools/jackson/core/sym/PropertyNameMatchersTest.java index e803e7706b..2b98d19041 100644 --- a/src/test/java/tools/jackson/core/sym/PropertyNameMatchersTest.java +++ b/src/test/java/tools/jackson/core/sym/PropertyNameMatchersTest.java @@ -3,7 +3,7 @@ import java.util.*; import java.util.stream.Collectors; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import tools.jackson.core.util.Named; import static org.junit.jupiter.api.Assertions.fail; @@ -11,7 +11,7 @@ /** * Tests for {@link PropertyNameMatcher} implementations */ -public class PropertyNameMatchersTest extends JUnit5TestBase +public class PropertyNameMatchersTest extends JacksonCoreTestBase { public void testSmallMatching() { diff --git a/src/test/java/tools/jackson/core/sym/SymbolTableMergingTest.java b/src/test/java/tools/jackson/core/sym/SymbolTableMergingTest.java index ad663620d8..563cad5a68 100644 --- a/src/test/java/tools/jackson/core/sym/SymbolTableMergingTest.java +++ b/src/test/java/tools/jackson/core/sym/SymbolTableMergingTest.java @@ -17,7 +17,7 @@ */ @SuppressWarnings("serial") class SymbolTableMergingTest - extends JUnit5TestBase + extends JacksonCoreTestBase { /** * To peek into state of "root" symbol tables (parent of all symbol diff --git a/src/test/java/tools/jackson/core/sym/SymbolsViaParserTest.java b/src/test/java/tools/jackson/core/sym/SymbolsViaParserTest.java index 47ee1ed207..947d7977fb 100644 --- a/src/test/java/tools/jackson/core/sym/SymbolsViaParserTest.java +++ b/src/test/java/tools/jackson/core/sym/SymbolsViaParserTest.java @@ -15,7 +15,7 @@ // Tests to guarad against [core#213]: does not verify symbol tables // directly but only indirect issue(s). public class SymbolsViaParserTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { // for [jackson-core#213] @Test diff --git a/src/test/java/tools/jackson/core/sym/TestByteBasedSymbols.java b/src/test/java/tools/jackson/core/sym/TestByteBasedSymbols.java index e8b446b0e4..4094e6a97b 100644 --- a/src/test/java/tools/jackson/core/sym/TestByteBasedSymbols.java +++ b/src/test/java/tools/jackson/core/sym/TestByteBasedSymbols.java @@ -17,7 +17,7 @@ * is working. */ class TestByteBasedSymbols - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { final static String[] PROPERTY_NAMES = new String[] { "a", "b", "c", "x", "y", "b13", "abcdefg", "a123", diff --git a/src/test/java/tools/jackson/core/sym/TestHashCollisionChars.java b/src/test/java/tools/jackson/core/sym/TestHashCollisionChars.java index 5cdb3d15c7..6aea4d5feb 100644 --- a/src/test/java/tools/jackson/core/sym/TestHashCollisionChars.java +++ b/src/test/java/tools/jackson/core/sym/TestHashCollisionChars.java @@ -19,7 +19,7 @@ * sources, however. */ public class TestHashCollisionChars - extends JUnit5TestBase + extends JacksonCoreTestBase { // // // And then a nastier variant; collisions generated using // // // CollisionGenerator diff --git a/src/test/java/tools/jackson/core/sym/TestSymbolTables.java b/src/test/java/tools/jackson/core/sym/TestSymbolTables.java index 9da6bc3daf..caedb7d657 100644 --- a/src/test/java/tools/jackson/core/sym/TestSymbolTables.java +++ b/src/test/java/tools/jackson/core/sym/TestSymbolTables.java @@ -16,7 +16,7 @@ * Tests that directly modify/access underlying low-level symbol tables * (instead of indirectly using them via JsonParser). */ -class TestSymbolTables extends JUnit5TestBase +class TestSymbolTables extends JacksonCoreTestBase { private final static JsonFactory JSON_F = new JsonFactory(); diff --git a/src/test/java/tools/jackson/core/sym/TestSymbolsWithMediaItem.java b/src/test/java/tools/jackson/core/sym/TestSymbolsWithMediaItem.java index 87d2cd641e..1a873465a6 100644 --- a/src/test/java/tools/jackson/core/sym/TestSymbolsWithMediaItem.java +++ b/src/test/java/tools/jackson/core/sym/TestSymbolsWithMediaItem.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -class TestSymbolsWithMediaItem extends JUnit5TestBase +class TestSymbolsWithMediaItem extends JacksonCoreTestBase { private final String JSON = a2q( "{'media' : {\n" diff --git a/src/test/java/tools/jackson/core/sym/TextualNameHashTest.java b/src/test/java/tools/jackson/core/sym/TextualNameHashTest.java index a98ace93ef..80b0cd3ddc 100644 --- a/src/test/java/tools/jackson/core/sym/TextualNameHashTest.java +++ b/src/test/java/tools/jackson/core/sym/TextualNameHashTest.java @@ -4,11 +4,11 @@ import java.util.Arrays; import java.util.List; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import static org.junit.jupiter.api.Assertions.fail; -public class TextualNameHashTest extends JUnit5TestBase +public class TextualNameHashTest extends JacksonCoreTestBase { public void testSuffix1() { // 14-Nov-2017, tatu: Slightly optimized hashing with shifting, to reduce diff --git a/src/test/java/tools/jackson/core/testutil/JacksonTestUtilBase.java b/src/test/java/tools/jackson/core/testutil/JacksonTestUtilBase.java index a30842d63b..b9557e0e47 100644 --- a/src/test/java/tools/jackson/core/testutil/JacksonTestUtilBase.java +++ b/src/test/java/tools/jackson/core/testutil/JacksonTestUtilBase.java @@ -155,7 +155,7 @@ public static byte[] readResource(String ref) ByteArrayOutputStream bytes = new ByteArrayOutputStream(); final byte[] buf = new byte[4000]; - InputStream in = JUnit5TestBase.class.getResourceAsStream(ref); + InputStream in = JacksonCoreTestBase.class.getResourceAsStream(ref); if (in != null) { try { int len; diff --git a/src/test/java/tools/jackson/core/tofix/LocationOfError1180Test.java b/src/test/java/tools/jackson/core/tofix/LocationOfError1180Test.java index 3db34a9201..83cd3ccbcd 100644 --- a/src/test/java/tools/jackson/core/tofix/LocationOfError1180Test.java +++ b/src/test/java/tools/jackson/core/tofix/LocationOfError1180Test.java @@ -18,7 +18,8 @@ import tools.jackson.core.testutil.failure.JacksonTestFailureExpected; import static org.junit.jupiter.api.Assertions.*; -import static tools.jackson.core.JUnit5TestBase.a2q; + +import static tools.jackson.core.JacksonCoreTestBase.a2q; /** * Tests that the {@link TokenStreamLocation} attached to a thrown {@link StreamReadException} diff --git a/src/test/java/tools/jackson/core/tofix/ParserErrorHandling105Test.java b/src/test/java/tools/jackson/core/tofix/ParserErrorHandling105Test.java index 8831fe2129..ab2a1095a2 100644 --- a/src/test/java/tools/jackson/core/tofix/ParserErrorHandling105Test.java +++ b/src/test/java/tools/jackson/core/tofix/ParserErrorHandling105Test.java @@ -10,7 +10,7 @@ // Failing tests for non-root-token problem class ParserErrorHandling105Test - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { // Tests for [core#105] ("eager number parsing misses errors") @JacksonTestFailureExpected diff --git a/src/test/java/tools/jackson/core/tofix/ParserErrorHandling679Test.java b/src/test/java/tools/jackson/core/tofix/ParserErrorHandling679Test.java index b72b555a21..f49396c786 100644 --- a/src/test/java/tools/jackson/core/tofix/ParserErrorHandling679Test.java +++ b/src/test/java/tools/jackson/core/tofix/ParserErrorHandling679Test.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.fail; class ParserErrorHandling679Test - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { // [core#679] @JacksonTestFailureExpected diff --git a/src/test/java/tools/jackson/core/tofix/ParserFilterEmpty708Test.java b/src/test/java/tools/jackson/core/tofix/ParserFilterEmpty708Test.java index 3f66a7f1bf..b380a44b47 100644 --- a/src/test/java/tools/jackson/core/tofix/ParserFilterEmpty708Test.java +++ b/src/test/java/tools/jackson/core/tofix/ParserFilterEmpty708Test.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; // for [core#708] -class ParserFilterEmpty708Test extends JUnit5TestBase +class ParserFilterEmpty708Test extends JacksonCoreTestBase { // Could actually just return basic TokenFilter but... static class IncludeAllFilter extends TokenFilter { diff --git a/src/test/java/tools/jackson/core/type/TypeReferenceTest.java b/src/test/java/tools/jackson/core/type/TypeReferenceTest.java index 763af5b924..275bcce900 100644 --- a/src/test/java/tools/jackson/core/type/TypeReferenceTest.java +++ b/src/test/java/tools/jackson/core/type/TypeReferenceTest.java @@ -4,12 +4,12 @@ import org.junit.jupiter.api.Test; -import tools.jackson.core.JUnit5TestBase; +import tools.jackson.core.JacksonCoreTestBase; import static org.junit.jupiter.api.Assertions.*; // Not much to test, but exercise to prevent code coverage tool from showing all red for package -class TypeReferenceTest extends JUnit5TestBase +class TypeReferenceTest extends JacksonCoreTestBase { static class BogusResolvedType extends ResolvedType { private final boolean _refType; diff --git a/src/test/java/tools/jackson/core/util/ByteArrayBuilderTest.java b/src/test/java/tools/jackson/core/util/ByteArrayBuilderTest.java index e32529a561..fb4e33a98f 100644 --- a/src/test/java/tools/jackson/core/util/ByteArrayBuilderTest.java +++ b/src/test/java/tools/jackson/core/util/ByteArrayBuilderTest.java @@ -9,7 +9,7 @@ import static org.junit.jupiter.api.Assertions.*; -public class ByteArrayBuilderTest extends JUnit5TestBase +public class ByteArrayBuilderTest extends JacksonCoreTestBase { public void testSimple() throws Exception { diff --git a/src/test/java/tools/jackson/core/util/CharTypesTest.java b/src/test/java/tools/jackson/core/util/CharTypesTest.java index a8408961c7..7f88996c2c 100644 --- a/src/test/java/tools/jackson/core/util/CharTypesTest.java +++ b/src/test/java/tools/jackson/core/util/CharTypesTest.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class CharTypesTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { @Test void quoting() diff --git a/src/test/java/tools/jackson/core/util/DefaultPrettyPrinterTest.java b/src/test/java/tools/jackson/core/util/DefaultPrettyPrinterTest.java index f1cbc46e75..3e91877ce9 100644 --- a/src/test/java/tools/jackson/core/util/DefaultPrettyPrinterTest.java +++ b/src/test/java/tools/jackson/core/util/DefaultPrettyPrinterTest.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -class DefaultPrettyPrinterTest extends JUnit5TestBase +class DefaultPrettyPrinterTest extends JacksonCoreTestBase { private final JsonFactory JSON_F = new JsonFactory(); diff --git a/src/test/java/tools/jackson/core/util/DelegatesTest.java b/src/test/java/tools/jackson/core/util/DelegatesTest.java index e6685c3aca..3a2261df43 100644 --- a/src/test/java/tools/jackson/core/util/DelegatesTest.java +++ b/src/test/java/tools/jackson/core/util/DelegatesTest.java @@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.*; -class DelegatesTest extends JUnit5TestBase +class DelegatesTest extends JacksonCoreTestBase { static class POJO { public int x = 3; diff --git a/src/test/java/tools/jackson/core/util/JsonBufferRecyclersTest.java b/src/test/java/tools/jackson/core/util/JsonBufferRecyclersTest.java index a47f040e42..47d65a73e4 100644 --- a/src/test/java/tools/jackson/core/util/JsonBufferRecyclersTest.java +++ b/src/test/java/tools/jackson/core/util/JsonBufferRecyclersTest.java @@ -11,7 +11,7 @@ // Basic testing for [core#1064] wrt usage by `JsonParser` / `JsonGenerator` // (wrt simple reads/writes working without issues) -class JsonBufferRecyclersTest extends JUnit5TestBase +class JsonBufferRecyclersTest extends JacksonCoreTestBase { // // Parsers with RecyclerPools: diff --git a/src/test/java/tools/jackson/core/util/JsonParserSequenceTest.java b/src/test/java/tools/jackson/core/util/JsonParserSequenceTest.java index d3271bd41f..e34758fb19 100644 --- a/src/test/java/tools/jackson/core/util/JsonParserSequenceTest.java +++ b/src/test/java/tools/jackson/core/util/JsonParserSequenceTest.java @@ -20,7 +20,7 @@ * @see JsonParserSequence */ @SuppressWarnings("resource") -public class JsonParserSequenceTest extends JUnit5TestBase +public class JsonParserSequenceTest extends JacksonCoreTestBase { public void testClose() throws IOException { IOContext ioContext = testIOContext(); diff --git a/src/test/java/tools/jackson/core/util/SerializedStringTest.java b/src/test/java/tools/jackson/core/util/SerializedStringTest.java index 167dbab04c..b0687c3f60 100644 --- a/src/test/java/tools/jackson/core/util/SerializedStringTest.java +++ b/src/test/java/tools/jackson/core/util/SerializedStringTest.java @@ -16,7 +16,7 @@ * {@link SerializableString} implementation works as expected. */ class SerializedStringTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { private static final String QUOTED = "\\\"quo\\\\ted\\\""; diff --git a/src/test/java/tools/jackson/core/util/TextBufferTest.java b/src/test/java/tools/jackson/core/util/TextBufferTest.java index 7872c10184..5cdfdc940c 100644 --- a/src/test/java/tools/jackson/core/util/TextBufferTest.java +++ b/src/test/java/tools/jackson/core/util/TextBufferTest.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assertions.*; class TextBufferTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { /** * Trivially simple basic test to ensure all basic append diff --git a/src/test/java/tools/jackson/core/write/ArrayGenerationTest.java b/src/test/java/tools/jackson/core/write/ArrayGenerationTest.java index aad5293f4e..bfbf0cd645 100644 --- a/src/test/java/tools/jackson/core/write/ArrayGenerationTest.java +++ b/src/test/java/tools/jackson/core/write/ArrayGenerationTest.java @@ -17,7 +17,7 @@ /** * Basic testing for scalar-array write methods added in 2.8. */ -class ArrayGenerationTest extends JUnit5TestBase +class ArrayGenerationTest extends JacksonCoreTestBase { // 17-Sep-2024, tatu: [core#223] change to surrogates, let's use old behavior // for now for simpler testing diff --git a/src/test/java/tools/jackson/core/write/ArrayWriteTest.java b/src/test/java/tools/jackson/core/write/ArrayWriteTest.java index c86adb65f6..b800c3216d 100644 --- a/src/test/java/tools/jackson/core/write/ArrayWriteTest.java +++ b/src/test/java/tools/jackson/core/write/ArrayWriteTest.java @@ -15,7 +15,7 @@ * of {@link JsonGenerator} work as expected. */ class ArrayWriteTest - extends tools.jackson.core.JUnit5TestBase + extends tools.jackson.core.JacksonCoreTestBase { private final JsonFactory JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/write/BoundsChecksWithGeneratorTest.java b/src/test/java/tools/jackson/core/write/BoundsChecksWithGeneratorTest.java index bcb5573775..4603e8df9c 100644 --- a/src/test/java/tools/jackson/core/write/BoundsChecksWithGeneratorTest.java +++ b/src/test/java/tools/jackson/core/write/BoundsChecksWithGeneratorTest.java @@ -11,7 +11,7 @@ import static org.junit.jupiter.api.Assertions.fail; class BoundsChecksWithGeneratorTest - extends JUnit5TestBase + extends JacksonCoreTestBase { final static JsonFactory JSON_F = new JsonFactory(); diff --git a/src/test/java/tools/jackson/core/write/GeneratorBasicTest.java b/src/test/java/tools/jackson/core/write/GeneratorBasicTest.java index 866549f92c..d39803284e 100644 --- a/src/test/java/tools/jackson/core/write/GeneratorBasicTest.java +++ b/src/test/java/tools/jackson/core/write/GeneratorBasicTest.java @@ -15,7 +15,7 @@ * functionality works as expected. */ public class GeneratorBasicTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final TokenStreamFactory JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/write/GeneratorCloseTest.java b/src/test/java/tools/jackson/core/write/GeneratorCloseTest.java index 63dcb2bfd1..2298c954ed 100644 --- a/src/test/java/tools/jackson/core/write/GeneratorCloseTest.java +++ b/src/test/java/tools/jackson/core/write/GeneratorCloseTest.java @@ -24,7 +24,7 @@ * JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT * are tested. */ -class GeneratorCloseTest extends JUnit5TestBase +class GeneratorCloseTest extends JacksonCoreTestBase { /** * This unit test checks the default behaviour; with no auto-close, no diff --git a/src/test/java/tools/jackson/core/write/GeneratorCopyTest.java b/src/test/java/tools/jackson/core/write/GeneratorCopyTest.java index f1408ab506..ca351e7d98 100644 --- a/src/test/java/tools/jackson/core/write/GeneratorCopyTest.java +++ b/src/test/java/tools/jackson/core/write/GeneratorCopyTest.java @@ -14,7 +14,7 @@ * of {@link JsonGenerator} work as expected. */ class GeneratorCopyTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory JSON_F = sharedStreamFactory(); diff --git a/src/test/java/tools/jackson/core/write/GeneratorDupHandlingTest.java b/src/test/java/tools/jackson/core/write/GeneratorDupHandlingTest.java index dc1c65277e..48b837c24c 100644 --- a/src/test/java/tools/jackson/core/write/GeneratorDupHandlingTest.java +++ b/src/test/java/tools/jackson/core/write/GeneratorDupHandlingTest.java @@ -8,7 +8,7 @@ import static org.junit.jupiter.api.Assertions.fail; public class GeneratorDupHandlingTest - extends JUnit5TestBase + extends JacksonCoreTestBase { public void testSimpleDupsEagerlyBytes() { _testSimpleDups(true, newStreamFactory()); diff --git a/src/test/java/tools/jackson/core/write/GeneratorMiscTest.java b/src/test/java/tools/jackson/core/write/GeneratorMiscTest.java index 83e9fe2643..ad50600033 100644 --- a/src/test/java/tools/jackson/core/write/GeneratorMiscTest.java +++ b/src/test/java/tools/jackson/core/write/GeneratorMiscTest.java @@ -16,7 +16,7 @@ */ @SuppressWarnings("resource") public class GeneratorMiscTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/write/ObjectWriteTest.java b/src/test/java/tools/jackson/core/write/ObjectWriteTest.java index 4fdebbcbba..b1ccf5fb80 100644 --- a/src/test/java/tools/jackson/core/write/ObjectWriteTest.java +++ b/src/test/java/tools/jackson/core/write/ObjectWriteTest.java @@ -14,7 +14,7 @@ * of {@link JsonGenerator} work as expected. */ public class ObjectWriteTest - extends JUnit5TestBase + extends JacksonCoreTestBase { final TokenStreamFactory JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/write/PrettyPrinterTest.java b/src/test/java/tools/jackson/core/write/PrettyPrinterTest.java index 36c4421899..4b4282629d 100644 --- a/src/test/java/tools/jackson/core/write/PrettyPrinterTest.java +++ b/src/test/java/tools/jackson/core/write/PrettyPrinterTest.java @@ -19,7 +19,7 @@ */ @SuppressWarnings("serial") class PrettyPrinterTest - extends JUnit5TestBase + extends JacksonCoreTestBase { static class CountPrinter extends MinimalPrettyPrinter { diff --git a/src/test/java/tools/jackson/core/write/RawStringWriteTest.java b/src/test/java/tools/jackson/core/write/RawStringWriteTest.java index 1f06c25ca3..ca355ca557 100644 --- a/src/test/java/tools/jackson/core/write/RawStringWriteTest.java +++ b/src/test/java/tools/jackson/core/write/RawStringWriteTest.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; -class RawStringWriteTest extends JUnit5TestBase +class RawStringWriteTest extends JacksonCoreTestBase { private final JsonFactory JSON_F = sharedStreamFactory(); diff --git a/src/test/java/tools/jackson/core/write/SerializedStringWriteTest.java b/src/test/java/tools/jackson/core/write/SerializedStringWriteTest.java index 069cf49eee..b1c7b93fb4 100644 --- a/src/test/java/tools/jackson/core/write/SerializedStringWriteTest.java +++ b/src/test/java/tools/jackson/core/write/SerializedStringWriteTest.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; class SerializedStringWriteTest - extends JUnit5TestBase + extends JacksonCoreTestBase { final static String NAME_WITH_QUOTES = "\"name\""; final static String NAME_WITH_LATIN1 = "P\u00f6ll\u00f6"; diff --git a/src/test/java/tools/jackson/core/write/SurrogateWrite223Test.java b/src/test/java/tools/jackson/core/write/SurrogateWrite223Test.java index 4f2c6a7a86..d8a8d0b605 100644 --- a/src/test/java/tools/jackson/core/write/SurrogateWrite223Test.java +++ b/src/test/java/tools/jackson/core/write/SurrogateWrite223Test.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -class SurrogateWrite223Test extends JUnit5TestBase +class SurrogateWrite223Test extends JacksonCoreTestBase { private final JsonFactory DEFAULT_JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/write/UTF8GeneratorTest.java b/src/test/java/tools/jackson/core/write/UTF8GeneratorTest.java index ee4f841af4..96ac9edee6 100644 --- a/src/test/java/tools/jackson/core/write/UTF8GeneratorTest.java +++ b/src/test/java/tools/jackson/core/write/UTF8GeneratorTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; -class UTF8GeneratorTest extends JUnit5TestBase +class UTF8GeneratorTest extends JacksonCoreTestBase { private final TokenStreamFactory JSON_F = newStreamFactory(); diff --git a/src/test/java/tools/jackson/core/write/WriteTypeIdTest.java b/src/test/java/tools/jackson/core/write/WriteTypeIdTest.java index 42b17777e3..5f1fca9be2 100644 --- a/src/test/java/tools/jackson/core/write/WriteTypeIdTest.java +++ b/src/test/java/tools/jackson/core/write/WriteTypeIdTest.java @@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.*; class WriteTypeIdTest - extends JUnit5TestBase + extends JacksonCoreTestBase { private final JsonFactory JSON_F = sharedStreamFactory(); diff --git a/src/test/java/tools/jackson/core/write/WriterBasedJsonGeneratorTest.java b/src/test/java/tools/jackson/core/write/WriterBasedJsonGeneratorTest.java index f7df34e538..877e395ac8 100644 --- a/src/test/java/tools/jackson/core/write/WriterBasedJsonGeneratorTest.java +++ b/src/test/java/tools/jackson/core/write/WriterBasedJsonGeneratorTest.java @@ -11,7 +11,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.fail; -class WriterBasedJsonGeneratorTest extends JUnit5TestBase +class WriterBasedJsonGeneratorTest extends JacksonCoreTestBase { private final JsonFactory JSON_MAX_NESTING_1 = JsonFactory.builder() .streamWriteConstraints(StreamWriteConstraints.builder().maxNestingDepth(1).build())