Skip to content

Commit

Permalink
Test warnings removal
Browse files Browse the repository at this point in the history
  • Loading branch information
@cowtowncoder
cowtowncoder committed May 16, 2024
1 parent 8315557 commit 3bbb531
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 101 deletions.
171 changes: 77 additions & 94 deletions src/test/java/com/fasterxml/jackson/core/write/ArrayGenerationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.fasterxml.jackson.core.write;

import java.io.ByteArrayOutputStream;
import java.io.StringWriter;
import java.io.*;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Random;

import com.fasterxml.jackson.core.*;

import org.junit.jupiter.api.Test;

import com.fasterxml.jackson.core.*;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;

Expand Down Expand Up @@ -137,35 +137,26 @@ private void _testIntArray(boolean useBytes, int elements, int pre, int post) th
StringWriter sw = new StringWriter();
ByteArrayOutputStream bytes = new ByteArrayOutputStream();

JsonGenerator gen = useBytes ? jsonFactory().createGenerator(bytes)
: jsonFactory().createGenerator(sw);

gen.writeArray(values, pre, elements);
gen.close();

String json;
if (useBytes) {
json = bytes.toString("UTF-8");
} else {
json = sw.toString();
try (JsonGenerator gen = _generator(jsonFactory(), useBytes, bytes, sw)) {
gen.writeArray(values, pre, elements);
}

JsonParser p = useBytes ? jsonFactory().createParser(bytes.toByteArray())
: jsonFactory().createParser(json);
assertToken(JsonToken.START_ARRAY, p.nextToken());
for (int i = 0; i < elements; ++i) {
if ((i & 1) == 0) { // alternate
JsonToken t = p.nextToken();
if (t != JsonToken.VALUE_NUMBER_INT) {
fail("Expected number, got "+t+", element #"+i);
String json = useBytes ? bytes.toString("UTF-8") : sw.toString();

try (JsonParser p = _parser(jsonFactory(), useBytes, json)) {
assertToken(JsonToken.START_ARRAY, p.nextToken());
for (int i = 0; i < elements; ++i) {
if ((i & 1) == 0) { // alternate
JsonToken t = p.nextToken();
if (t != JsonToken.VALUE_NUMBER_INT) {
fail("Expected number, got "+t+", element #"+i);
}
assertEquals(i, p.getIntValue());
} else {
assertEquals(i, p.nextIntValue(-1));
}
assertEquals(i, p.getIntValue());
} else {
assertEquals(i, p.nextIntValue(-1));
}
assertToken(JsonToken.END_ARRAY, p.nextToken());
}
assertToken(JsonToken.END_ARRAY, p.nextToken());
p.close();
}

private void _testLongArray(boolean useBytes, int elements, int pre, int post) throws Exception
Expand All @@ -178,35 +169,26 @@ private void _testLongArray(boolean useBytes, int elements, int pre, int post) t
StringWriter sw = new StringWriter();
ByteArrayOutputStream bytes = new ByteArrayOutputStream();

JsonGenerator gen = useBytes ? jsonFactory().createGenerator(bytes)
: jsonFactory().createGenerator(sw);

gen.writeArray(values, pre, elements);
gen.close();

String json;
if (useBytes) {
json = bytes.toString("UTF-8");
} else {
json = sw.toString();
try (JsonGenerator gen = _generator(jsonFactory(), useBytes, bytes, sw)) {
gen.writeArray(values, pre, elements);
}

JsonParser p = useBytes ? jsonFactory().createParser(bytes.toByteArray())
: jsonFactory().createParser(json);
assertToken(JsonToken.START_ARRAY, p.nextToken());
for (int i = 0; i < elements; ++i) {
if ((i & 1) == 0) { // alternate
JsonToken t = p.nextToken();
if (t != JsonToken.VALUE_NUMBER_INT) {
fail("Expected number, got "+t+", element #"+i);
String json = useBytes ? bytes.toString("UTF-8") : sw.toString();

try (JsonParser p = _parser(jsonFactory(), useBytes, json)) {
assertToken(JsonToken.START_ARRAY, p.nextToken());
for (int i = 0; i < elements; ++i) {
if ((i & 1) == 0) { // alternate
JsonToken t = p.nextToken();
if (t != JsonToken.VALUE_NUMBER_INT) {
fail("Expected number, got "+t+", element #"+i);
}
assertEquals(i, p.getLongValue());
} else {
assertEquals(i, p.nextLongValue(-1));
}
assertEquals(i, p.getLongValue());
} else {
assertEquals(i, p.nextLongValue(-1));
}
assertToken(JsonToken.END_ARRAY, p.nextToken());
}
assertToken(JsonToken.END_ARRAY, p.nextToken());
p.close();
}

private void _testDoubleArray(boolean useBytes, int elements, int pre, int post) throws Exception
Expand All @@ -219,31 +201,22 @@ private void _testDoubleArray(boolean useBytes, int elements, int pre, int post)
StringWriter sw = new StringWriter();
ByteArrayOutputStream bytes = new ByteArrayOutputStream();

JsonGenerator gen = useBytes ? jsonFactory().createGenerator(bytes)
: jsonFactory().createGenerator(sw);

gen.writeArray(values, pre, elements);
gen.close();

String json;
if (useBytes) {
json = bytes.toString("UTF-8");
} else {
json = sw.toString();
try (JsonGenerator gen = _generator(jsonFactory(), useBytes, bytes, sw)) {
gen.writeArray(values, pre, elements);
}
String json = useBytes ? bytes.toString("UTF-8") : sw.toString();

JsonParser p = useBytes ? jsonFactory().createParser(bytes.toByteArray())
: jsonFactory().createParser(json);
assertToken(JsonToken.START_ARRAY, p.nextToken());
for (int i = 0; i < elements; ++i) {
JsonToken t = p.nextToken();
if (t != JsonToken.VALUE_NUMBER_FLOAT) {
fail("Expected floating-point number, got "+t+", element #"+i);
try (JsonParser p = _parser(jsonFactory(), useBytes, json)) {
assertToken(JsonToken.START_ARRAY, p.nextToken());
for (int i = 0; i < elements; ++i) {
JsonToken t = p.nextToken();
if (t != JsonToken.VALUE_NUMBER_FLOAT) {
fail("Expected floating-point number, got "+t+", element #"+i);
}
assertEquals((double) i, p.getDoubleValue());
}
assertEquals((double) i, p.getDoubleValue());
assertToken(JsonToken.END_ARRAY, p.nextToken());
}
assertToken(JsonToken.END_ARRAY, p.nextToken());
p.close();
}

private void _testStringArray(boolean useBytes, int elements, int pre, int post) throws Exception
Expand All @@ -261,30 +234,40 @@ private void _testStringArray(boolean useBytes, int elements, int pre, int post)
StringWriter sw = new StringWriter();
ByteArrayOutputStream bytes = new ByteArrayOutputStream();

JsonGenerator gen = useBytes ? jsonFactory().createGenerator(bytes)
: jsonFactory().createGenerator(sw);
try (JsonGenerator gen = _generator(jsonFactory(), useBytes, bytes, sw)) {
gen.writeArray(values, pre, elements);
}
String json = useBytes ? bytes.toString("UTF-8") : sw.toString();

gen.writeArray(values, pre, elements);
gen.close();
try (JsonParser p = _parser(jsonFactory(), useBytes, json)) {
assertToken(JsonToken.START_ARRAY, p.nextToken());
for (int i = 0; i < elements; ++i) {
JsonToken t = p.nextToken();
if (t != JsonToken.VALUE_STRING) {
fail("Expected string, got "+t+", element #"+i);
}
assertEquals(values[pre+i], p.getValueAsString());
}
assertToken(JsonToken.END_ARRAY, p.nextToken());
}
}

String json;
private JsonGenerator _generator(JsonFactory f, boolean useBytes,
ByteArrayOutputStream bytes, Writer w)
throws Exception
{
if (useBytes) {
json = bytes.toString("UTF-8");
} else {
json = sw.toString();
return f.createGenerator(bytes);
}
return f.createGenerator(w);
}

JsonParser p = useBytes ? jsonFactory().createParser(bytes.toByteArray())
: jsonFactory().createParser(json);
assertToken(JsonToken.START_ARRAY, p.nextToken());
for (int i = 0; i < elements; ++i) {
JsonToken t = p.nextToken();
if (t != JsonToken.VALUE_STRING) {
fail("Expected string, got "+t+", element #"+i);
private JsonParser _parser(JsonFactory f, boolean useBytes, String json)
throws Exception
{
if (useBytes) {
return f.createParser(json.getBytes(StandardCharsets.UTF_8));
}
assertEquals(values[pre+i], p.getValueAsString());
}
assertToken(JsonToken.END_ARRAY, p.nextToken());
p.close();
return jsonFactory().createParser(json);
}
}
15 changes: 8 additions & 7 deletions src/test/java/com/fasterxml/jackson/core/write/GeneratorDupHandlingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void simpleDupsLazilyChars() throws Exception {

@SuppressWarnings("resource")
protected void _testSimpleDups(boolean useStream, boolean lazySetting, JsonFactory f)
throws Exception
throws Exception
{
// First: fine, when not checking
if (!lazySetting) {
Expand Down Expand Up @@ -79,14 +79,15 @@ protected void _testSimpleDups(boolean useStream, boolean lazySetting, JsonFacto
}
}

protected JsonGenerator _generator(JsonFactory f, boolean useStream) throws IOException
protected JsonGenerator _generator(JsonFactory f, boolean useStream) throws Exception
{
return useStream ?
f.createGenerator(new ByteArrayOutputStream())
: f.createGenerator(new StringWriter());
if (useStream) {
return f.createGenerator(new ByteArrayOutputStream());
}
return f.createGenerator(new StringWriter());
}

protected void _writeSimple0(JsonGenerator g, String name) throws IOException
protected void _writeSimple0(JsonGenerator g, String name) throws Exception
{
g.writeStartObject();
g.writeNumberField(name, 1);
Expand All @@ -95,7 +96,7 @@ protected void _writeSimple0(JsonGenerator g, String name) throws IOException
g.close();
}

protected void _writeSimple1(JsonGenerator g, String name) throws IOException
protected void _writeSimple1(JsonGenerator g, String name) throws Exception
{
g.writeStartArray();
g.writeNumber(3);
Expand Down

0 comments on commit 3bbb531

Please sign in to comment.