From fa397759e33f33064b3d6112271a7c172004ee86 Mon Sep 17 00:00:00 2001
From: David Harrigan <dharrigan@gmail.com>
Date: Thu, 10 Oct 2013 19:05:41 +0100
Subject: [PATCH] DATACOUCH-37 - Refactor Deprecated JUnit Asserts.

Removed deprecated methods and changed to Hamcrest.

-=david=-
---
 .../data/couchbase/monitor/AbstractMonitor.java           | 7 ++-----
 .../core/mapping/MappingCouchbaseConverterTests.java      | 2 +-
 .../data/couchbase/monitor/ClientInfoTests.java           | 8 +++++---
 .../data/couchbase/monitor/ClusterInfoTests.java          | 7 ++++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/springframework/data/couchbase/monitor/AbstractMonitor.java b/src/main/java/org/springframework/data/couchbase/monitor/AbstractMonitor.java
index 690f1452..531dc944 100644
--- a/src/main/java/org/springframework/data/couchbase/monitor/AbstractMonitor.java
+++ b/src/main/java/org/springframework/data/couchbase/monitor/AbstractMonitor.java
@@ -50,7 +50,7 @@ public abstract class AbstractMonitor {
   }
 
   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 @@ public abstract class AbstractMonitor {
    *
    * @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);
diff --git a/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java b/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java
index 1bf14f4d..086af59b 100644
--- a/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java
+++ b/src/test/java/org/springframework/data/couchbase/core/mapping/MappingCouchbaseConverterTests.java
@@ -440,7 +440,7 @@ public class MappingCouchbaseConverterTests {
     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;
diff --git a/src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTests.java b/src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTests.java
index 7d9e765a..a8b9e8a3 100644
--- a/src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTests.java
+++ b/src/test/java/org/springframework/data/couchbase/monitor/ClientInfoTests.java
@@ -25,7 +25,10 @@ import org.springframework.data.couchbase.TestApplicationConfig;
 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 class ClientInfoTests {
   @Test
   public void hostNames() {
     String hostnames = ci.getHostNames();
-    assertNotNull(hostnames);
-    assertFalse(hostnames.isEmpty());
+    assertThat(hostnames, not(isEmptyString()));
   }
 
 }
diff --git a/src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTests.java b/src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTests.java
index 14c375f2..0b4b17f6 100644
--- a/src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTests.java
+++ b/src/test/java/org/springframework/data/couchbase/monitor/ClusterInfoTests.java
@@ -25,7 +25,8 @@ import org.springframework.data.couchbase.TestApplicationConfig;
 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 class ClusterInfoTests {
 
   @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));
   }
 
 }