Clean-up sonar-testing-harness dependencies

and decrease usages of Hamcrest

3 files changed, 39 insertions, 10 deletions

diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml
index 69f66f0a1c7..bb1b64f3053 100644
--- a/server/sonar-server/pom.xml
+++ b/server/sonar-server/pom.xml
@@ -187,6 +187,32 @@
 
     <!-- unit tests -->
     <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-guava</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <!-- TODO to be removed -->
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>sonar-db-testing</artifactId>
       <type>pom</type>
@@ -203,6 +229,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>com.tngtech.java</groupId>
+      <artifactId>junit-dataprovider</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.github.kevinsawicki</groupId>
       <artifactId>http-request</artifactId>
       <scope>test</scope>
diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationChannelTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationChannelTest.java
index d1f466711ec..6e426d7042c 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationChannelTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/notification/NotificationChannelTest.java
@@ -19,23 +19,22 @@
  */
 package org.sonar.server.notification;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
 import org.junit.Test;
 import org.sonar.api.notifications.Notification;
 import org.sonar.api.notifications.NotificationChannel;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class NotificationChannelTest {
 
   @Test
   public void defaultMethods() {
     NotificationChannel channel = new FakeNotificationChannel();
-    assertThat(channel.getKey(), is("FakeNotificationChannel"));
-    assertThat(channel.toString(), is("FakeNotificationChannel"));
+    assertThat(channel.getKey()).isEqualTo("FakeNotificationChannel");
+    assertThat(channel.toString()).isEqualTo("FakeNotificationChannel");
   }
 
-  class FakeNotificationChannel extends NotificationChannel {
+  private class FakeNotificationChannel extends NotificationChannel {
     @Override
     public void deliver(Notification notification, String username) {
     }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java
index eb8ed87820b..95f0dc4e54d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/user/CompatibilityRealmTest.java
@@ -22,8 +22,7 @@ package org.sonar.server.user;
 import org.junit.Test;
 import org.sonar.api.security.LoginPasswordAuthenticator;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -35,8 +34,8 @@ public class CompatibilityRealmTest {
     CompatibilityRealm realm = new CompatibilityRealm(authenticator);
     realm.init();
     verify(authenticator).init();
-    assertThat(realm.getLoginPasswordAuthenticator(), is(authenticator));
-    assertThat(realm.getName(), is("CompatibilityRealm[" + authenticator.getClass().getName() + "]"));
+    assertThat(realm.getLoginPasswordAuthenticator()).isSameAs(authenticator);
+    assertThat(realm.getName()).isEqualTo("CompatibilityRealm[" + authenticator.getClass().getName() + "]");
   }
 
 }