Skip to content

Commit be54593

Browse files
cowtowncodercowtowncoder
committed
Minor test clean up (to reduce impedance b/w 2.x / 3.0 test classes)
1 parent 96cab68 commit be54593

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

‎avro/src/test/java/com/fasterxml/jackson/dataformat/avro/jsr310/AvroJavaTimeModule_schemaCreationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void testSchemaCreation() throws JsonMappingException {
6161
mapper.acceptJsonFormatVisitor(testClass, gen);
6262
Schema actualSchema = gen.getGeneratedSchema().getAvroSchema();
6363

64-
System.out.println(testClass.getName() + " schema:\n" + actualSchema.toString(true));
64+
// System.out.println(testClass.getName() + " schema:\n" + actualSchema.toString(true));
6565

6666
// THEN
6767
assertThat(actualSchema.getType()).isEqualTo(expectedType);

‎avro/src/test/java/com/fasterxml/jackson/dataformat/avro/schema/DateTimeVisitor_builtAvroSchemaTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void builtAvroSchemaTest() {
8585
// WHEN
8686
Schema actualSchema = dateTimeVisitor.builtAvroSchema();
8787

88-
System.out.println(testClass.getName() + " schema:\n" + actualSchema.toString(true));
88+
// System.out.println(testClass.getName() + " schema:\n" + actualSchema.toString(true));
8989

9090
// THEN
9191
assertThat(actualSchema.getType()).isEqualTo(expectedAvroType);

‎ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonParserTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public void testUnknownSymbolExceptionForFieldNameIsWrapped() throws IOException
157157
try (IonParser parser = (IonParser) f.createParser("{ a: 1, $99: 2 }")) {
158158
Assert.assertEquals(JsonToken.START_OBJECT, parser.nextToken());
159159
Assert.assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
160-
Assert.assertEquals("a", parser.getCurrentName());
160+
Assert.assertEquals("a", parser.currentName());
161161
Assert.assertEquals(JsonToken.VALUE_NUMBER_INT, parser.nextValue());
162162
Assert.assertEquals(1, parser.getIntValue());
163163
parser.nextValue(); // Should encounter unknown symbol and fail
@@ -170,7 +170,7 @@ public void testUnknownSymbolExceptionForAnnotationIsWrapped() throws IOExceptio
170170
try (IonParser parser = (IonParser) f.createParser("{ a: $99::1 }")) {
171171
Assert.assertEquals(JsonToken.START_OBJECT, parser.nextToken());
172172
Assert.assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
173-
Assert.assertEquals("a", parser.getCurrentName());
173+
Assert.assertEquals("a", parser.currentName());
174174
Assert.assertEquals(JsonToken.VALUE_NUMBER_INT, parser.nextValue());
175175
Assert.assertEquals(1, parser.getIntValue());
176176
parser.getTypeAnnotations(); // Should encounter unknown symbol and fail

‎ion/src/test/java/com/fasterxml/jackson/dataformat/ion/SimpleReadTest.java renamed to ‎ion/src/test/java/com/fasterxml/jackson/dataformat/ion/SimpleIonReadTest.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.fasterxml.jackson.core.JsonParser;
2323
import com.fasterxml.jackson.core.JsonToken;
2424

25-
public class SimpleReadTest {
25+
public class SimpleIonReadTest {
2626
// // // Actual tests; low level
2727

2828
@Test
@@ -32,14 +32,14 @@ public void testSimpleStructRead() throws IOException
3232
JsonParser jp = f.createParser("{a:\"value\",b:42, c:null}");
3333
assertEquals(JsonToken.START_OBJECT, jp.nextToken());
3434
assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
35-
assertEquals("a", jp.getCurrentName());
35+
assertEquals("a", jp.currentName());
3636
assertEquals(JsonToken.VALUE_STRING, jp.nextToken());
3737
assertEquals("value", jp.getText());
3838
assertEquals(JsonToken.VALUE_NUMBER_INT, jp.nextValue());
39-
assertEquals("b", jp.getCurrentName());
39+
assertEquals("b", jp.currentName());
4040
assertEquals(42, jp.getIntValue());
4141
assertEquals(JsonToken.VALUE_NULL, jp.nextValue());
42-
assertEquals("c", jp.getCurrentName());
42+
assertEquals("c", jp.currentName());
4343
assertEquals(JsonToken.END_OBJECT, jp.nextToken());
4444
jp.close();
4545
}
@@ -67,17 +67,17 @@ public void testSimpleStructAndArray() throws IOException
6767
JsonParser jp = f.createParser("{a:[\"b\",\"c\"], b:null}");
6868
assertEquals(JsonToken.START_OBJECT, jp.nextToken());
6969
assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
70-
assertEquals("a", jp.getCurrentName());
70+
assertEquals("a", jp.currentName());
7171
assertEquals(JsonToken.START_ARRAY, jp.nextToken());
7272
assertEquals(JsonToken.VALUE_STRING, jp.nextToken());
7373
assertEquals("b", jp.getText());
7474
assertEquals(JsonToken.VALUE_STRING, jp.nextToken());
7575
assertEquals("c", jp.getText());
7676
assertEquals(JsonToken.END_ARRAY, jp.nextToken());
7777
assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
78-
assertEquals("b", jp.getCurrentName());
78+
assertEquals("b", jp.currentName());
7979
assertEquals(JsonToken.VALUE_NULL, jp.nextToken());
80-
assertEquals("b", jp.getCurrentName());
80+
assertEquals("b", jp.currentName());
8181
assertEquals(JsonToken.END_OBJECT, jp.nextToken());
8282
jp.close();
8383
}
@@ -89,23 +89,23 @@ public void testMixed() throws IOException
8989
JsonParser jp = f.createParser("{a:[ 1, { b: 13}, \"xyz\" ], c:null, d:true}");
9090
assertEquals(JsonToken.START_OBJECT, jp.nextToken());
9191
assertEquals(JsonToken.START_ARRAY, jp.nextValue());
92-
//assertEquals("a", jp.getCurrentName());
92+
//assertEquals("a", jp.currentName());
9393
assertEquals(JsonToken.VALUE_NUMBER_INT, jp.nextValue());
94-
assertNull(jp.getCurrentName());
94+
assertNull(jp.currentName());
9595
assertEquals(1, jp.getIntValue());
9696
assertEquals(JsonToken.START_OBJECT, jp.nextValue());
9797
assertEquals(JsonToken.VALUE_NUMBER_INT, jp.nextValue());
98-
assertEquals("b", jp.getCurrentName());
98+
assertEquals("b", jp.currentName());
9999
assertEquals(13, jp.getIntValue());
100100
assertEquals(JsonToken.END_OBJECT, jp.nextValue());
101101
assertEquals(JsonToken.VALUE_STRING, jp.nextValue());
102102
assertEquals("xyz", jp.getText());
103-
assertNull(jp.getCurrentName());
103+
assertNull(jp.currentName());
104104
assertEquals(JsonToken.END_ARRAY, jp.nextValue());
105105
assertEquals(JsonToken.VALUE_NULL, jp.nextValue());
106-
assertEquals("c", jp.getCurrentName());
106+
assertEquals("c", jp.currentName());
107107
assertEquals(JsonToken.VALUE_TRUE, jp.nextValue());
108-
assertEquals("d", jp.getCurrentName());
108+
assertEquals("d", jp.currentName());
109109

110110
assertEquals(JsonToken.END_OBJECT, jp.nextToken());
111111
jp.close();
@@ -117,14 +117,14 @@ public void testNullIonType() throws IOException {
117117
JsonParser jp = f.createParser("{a:\"value\",b:42, c:null.int}");
118118
assertEquals(JsonToken.START_OBJECT, jp.nextToken());
119119
assertEquals(JsonToken.FIELD_NAME, jp.nextToken());
120-
assertEquals("a", jp.getCurrentName());
120+
assertEquals("a", jp.currentName());
121121
assertEquals(JsonToken.VALUE_STRING, jp.nextToken());
122122
assertEquals("value", jp.getText());
123123
assertEquals(JsonToken.VALUE_NUMBER_INT, jp.nextValue());
124-
assertEquals("b", jp.getCurrentName());
124+
assertEquals("b", jp.currentName());
125125
assertEquals(42, jp.getIntValue());
126126
assertEquals(JsonToken.VALUE_NULL, jp.nextValue());
127-
assertEquals("c", jp.getCurrentName());
127+
assertEquals("c", jp.currentName());
128128
assertEquals(JsonToken.END_OBJECT, jp.nextToken());
129129
jp.close();
130130
}

‎ion/src/test/java/com/fasterxml/jackson/dataformat/ion/SimpleWriteTest.java renamed to ‎ion/src/test/java/com/fasterxml/jackson/dataformat/ion/SimpleIonWriteTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.amazon.ion.IonType;
3030
import com.amazon.ion.system.IonSystemBuilder;
3131

32-
public class SimpleWriteTest
32+
public class SimpleIonWriteTest
3333
{
3434
// // // Actual tests; low level
3535

0 commit comments

Comments
 (0)