From ea850727af5f84fc2fe706e3ca8d009aeb1f27dc Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Sat, 13 May 2023 20:10:51 -0700 Subject: [PATCH] Further minor test refactoring --- .../jackson/dataformat/csv/deser/CSVBigStringsTest.java | 8 +++++--- .../jackson/dataformat/toml/TomlBigStringsTest.java | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/CSVBigStringsTest.java b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/CSVBigStringsTest.java index ff4a3e55..8cc718dc 100644 --- a/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/CSVBigStringsTest.java +++ b/csv/src/test/java/com/fasterxml/jackson/dataformat/csv/deser/CSVBigStringsTest.java @@ -16,6 +16,8 @@ public class CSVBigStringsTest extends ModuleTestBase { private final CsvMapper MAPPER = mapperForCsv(); + private final static int TOO_LONG_STRING_VALUE_LEN = 20_000_100; + private CsvMapper newCsvMapperWithUnlimitedStringSizeSupport() { CsvFactory csvFactory = CsvFactory.builder() .streamReadConstraints(StreamReadConstraints.builder().maxStringLength(Integer.MAX_VALUE).build()) @@ -29,7 +31,7 @@ public void testBigString() throws Exception MappingIterator> it = MAPPER .readerForListOf(String.class) .with(CsvParser.Feature.WRAP_AS_ARRAY) - .readValues(generateCsv(20_001_000)); + .readValues(generateCsv(TOO_LONG_STRING_VALUE_LEN)); it.readAll(); fail("expected DatabindException"); } catch (DatabindException e) { @@ -45,7 +47,7 @@ public void testBiggerString() throws Exception MappingIterator> it = MAPPER .readerForListOf(String.class) .with(CsvParser.Feature.WRAP_AS_ARRAY) - .readValues(generateCsv(21_000_000)); + .readValues(generateCsv(TOO_LONG_STRING_VALUE_LEN)); it.readAll(); fail("expected DatabindException"); } catch (DatabindException e) { @@ -59,7 +61,7 @@ public void testBiggerString() throws Exception public void testUnlimitedString() throws Exception { - final int len = 5001000; + final int len = TOO_LONG_STRING_VALUE_LEN; MappingIterator> it = newCsvMapperWithUnlimitedStringSizeSupport() .readerForListOf(String.class) .with(CsvParser.Feature.WRAP_AS_ARRAY) diff --git a/toml/src/test/java/com/fasterxml/jackson/dataformat/toml/TomlBigStringsTest.java b/toml/src/test/java/com/fasterxml/jackson/dataformat/toml/TomlBigStringsTest.java index a1f3afbf..1a88f52a 100644 --- a/toml/src/test/java/com/fasterxml/jackson/dataformat/toml/TomlBigStringsTest.java +++ b/toml/src/test/java/com/fasterxml/jackson/dataformat/toml/TomlBigStringsTest.java @@ -11,6 +11,7 @@ public class TomlBigStringsTest extends TomlMapperTestBase { + private final static int TOO_LONG_STRING_VALUE_LEN = 20_000_100; final static class StringWrapper { @@ -38,7 +39,7 @@ private TomlMapper newMapperWithUnlimitedStringSizeSupport() { public void testBigString() throws Exception { try { - MAPPER.readValue(generateToml(20_001_000), StringWrapper.class); + MAPPER.readValue(generateToml(TOO_LONG_STRING_VALUE_LEN), StringWrapper.class); fail("expected StreamConstraintsException"); } catch (StreamConstraintsException e) { final String message = e.getMessage(); @@ -51,7 +52,7 @@ public void testBigString() throws Exception public void testBiggerString() throws Exception { try { - MAPPER.readValue(generateToml(20_100_000), StringWrapper.class); + MAPPER.readValue(generateToml(TOO_LONG_STRING_VALUE_LEN), StringWrapper.class); fail("expected StreamConstraintsException"); } catch (StreamConstraintsException e) { final String message = e.getMessage(); @@ -65,7 +66,7 @@ public void testBiggerString() throws Exception @Test public void testUnlimitedString() throws Exception { - final int len = 5001000; + final int len = TOO_LONG_STRING_VALUE_LEN; StringWrapper sw = newMapperWithUnlimitedStringSizeSupport() .readValue(generateToml(len), StringWrapper.class); assertEquals(len, sw.string.length());