DATACOUCH-37 - Refactor Deprecated JUnit Asserts.

Removed deprecated methods and changed to Hamcrest.

-=david=-

Author: dharrigan

src/main/java/org/springframework/data/couchbase/monitor/AbstractMonitor.java

@@ -50,7 +50,7 @@ protected RestTemplate getTemplate() {
   }
 
   protected String randomAvailableHostname() {
-    List<SocketAddress> available = (ArrayList) client.getAvailableServers();
+    List<SocketAddress> available = (ArrayList<SocketAddress>) client.getAvailableServers();
     Collections.shuffle(available);
     return ((InetSocketAddress) available.get(0)).getHostName();
   }
@@ -60,15 +60,12 @@ protected String randomAvailableHostname() {
    *
    * @return stats for each node
    */
-  protected Map<SocketAddress,Map<String,String>> getStats() {
+  protected Map<SocketAddress, Map<String, String>> getStats() {
     return client.getStats();
   }
 
   /**
    * Returns stats for an individual node.
-   *
-   * @param node
-   * @return
    */
   protected Map<String, String> getStats(SocketAddress node) {
     return getStats().get(node);

src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java

@@ -440,7 +440,7 @@ static class MapEntity extends BaseEntity {
     private Map<String, Boolean> attr1;
     private Map<Integer, String> attr2;
     private Map<String, Map<String, String>> attr3;
-    public MapEntity(Map attr0, Map attr1, Map attr2, Map attr3) {
+    public MapEntity(Map<String, String> attr0, Map<String, Boolean> attr1, Map<Integer, String> attr2, Map<String, Map<String, String>> attr3) {
       this.attr0 = attr0;
       this.attr1 = attr1;
       this.attr2 = attr2;

src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTests.java

@@ -25,7 +25,10 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static junit.framework.Assert.assertNotNull;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.core.IsNot.not;
 import static org.junit.Assert.assertFalse;
 
 /**
@@ -51,8 +54,7 @@ public void setup() throws Exception {
   @Test
   public void hostNames() {
     String hostnames = ci.getHostNames();
-    assertNotNull(hostnames);
-    assertFalse(hostnames.isEmpty());
+    assertThat(hostnames, not(isEmptyString()));
   }
 
 }

src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTests.java

@@ -25,7 +25,8 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static junit.framework.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
 
 /**
  * @author Michael Nitschinger
@@ -49,12 +50,12 @@ public void setup() throws Exception {
 
   @Test
   public void totalRAMAssigned() {
-    assertTrue(ci.getTotalRAMAssigned() > 0);
+    assertThat(ci.getTotalRAMAssigned(), greaterThan(0L));
   }
 
   @Test
   public void totalRAMUsed() {
-    assertTrue(ci.getTotalRAMUsed() > 0);
+    assertThat(ci.getTotalRAMUsed(), greaterThan(0L));
   }
 
 }