Skip to content

Commit 7c86281

Browse files
committed
Fix misorderd assertions
1 parent f317b0f commit 7c86281

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/DataBindRoundtripTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void testIonRoot() throws IOException {
146146

147147
Bean bean = m.readValue(root, Bean.class);
148148
assertNotNull(bean);
149-
assertEquals(bean.a, "test");
149+
assertEquals("test", bean.a);
150150
assertEquals(0.25, bean.b, 0.0);
151151
assertArrayEquals(new byte[0], bean.data);
152152
assertTrue(bean.state);

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/PolymorphicRoundtripTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void testSubclass() throws IOException {
7979

8080
assertEquals(original.field, deserialized.field);
8181
assertEquals(original.child.someField, deserialized.child.someField);
82-
assertTrue(deserialized.child instanceof ChildBeanSub);
82+
assertInstanceOf(ChildBeanSub.class, deserialized.child);
8383
assertEquals(((ChildBeanSub) original.child).extraField, ((ChildBeanSub) deserialized.child).extraField);
8484
}
8585

@@ -92,7 +92,7 @@ public void testTopLevelPolymorphism() throws IOException {
9292
mapper.registerModule(new IonAnnotationModule());
9393
String serialized = mapper.writeValueAsString(original);
9494
Object obj = mapper.readValue(serialized, Object.class);
95-
assertTrue(obj instanceof Bean);
95+
assertInstanceOf(Bean.class, obj);
9696
Bean deserialized = (Bean) obj;
9797
assertEquals(original.field, deserialized.field);
9898
assertEquals(original.child.someField, deserialized.child.someField);
@@ -112,14 +112,14 @@ public void testSelectivePolymorphism() throws IOException {
112112
// to be chosen (and we expect that first id to be the most narrow type, ChildBeanSub).
113113
Bean deserialized = mapper.readValue(serialized, Bean.class);
114114

115-
assertEquals(deserialized.child.getClass(), ChildBeanSub.class);
115+
assertEquals(ChildBeanSub.class, deserialized.child.getClass());
116116
assertEquals(((ChildBeanSub) original.child).extraField, ((ChildBeanSub) deserialized.child).extraField);
117117

118118
// second, try deserializing with the wider type (ChildBean). We're losing data (extraField)
119119
preferredTypeId = getClass().getCanonicalName() + "$ChildBean";
120120
deserialized = mapper.readValue(serialized, Bean.class);
121121

122-
assertEquals(deserialized.child.getClass(), ChildBean.class);
122+
assertEquals(ChildBean.class, deserialized.child.getClass());
123123
assertEquals(original.child.someField, deserialized.child.someField);
124124

125125
// third, try deserializing into an Object. The child node should deserialize, but immediately fail mapping.

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/jsr310/IonTimestampInstantDeserializerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void testDeserializationAsFloat03() throws Exception {
6262
public void testDeserializationAsFloatEdgeCase01() throws Exception {
6363
String input = Instant.MAX.getEpochSecond() + ".999999999";
6464
Instant actual = READER.readValue(input);
65-
assertEquals(actual, Instant.MAX);
65+
assertEquals(Instant.MAX, actual);
6666
assertEquals(Instant.MAX.getEpochSecond(), actual.getEpochSecond());
6767
assertEquals(999999999, actual.getNano());
6868
}
@@ -74,7 +74,7 @@ public void testDeserializationAsFloatEdgeCase01() throws Exception {
7474
public void testDeserializationAsFloatEdgeCase02() throws Exception {
7575
String input = Instant.MIN.getEpochSecond() + ".0";
7676
Instant actual = READER.readValue(input);
77-
assertEquals(actual, Instant.MIN);
77+
assertEquals(Instant.MIN, actual);
7878
assertEquals(Instant.MIN.getEpochSecond(), actual.getEpochSecond());
7979
assertEquals(0, actual.getNano());
8080
}

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/polymorphism/PolymorphicTypeAnnotationsTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
import com.fasterxml.jackson.dataformat.ion.IonObjectMapper;
1313
import com.fasterxml.jackson.dataformat.ion.IonParser.Feature;
1414

15-
import static org.junit.jupiter.api.Assertions.assertEquals;
16-
import static org.junit.jupiter.api.Assertions.assertTrue;
15+
import static org.junit.jupiter.api.Assertions.*;
1716

1817
public class PolymorphicTypeAnnotationsTest {
1918
private static final String SUBCLASS_TYPE_NAME = "subtype";
@@ -56,7 +55,7 @@ public void testNativeTypeIdsDisabledReadsTypeAnnotationsSuccessfully() throws I
5655

5756
Container containerWithBaseClass = mapper.readValue(CONTAINER_WITH_TYPED_OBJECT, Container.class);
5857

59-
assertTrue(containerWithBaseClass.objectWithType instanceof Subclass);
58+
assertInstanceOf(Subclass.class, containerWithBaseClass.objectWithType);
6059
assertEquals(SUBCLASS_TYPE_NAME, ((Subclass) containerWithBaseClass.objectWithType).base);
6160
}
6261

0 commit comments

Comments
 (0)