Skip to content

Commit 3f94b50

Browse files
committed
cosmetic cleanup for test code
1 parent 10e0aac commit 3f94b50

File tree

3 files changed

+48
-48
lines changed

3 files changed

+48
-48
lines changed

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/schemaev/RecordEvolutionTest.java

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public UserV1(final String name, final Map<String, List<String>> preferences) {
6666
this.preferences = preferences;
6767
}
6868

69+
@Override
6970
public boolean equals(final Object object) {
7071
if (this == object) {
7172
return true;
@@ -81,6 +82,7 @@ public boolean equals(final Object object) {
8182
preferences.equals(user.preferences);
8283
}
8384

85+
@Override
8486
public int hashCode() {
8587
return Objects.hash(name, preferences);
8688
}
@@ -94,46 +96,45 @@ public String toString() {
9496
}
9597
}
9698

97-
static class UserV2 {
98-
public String fullName;
99-
public Map<String, List<String>> preferences;
100-
101-
public UserV2(
102-
@JsonProperty("fullName") final String fullName,
103-
@JsonProperty("preferences") final Map<String, List<String>> preferences
104-
) {
105-
this.fullName = fullName;
106-
this.preferences = preferences;
107-
}
108-
109-
public boolean equals(final Object object) {
110-
if (this == object) {
111-
return true;
112-
}
113-
114-
if (!(object instanceof UserV2)) {
115-
return false;
116-
}
117-
118-
final UserV2 user = (UserV2) object;
119-
120-
return fullName.equals(user.fullName) && preferences.equals(user.preferences);
121-
}
122-
123-
public int hashCode() {
124-
return Objects.hash(fullName, preferences);
125-
}
126-
127-
@Override
128-
public String toString() {
129-
return "UserV2{" +
130-
"fullName='" + fullName + '\'' +
131-
", preferences=" + preferences +
132-
'}';
133-
}
134-
}
135-
136-
private final AvroMapper MAPPER = getMapper();
99+
static class UserV2 {
100+
public String fullName;
101+
public Map<String, List<String>> preferences;
102+
103+
public UserV2(
104+
@JsonProperty("fullName") final String fullName,
105+
@JsonProperty("preferences") final Map<String, List<String>> preferences
106+
) {
107+
this.fullName = fullName;
108+
this.preferences = preferences;
109+
}
110+
111+
@Override
112+
public boolean equals(final Object object) {
113+
if (this == object) {
114+
return true;
115+
}
116+
if (!(object instanceof UserV2)) {
117+
return false;
118+
}
119+
final UserV2 user = (UserV2) object;
120+
return fullName.equals(user.fullName) && preferences.equals(user.preferences);
121+
}
122+
123+
@Override
124+
public int hashCode() {
125+
return Objects.hash(fullName, preferences);
126+
}
127+
128+
@Override
129+
public String toString() {
130+
return "UserV2{" +
131+
"fullName='" + fullName + '\'' +
132+
", preferences=" + preferences +
133+
'}';
134+
}
135+
}
136+
137+
private final AvroMapper MAPPER = getMapper();
137138

138139
public void testEvolutionInvolvingComplexRecords() throws Exception
139140
{

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/mapper/NumberBeanTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public void testNumberTypeRetainingBuffering() throws Exception
196196
assertEquals(NumberType.DOUBLE, p.getNumberType());
197197
assertEquals(Double.valueOf(0.25), p.getNumberValue());
198198
assertEquals(Double.valueOf(0.25), p.getNumberValueExact());
199-
199+
200200
assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
201201
assertEquals(NumberType.LONG, p.getNumberType());
202202
assertEquals(Long.valueOf(13117L), p.getNumberValue());
@@ -206,7 +206,7 @@ public void testNumberTypeRetainingBuffering() throws Exception
206206
assertEquals(NumberType.FLOAT, p.getNumberType());
207207
assertEquals(Float.valueOf(0.5f), p.getNumberValue());
208208
assertEquals(Float.valueOf(0.5f), p.getNumberValueExact());
209-
209+
210210
assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
211211
assertEquals(NumberType.BIG_INTEGER, p.getNumberType());
212212
assertEquals(BigInteger.valueOf(1972), p.getNumberValue());
@@ -216,11 +216,11 @@ public void testNumberTypeRetainingBuffering() throws Exception
216216
assertEquals(NumberType.BIG_DECIMAL, p.getNumberType());
217217
assertEquals(EXP_BIG_DEC, p.getNumberValue());
218218
assertEquals(EXP_BIG_DEC, p.getNumberValueExact());
219-
219+
220220
assertToken(JsonToken.END_ARRAY, p.nextToken());
221221
}
222222
}
223-
223+
224224
// [databind#2784]
225225
public void testBigDecimalWithBuffering() throws Exception
226226
{

smile/src/test/java/com/fasterxml/jackson/dataformat/smile/mapper/NumberBeanTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
import com.fasterxml.jackson.dataformat.smile.BaseTestForSmile;
1616
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
17-
import com.fasterxml.jackson.dataformat.smile.SmileParser;
1817

1918
public class NumberBeanTest extends BaseTestForSmile
2019
{
@@ -159,7 +158,7 @@ public void testNumberTypeRetainingBuffering() throws Exception
159158
assertEquals(NumberType.DOUBLE, p.getNumberType());
160159
assertEquals(Double.valueOf(0.25), p.getNumberValue());
161160
assertEquals(Double.valueOf(0.25), p.getNumberValueExact());
162-
161+
163162
assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
164163
assertEquals(NumberType.LONG, p.getNumberType());
165164
assertEquals(Long.MAX_VALUE, p.getNumberValue());
@@ -169,7 +168,7 @@ public void testNumberTypeRetainingBuffering() throws Exception
169168
assertEquals(NumberType.FLOAT, p.getNumberType());
170169
assertEquals(Float.valueOf(0.5f), p.getNumberValue());
171170
assertEquals(Float.valueOf(0.5f), p.getNumberValueExact());
172-
171+
173172
assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
174173
assertEquals(NumberType.BIG_INTEGER, p.getNumberType());
175174
assertEquals(BigInteger.valueOf(1972), p.getNumberValue());
@@ -179,7 +178,7 @@ public void testNumberTypeRetainingBuffering() throws Exception
179178
assertEquals(NumberType.BIG_DECIMAL, p.getNumberType());
180179
assertEquals(EXP_BIG_DEC, p.getNumberValue());
181180
assertEquals(EXP_BIG_DEC, p.getNumberValueExact());
182-
181+
183182
assertToken(JsonToken.END_ARRAY, p.nextToken());
184183
}
185184
}

0 commit comments

Comments
 (0)