19
19
20
20
package com .github .fge .jsonschema .matchers ;
21
21
22
+ import org .assertj .core .api .AbstractAssert ;
22
23
import com .fasterxml .jackson .databind .JsonNode ;
23
24
import com .fasterxml .jackson .databind .node .ArrayNode ;
24
25
import com .fasterxml .jackson .databind .node .ObjectNode ;
27
28
import com .github .fge .jsonschema .core .report .ProcessingMessage ;
28
29
import com .github .fge .jsonschema .core .tree .SchemaTree ;
29
30
import com .github .fge .jsonschema .core .util .AsJson ;
30
- import org .fest .assertions .GenericAssert ;
31
31
32
32
import java .util .Collection ;
33
33
import java .util .Map ;
34
34
35
- import static org .fest . assertions .Assertions .*;
35
+ import static org .assertj . core . api .Assertions .*;
36
36
import static org .testng .Assert .*;
37
37
38
38
public final class ProcessingMessageAssert
39
- extends GenericAssert <ProcessingMessageAssert , ProcessingMessage >
39
+ extends AbstractAssert <ProcessingMessageAssert , ProcessingMessage >
40
40
{
41
41
private final JsonNode msg ;
42
42
@@ -48,7 +48,7 @@ public static ProcessingMessageAssert assertMessage(
48
48
49
49
private ProcessingMessageAssert (final ProcessingMessage actual )
50
50
{
51
- super (ProcessingMessageAssert .class , actual );
51
+ super (actual , ProcessingMessageAssert .class );
52
52
msg = actual .asJson ();
53
53
}
54
54
@@ -88,9 +88,10 @@ public <T> ProcessingMessageAssert hasField(final String name,
88
88
assertThat (msg .has (name )).isTrue ();
89
89
final String input = msg .get (name ).textValue ();
90
90
final String expected = value .toString ();
91
- assertThat (input ). isEqualTo ( expected )
91
+ assertThat (input )
92
92
.overridingErrorMessage ("Strings differ: wanted " + expected
93
- + " but got " + input );
93
+ + " but got " + input )
94
+ .isEqualTo (expected );
94
95
return this ;
95
96
}
96
97
0 commit comments