Replace fest-assert by assertJ

5 files changed, 15 insertions, 15 deletions

diff --git a/sonar-deprecated/src/test/java/org/sonar/api/batch/BatchExtensionDictionnaryTest.java b/sonar-deprecated/src/test/java/org/sonar/api/batch/BatchExtensionDictionnaryTest.java
index 374ec6dd199..4a8148b3c86 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/batch/BatchExtensionDictionnaryTest.java
+++ b/sonar-deprecated/src/test/java/org/sonar/api/batch/BatchExtensionDictionnaryTest.java
@@ -29,7 +29,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
 public class BatchExtensionDictionnaryTest {
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/AnnotationCheckFactoryTest.java b/sonar-deprecated/src/test/java/org/sonar/api/checks/AnnotationCheckFactoryTest.java
index d0a14fd17ea..f783eade75f 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/AnnotationCheckFactoryTest.java
+++ b/sonar-deprecated/src/test/java/org/sonar/api/checks/AnnotationCheckFactoryTest.java
@@ -28,7 +28,7 @@ import org.sonar.api.utils.SonarException;
 
 import java.util.Arrays;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 
@@ -41,7 +41,7 @@ public class AnnotationCheckFactoryTest {
   public void createCheckWithoutProperties() {
     RulesProfile profile = RulesProfile.create("repo", "java");
     ActiveRule activeRule = profile.activateRule(Rule.create("repo", "org.sonar.api.checks.CheckWithoutProperties", ""), null);
-    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class> asList(CheckWithoutProperties.class));
+    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class>asList(CheckWithoutProperties.class));
 
     Object check = factory.getCheck(activeRule);
     assertNotNull(check);
@@ -56,7 +56,7 @@ public class AnnotationCheckFactoryTest {
 
     ActiveRule activeRule = profile.activateRule(rule, null);
     activeRule.setParameter("pattern", "foo");
-    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class> asList(CheckWithStringProperty.class));
+    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class>asList(CheckWithStringProperty.class));
 
     Object check = factory.getCheck(activeRule);
     assertNotNull(check);
@@ -74,7 +74,7 @@ public class AnnotationCheckFactoryTest {
 
     ActiveRule activeRule = profile.activateRule(rule, null);
     activeRule.setParameter("unknown", "bar");
-    AnnotationCheckFactory.create(profile, "repo", Arrays.<Class> asList(CheckWithStringProperty.class));
+    AnnotationCheckFactory.create(profile, "repo", Arrays.<Class>asList(CheckWithStringProperty.class));
   }
 
   @Test
@@ -87,7 +87,7 @@ public class AnnotationCheckFactoryTest {
     ActiveRule activeRule = profile.activateRule(rule, null);
     activeRule.setParameter("max", "300");
     activeRule.setParameter("ignore", "true");
-    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class> asList(CheckWithPrimitiveProperties.class));
+    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class>asList(CheckWithPrimitiveProperties.class));
 
     Object check = factory.getCheck(activeRule);
     assertThat(((CheckWithPrimitiveProperties) check).getMax()).isEqualTo(300);
@@ -102,7 +102,7 @@ public class AnnotationCheckFactoryTest {
 
     ActiveRule activeRule = profile.activateRule(rule, null);
     activeRule.setParameter("max", "300");
-    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class> asList(CheckWithIntegerProperty.class));
+    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class>asList(CheckWithIntegerProperty.class));
 
     Object check = factory.getCheck(activeRule);
     assertThat(((CheckWithIntegerProperty) check).getMax()).isEqualTo(300);
@@ -119,7 +119,7 @@ public class AnnotationCheckFactoryTest {
 
     ActiveRule activeRule = profile.activateRule(rule, null);
     activeRule.setParameter("max", "300");
-    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class> asList(ImplementedCheck.class));
+    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class>asList(ImplementedCheck.class));
 
     Object check = factory.getCheck(activeRule);
     assertThat(((ImplementedCheck) check).getMax()).isEqualTo(300);
@@ -135,7 +135,7 @@ public class AnnotationCheckFactoryTest {
 
     ActiveRule activeRule = profile.activateRule(rule, null);
     activeRule.setParameter("max", "300");
-    AnnotationCheckFactory.create(profile, "repo", Arrays.<Class> asList(CheckWithUnsupportedPropertyType.class));
+    AnnotationCheckFactory.create(profile, "repo", Arrays.<Class>asList(CheckWithUnsupportedPropertyType.class));
   }
 
   @Test
@@ -146,7 +146,7 @@ public class AnnotationCheckFactoryTest {
 
     ActiveRule activeRule = profile.activateRule(rule, null);
     activeRule.setParameter("maximum", "300");
-    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class> asList(CheckWithOverriddenPropertyKey.class));
+    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class>asList(CheckWithOverriddenPropertyKey.class));
 
     Object check = factory.getCheck(activeRule);
     assertThat(((CheckWithOverriddenPropertyKey) check).getMax()).isEqualTo(300);
@@ -160,9 +160,9 @@ public class AnnotationCheckFactoryTest {
 
     profile.activateRule(rule, null);
     profile.activateRule(clonedRule, null);
-    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class> asList(CheckWithKey.class));
+    AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class>asList(CheckWithKey.class));
 
-    assertThat(factory.getChecks()).excludes(new Object[] {null});
+    assertThat(factory.getChecks()).doesNotContain(new Object[] {null});
   }
 
   /**
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java b/sonar-deprecated/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java
index 9805fd20907..5be33366643 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java
+++ b/sonar-deprecated/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java
@@ -30,7 +30,7 @@ import org.sonar.api.rule.RuleKey;
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/resources/JavaTest.java b/sonar-deprecated/src/test/java/org/sonar/api/resources/JavaTest.java
index fddc541f307..f77fba190b1 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/resources/JavaTest.java
+++ b/sonar-deprecated/src/test/java/org/sonar/api/resources/JavaTest.java
@@ -21,7 +21,7 @@ package org.sonar.api.resources;
 
 import org.junit.Test;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class JavaTest {
 
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/rules/AnnotationRuleParserTest.java b/sonar-deprecated/src/test/java/org/sonar/api/rules/AnnotationRuleParserTest.java
index 151591226da..79b130ba3fc 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/rules/AnnotationRuleParserTest.java
+++ b/sonar-deprecated/src/test/java/org/sonar/api/rules/AnnotationRuleParserTest.java
@@ -28,7 +28,7 @@ import org.sonar.check.Priority;
 import java.util.Collections;
 import java.util.List;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class AnnotationRuleParserTest {