Skip to content

Commit

Permalink
Merge branch '2.17'
Browse files Browse the repository at this point in the history
  • Loading branch information
@cowtowncoder
cowtowncoder committed Nov 24, 2023
2 parents 09e09bd + 251154d commit ef36e64
Show file tree
Hide file tree
Showing 4 changed files with 162 additions and 168 deletions.
193 changes: 27 additions & 166 deletions src/test/java/tools/jackson/core/BaseTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,146 +170,7 @@ public boolean equals(Object o)
}
}

protected final JsonFactory JSON_FACTORY = new JsonFactory();

/*
/**********************************************************************
/* High-level helpers
/**********************************************************************
*/

protected void verifyJsonSpecSampleDoc(JsonParser p, boolean verifyContents)
{
verifyJsonSpecSampleDoc(p, verifyContents, true);
}

protected void verifyJsonSpecSampleDoc(JsonParser p, boolean verifyContents,
boolean requireNumbers)
{
if (!p.hasCurrentToken()) {
p.nextToken();
}
// first basic check, mostly for test coverage
assertNull(p.getTypeId());
assertNull(p.getObjectId());

assertToken(JsonToken.START_OBJECT, p.currentToken()); // main object

assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'Image'
if (verifyContents) {
verifyFieldName(p, "Image");
}

assertToken(JsonToken.START_OBJECT, p.nextToken()); // 'image' object

assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'Width'
if (verifyContents) {
verifyFieldName(p, "Width");
}

verifyIntToken(p.nextToken(), requireNumbers);
if (verifyContents) {
verifyIntValue(p, SAMPLE_SPEC_VALUE_WIDTH);
}

assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'Height'
if (verifyContents) {
verifyFieldName(p, "Height");
}

verifyIntToken(p.nextToken(), requireNumbers);
if (verifyContents) {
verifyIntValue(p, SAMPLE_SPEC_VALUE_HEIGHT);
}
assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'Title'
if (verifyContents) {
verifyFieldName(p, "Title");
}
assertToken(JsonToken.VALUE_STRING, p.nextToken());
assertEquals(SAMPLE_SPEC_VALUE_TITLE, getAndVerifyText(p));
assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'Thumbnail'
if (verifyContents) {
verifyFieldName(p, "Thumbnail");
}

assertToken(JsonToken.START_OBJECT, p.nextToken()); // 'thumbnail' object
assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'Url'
if (verifyContents) {
verifyFieldName(p, "Url");
}
assertToken(JsonToken.VALUE_STRING, p.nextToken());
if (verifyContents) {
assertEquals(SAMPLE_SPEC_VALUE_TN_URL, getAndVerifyText(p));
}
assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'Height'
if (verifyContents) {
verifyFieldName(p, "Height");
}
verifyIntToken(p.nextToken(), requireNumbers);
if (verifyContents) {
verifyIntValue(p, SAMPLE_SPEC_VALUE_TN_HEIGHT);
}
assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'Width'
if (verifyContents) {
verifyFieldName(p, "Width");
}
// Width value is actually a String in the example
assertToken(JsonToken.VALUE_STRING, p.nextToken());
if (verifyContents) {
assertEquals(SAMPLE_SPEC_VALUE_TN_WIDTH, getAndVerifyText(p));
}

assertToken(JsonToken.END_OBJECT, p.nextToken()); // 'thumbnail' object
assertToken(JsonToken.PROPERTY_NAME, p.nextToken()); // 'IDs'
assertToken(JsonToken.START_ARRAY, p.nextToken()); // 'ids' array
verifyIntToken(p.nextToken(), requireNumbers); // ids[0]
if (verifyContents) {
verifyIntValue(p, SAMPLE_SPEC_VALUE_TN_ID1);
}
verifyIntToken(p.nextToken(), requireNumbers); // ids[1]
if (verifyContents) {
verifyIntValue(p, SAMPLE_SPEC_VALUE_TN_ID2);
}
verifyIntToken(p.nextToken(), requireNumbers); // ids[2]
if (verifyContents) {
verifyIntValue(p, SAMPLE_SPEC_VALUE_TN_ID3);
}
verifyIntToken(p.nextToken(), requireNumbers); // ids[3]
if (verifyContents) {
verifyIntValue(p, SAMPLE_SPEC_VALUE_TN_ID4);
}
assertToken(JsonToken.END_ARRAY, p.nextToken()); // 'ids' array

assertToken(JsonToken.END_OBJECT, p.nextToken()); // 'image' object

assertToken(JsonToken.END_OBJECT, p.nextToken()); // main object
}

private void verifyIntToken(JsonToken t, boolean requireNumbers)
{
if (t == JsonToken.VALUE_NUMBER_INT) {
return;
}
if (requireNumbers) { // to get error
assertToken(JsonToken.VALUE_NUMBER_INT, t);
}
// if not number, must be String
if (t != JsonToken.VALUE_STRING) {
fail("Expected INT or STRING value, got "+t);
}
}

protected void verifyFieldName(JsonParser p, String expName)
{
assertEquals(expName, p.getText());
assertEquals(expName, p.currentName());
}

protected void verifyIntValue(JsonParser p, long expValue)
{
// First, via textual
assertEquals(String.valueOf(expValue), p.getText());
}
protected final static JsonFactory JSON_FACTORY = new JsonFactory();

/*
/**********************************************************************
Expand Down Expand Up @@ -416,19 +277,19 @@ protected JsonParser createParserForDataInput(TokenStreamFactory f,
/**********************************************************************
*/

protected JsonGenerator createGenerator(OutputStream out) {
public static JsonGenerator createGenerator(OutputStream out) {
return createGenerator(JSON_FACTORY, out);
}

protected JsonGenerator createGenerator(TokenStreamFactory f, OutputStream out) {
public static JsonGenerator createGenerator(TokenStreamFactory f, OutputStream out) {
return f.createGenerator(ObjectWriteContext.empty(), out);
}

protected JsonGenerator createGenerator(Writer w) {
public static JsonGenerator createGenerator(Writer w) {
return createGenerator(JSON_FACTORY, w);
}

protected JsonGenerator createGenerator(TokenStreamFactory f, Writer w) {
public static JsonGenerator createGenerator(TokenStreamFactory f, Writer w) {
return f.createGenerator(ObjectWriteContext.empty(), w);
}

Expand Down Expand Up @@ -470,19 +331,19 @@ protected void writeJsonDoc(JsonFactory f, String doc, JsonGenerator g)
/**********************************************************************
*/

protected void assertToken(JsonToken expToken, JsonToken actToken)
public static void assertToken(JsonToken expToken, JsonToken actToken)
{
if (actToken != expToken) {
fail("Expected token "+expToken+", current token "+actToken);
}
}

protected void assertToken(JsonToken expToken, JsonParser p)
public static void assertToken(JsonToken expToken, JsonParser p)
{
assertToken(expToken, p.currentToken());
}

protected void assertType(Object ob, Class<?> expType)
public static void assertType(Object ob, Class<?> expType)
{
if (ob == null) {
fail("Expected an object of type "+expType.getName()+", got null");
Expand All @@ -498,7 +359,7 @@ protected void assertType(Object ob, Class<?> expType)
* @param anyMatches Array of Strings of which AT LEAST ONE ("any") has to be included
* in {@code e.getMessage()} -- using case-INSENSITIVE comparison
*/
protected void verifyException(Throwable e, String... anyMatches)
public static void verifyException(Throwable e, String... anyMatches)
{
String msg = e.getMessage();
String lmsg = (msg == null) ? "" : msg.toLowerCase();
Expand All @@ -516,7 +377,7 @@ protected void verifyException(Throwable e, String... anyMatches)
* available methods, and ensures results are consistent, before
* returning them
*/
protected String getAndVerifyText(JsonParser p)
public static String getAndVerifyText(JsonParser p)
{
// Ok, let's verify other accessors
int actLen = p.getTextLength();
Expand All @@ -538,15 +399,15 @@ protected String getAndVerifyText(JsonParser p)
/**********************************************************************
*/

protected static String q(String str) {
public static String q(String str) {
return '"'+str+'"';
}

protected static String a2q(String json) {
public static String a2q(String json) {
return json.replace("'", "\"");
}

protected byte[] encodeInUTF32BE(String input)
public static byte[] encodeInUTF32BE(String input)
{
int len = input.length();
byte[] result = new byte[len * 4];
Expand All @@ -560,19 +421,19 @@ protected byte[] encodeInUTF32BE(String input)
return result;
}

protected static byte[] utf8Bytes(String str) {
public static byte[] utf8Bytes(String str) {
return str.getBytes(StandardCharsets.UTF_8);
}

protected static String utf8String(ByteArrayOutputStream bytes) {
public static String utf8String(ByteArrayOutputStream bytes) {
try {
return bytes.toString(StandardCharsets.UTF_8.name());
} catch (IOException e) {
throw new IllegalArgumentException(e);
}
}

protected byte[] readResource(String ref)
public byte[] readResource(String ref)
{
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
final byte[] buf = new byte[4000];
Expand All @@ -595,7 +456,14 @@ protected byte[] readResource(String ref)
return bytes.toByteArray();
}

protected void fieldNameFor(StringBuilder sb, int index)
public static String fieldNameFor(int index)
{
StringBuilder sb = new StringBuilder(16);
fieldNameFor(sb, index);
return sb.toString();
}

private static void fieldNameFor(StringBuilder sb, int index)
{
/* let's do something like "f1.1" to exercise different
* field names (important for byte-based codec)
Expand All @@ -616,25 +484,18 @@ protected void fieldNameFor(StringBuilder sb, int index)
}
}

protected JsonFactory sharedStreamFactory() {
public static JsonFactory sharedStreamFactory() {
return JSON_FACTORY;
}

protected JsonFactory newStreamFactory() {
public static JsonFactory newStreamFactory() {
return new JsonFactory();
}

protected JsonFactoryBuilder streamFactoryBuilder() {
public static JsonFactoryBuilder streamFactoryBuilder() {
return JsonFactory.builder();
}

protected String fieldNameFor(int index)
{
StringBuilder sb = new StringBuilder(16);
fieldNameFor(sb, index);
return sb.toString();
}

protected int[] calcQuads(String word) {
try {
return calcQuads(word.getBytes("UTF-8"));
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/tools/jackson/core/exc/TestExceptions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private void _testEofExceptions(int mode) throws Exception

public void testContentSnippetWithOffset() throws Exception
{
final JsonFactory jsonF = this.streamFactoryBuilder()
final JsonFactory jsonF = streamFactoryBuilder()
.enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
.build();

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/tools/jackson/core/json/TestWithTonsaSymbols.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private String buildDoc(int len)
sb.append(',');
}
sb.append('"');
fieldNameFor(sb, i);
sb.append(fieldNameFor(i));
sb.append('"');
sb.append(':');
sb.append(i);
Expand Down
Loading

0 comments on commit ef36e64

Please sign in to comment.