Remove some violations on unit tests

Took the opportunity to migrate some tests to FestAssert.
Also removed some duplication

2 files changed, 12 insertions, 6 deletions

diff --git a/sonar-squid/pom.xml b/sonar-squid/pom.xml
index 133ecbd2988..43223a8c387 100644
--- a/sonar-squid/pom.xml
+++ b/sonar-squid/pom.xml
@@ -57,6 +57,11 @@
       <artifactId>hamcrest-all</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/sonar-squid/src/test/java/org/sonar/squid/api/SourceCodeTest.java b/sonar-squid/src/test/java/org/sonar/squid/api/SourceCodeTest.java
index ea4e916a8ae..6e15fb84e80 100644
--- a/sonar-squid/src/test/java/org/sonar/squid/api/SourceCodeTest.java
+++ b/sonar-squid/src/test/java/org/sonar/squid/api/SourceCodeTest.java
@@ -25,6 +25,7 @@ import org.junit.Test;
 import org.sonar.squid.measures.Measurable;
 import org.sonar.squid.measures.Metric;
 
+import static org.fest.assertions.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -62,12 +63,13 @@ public class SourceCodeTest {
 
   @Test
   public void testEqualsAndHashCode() {
-    assertFalse((prj.equals(pac)));
-    assertFalse(prj.hashCode() == pac.hashCode());
-    assertFalse(prj.equals(new Object()));
+    assertThat(prj).isNotEqualTo(pac);
+    assertThat(prj.hashCode()).isNotEqualTo(pac.hashCode());
+    assertThat(prj).isNotEqualTo(new Object());
+
     SourceCode samePac = new SourcePackage("org.sonar");
-    assertEquals(pac, samePac);
-    assertEquals(pac.hashCode(), samePac.hashCode());
+    assertThat(pac).isEqualTo(samePac);
+    assertThat(pac.hashCode()).isEqualTo(samePac.hashCode());
   }
 
   @Test
@@ -111,7 +113,6 @@ public class SourceCodeTest {
     assertEquals(file, method.getAncestor(SourceFile.class));
   }
 
-
   @Test
   public void testHasAmongParents() {
     assertTrue(cla.hasAmongParents(prj));