Replace fest-assert by assertJ

6 files changed, 9 insertions, 11 deletions

diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java
index 0fc741e3910..cc4593cbbb7 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalReferentialsTest.java
@@ -19,12 +19,11 @@
  */
 package org.sonar.batch.protocol.input;
 
-import org.fest.assertions.MapAssert;
 import org.json.JSONException;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class GlobalReferentialsTest {
 
@@ -65,6 +64,6 @@ public class GlobalReferentialsTest {
     assertThat(metric.bestValue()).isEqualTo(1.0);
     assertThat(metric.isOptimizedBestValue()).isTrue();
 
-    assertThat(ref.globalSettings()).includes(MapAssert.entry("prop", "value"));
+    assertThat(ref.globalSettings()).containsEntry("prop", "value");
   }
 }
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectReferentialsTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectReferentialsTest.java
index 96af4da66fc..12cdedcb4ce 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectReferentialsTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/ProjectReferentialsTest.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.batch.protocol.input;
 
-import org.fest.assertions.MapAssert;
 import org.json.JSONException;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -28,7 +27,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ProjectReferentialsTest {
 
@@ -84,13 +83,13 @@ public class ProjectReferentialsTest {
     assertThat(activeRule.severity()).isEqualTo("MAJOR");
     assertThat(activeRule.internalKey()).isEqualTo("rule1");
     assertThat(activeRule.language()).isEqualTo("java");
-    assertThat(activeRule.params()).includes(MapAssert.entry("param1", "value1"));
+    assertThat(activeRule.params()).containsEntry("param1", "value1");
     assertThat(activeRule.param("param1")).isEqualTo("value1");
     QProfile qProfile = ref.qProfiles().iterator().next();
     assertThat(qProfile.key()).isEqualTo("squid-java");
     assertThat(qProfile.name()).isEqualTo("Java");
     assertThat(qProfile.rulesUpdatedAt()).isEqualTo(new SimpleDateFormat("dd/MM/yyyy").parse("14/03/1984"));
-    assertThat(ref.settings("foo")).includes(MapAssert.entry("prop", "value"));
+    assertThat(ref.settings("foo")).containsEntry("prop", "value");
 
     assertThat(ref.fileData("foo2", "src/main/java/Foo3.java")).isNull();
 
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/QProfileTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/QProfileTest.java
index 460d1720405..d28bdbbe489 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/QProfileTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/QProfileTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class QProfileTest {
 
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/ReportHelperTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/ReportHelperTest.java
index 2cfc9ef745f..d79fb5a96d8 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/ReportHelperTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/ReportHelperTest.java
@@ -30,7 +30,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ReportHelperTest {
 
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/component/ReportComponentsTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/component/ReportComponentsTest.java
index f97cf26b28e..0df08d6d0df 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/component/ReportComponentsTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/component/ReportComponentsTest.java
@@ -27,7 +27,7 @@ import org.sonar.batch.protocol.output.component.ReportComponent.Type;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ReportComponentsTest {
 
diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/issue/ReportIssueTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/issue/ReportIssueTest.java
index be09bf98811..36770b20e9f 100644
--- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/issue/ReportIssueTest.java
+++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/output/issue/ReportIssueTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 
 import java.text.SimpleDateFormat;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ReportIssueTest {