From 7788ffe6886e2af916b22d610fb11752e909fb06 Mon Sep 17 00:00:00 2001
From: capstan <nherring@google.com>
Date: Tue, 5 Nov 2019 10:42:18 +0100
Subject: [PATCH] Upgrade Fest Assert to AssertJ.

Also re-ordered one `overridingErrorMessage` to be applied before the assert evaluation.

Same fixes as for java-json-tools/json-schema-core/issues/66.
---
 build.gradle                                        |  3 ++-
 .../matchers/ProcessingMessageAssert.java           | 13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 42a8a3e1d..3ae1a7658 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,7 +73,8 @@ dependencies {
         exclude(group: "org.yaml", module: "snakeyaml");
     };
     testCompile(group: "org.mockito", name: "mockito-core", version: "2.4.2");
-    testCompile(group: "org.easytesting", name: "fest-assert", version: "1.4");
+    // FIXME: update to 3.x once we're off of Java 7.
+    testCompile(group: "org.assertj", name: "assertj-core", version: "2.9.1");
 }
 
 javadoc {
diff --git a/src/test/java/com/github/fge/jsonschema/matchers/ProcessingMessageAssert.java b/src/test/java/com/github/fge/jsonschema/matchers/ProcessingMessageAssert.java
index 5a53411bb..6248c7a73 100644
--- a/src/test/java/com/github/fge/jsonschema/matchers/ProcessingMessageAssert.java
+++ b/src/test/java/com/github/fge/jsonschema/matchers/ProcessingMessageAssert.java
@@ -19,6 +19,7 @@
 
 package com.github.fge.jsonschema.matchers;
 
+import org.assertj.core.api.AbstractAssert;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -27,16 +28,15 @@
 import com.github.fge.jsonschema.core.report.ProcessingMessage;
 import com.github.fge.jsonschema.core.tree.SchemaTree;
 import com.github.fge.jsonschema.core.util.AsJson;
-import org.fest.assertions.GenericAssert;
 
 import java.util.Collection;
 import java.util.Map;
 
-import static org.fest.assertions.Assertions.*;
+import static org.assertj.core.api.Assertions.*;
 import static org.testng.Assert.*;
 
 public final class ProcessingMessageAssert
-    extends GenericAssert<ProcessingMessageAssert, ProcessingMessage>
+    extends AbstractAssert<ProcessingMessageAssert, ProcessingMessage>
 {
     private final JsonNode msg;
 
@@ -48,7 +48,7 @@ public static ProcessingMessageAssert assertMessage(
 
     private ProcessingMessageAssert(final ProcessingMessage actual)
     {
-        super(ProcessingMessageAssert.class, actual);
+        super(actual, ProcessingMessageAssert.class);
         msg = actual.asJson();
     }
 
@@ -88,9 +88,10 @@ public <T> ProcessingMessageAssert hasField(final String name,
         assertThat(msg.has(name)).isTrue();
         final String input = msg.get(name).textValue();
         final String expected = value.toString();
-        assertThat(input).isEqualTo(expected)
+        assertThat(input)
             .overridingErrorMessage("Strings differ: wanted " + expected
-                + " but got " + input);
+                + " but got " + input)
+            .isEqualTo(expected);
         return this;
     }