GC use of deprecated junit assertThat and unify

7 files changed, 100 insertions, 113 deletions

diff --git a/config-proxy/pom.xml b/config-proxy/pom.xml
index bc79a5327eb..e79aec952db 100644
--- a/config-proxy/pom.xml
+++ b/config-proxy/pom.xml
@@ -54,11 +54,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>filedistribution</artifactId>
       <version>${project.version}</version>
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java
index 691bc6c43a7..f743c0ed231 100644
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java
@@ -20,9 +20,8 @@ import org.junit.rules.TemporaryFolder;
 import java.io.IOException;
 import java.time.Duration;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author hmusum
@@ -60,7 +59,7 @@ public class ConfigProxyRpcServerTest {
         ProxyServer proxy = createTestServer(new MockConfigSource());
         Spec spec = new Spec("localhost", 12345);
         ConfigProxyRpcServer server = new ConfigProxyRpcServer(proxy, new Supervisor(new Transport()), spec);
-        assertThat(server.getSpec(), is(spec));
+        assertEquals(spec, server.getSpec());
     }
 
     /**
@@ -72,8 +71,8 @@ public class ConfigProxyRpcServerTest {
         client.invoke(req);
 
         assertFalse(req.errorMessage(), req.isError());
-        assertThat(req.returnValues().size(), is(1));
-        assertThat(req.returnValues().get(0).asInt32(), is(0));
+        assertEquals(1, req.returnValues().size());
+        assertEquals(0, req.returnValues().get(0).asInt32());
     }
 
     /**
@@ -88,21 +87,20 @@ public class ConfigProxyRpcServerTest {
 
         assertFalse(req.errorMessage(), req.isError());
         String[] ret = req.returnValues().get(0).asStringArray();
-        assertThat(req.returnValues().size(), is(1));
-        assertThat(ret.length, is(0));
+        assertEquals(1, req.returnValues().size());
+        assertEquals(0, ret.length);
 
         final RawConfig config = ProxyServerTest.fooConfig;
         server.proxyServer().memoryCache().update(config);
         req = new Request("listCachedConfig");
         client.invoke(req);
         assertFalse(req.errorMessage(), req.isError());
-        assertThat(req.returnValues().size(), is(1));
+        assertEquals(1, req.returnValues().size());
         ret = req.returnValues().get(0).asStringArray();
-        assertThat(ret.length, is(1));
-        assertThat(ret[0], is(config.getNamespace() + "." + config.getName() + "," +
-                config.getConfigId() + "," +
-                config.getGeneration() + "," +
-                config.getPayloadChecksums()));
+        assertEquals(1, ret.length);
+        assertEquals(config.getNamespace() + "." + config.getName() + "," + config.getConfigId() + "," +
+                config.getGeneration() + "," + config.getPayloadChecksums(),
+                ret[0]);
     }
 
     /**
@@ -114,9 +112,9 @@ public class ConfigProxyRpcServerTest {
         client.invoke(req);
 
         assertFalse(req.errorMessage(), req.isError());
-        assertThat(req.returnValues().size(), is(1));
+        assertEquals(1, req.returnValues().size());
         String[] ret = req.returnValues().get(0).asStringArray();
-        assertThat(ret.length, is(0));
+        assertEquals(0, ret.length);
 
         final RawConfig config = ProxyServerTest.fooConfig;
         server.proxyServer().memoryCache().update(config);
@@ -124,12 +122,10 @@ public class ConfigProxyRpcServerTest {
         client.invoke(req);
         assertFalse(req.errorMessage(), req.isError());
         ret = req.returnValues().get(0).asStringArray();
-        assertThat(ret.length, is(1));
-        assertThat(ret[0], is(config.getNamespace() + "." + config.getName() + "," +
-                config.getConfigId() + "," +
-                config.getGeneration() + "," +
-                config.getPayloadChecksums() + "," +
-                config.getPayload().getData()));
+        assertEquals(1, ret.length);
+        assertEquals(config.getNamespace() + "." + config.getName() + "," + config.getConfigId() + "," +
+                config.getGeneration() + "," + config.getPayloadChecksums() + "," + config.getPayload().getData(),
+                ret[0]);
     }
 
     /**
@@ -143,11 +139,11 @@ public class ConfigProxyRpcServerTest {
         client.invoke(req);
 
         assertFalse(req.errorMessage(), req.isError());
-        assertThat(req.returnValues().size(), is(1));
+        assertEquals(1, req.returnValues().size());
         final String[] ret = req.returnValues().get(0).asStringArray();
-        assertThat(ret.length, is(2));
-        assertThat(ret[0], is("Current source: " + configSourceAddress));
-        assertThat(ret[1], is("All sources:\n" + configSourceAddress + "\n"));
+        assertEquals(2, ret.length);
+        assertEquals("Current source: " + configSourceAddress, ret[0]);
+        assertEquals("All sources:\n" + configSourceAddress + "\n", ret[1]);
     }
 
     /**
@@ -159,11 +155,11 @@ public class ConfigProxyRpcServerTest {
         client.invoke(req);
 
         assertFalse(req.errorMessage(), req.isError());
-        assertThat(req.returnValues().size(), is(1));
+        assertEquals(1, req.returnValues().size());
         final String[] ret = req.returnValues().get(0).asStringArray();
-        assertThat(ret.length, is(2));
-        assertThat(ret[0], is("0"));
-        assertThat(ret[1], is("success"));
+        assertEquals(2, ret.length);
+        assertEquals("0", ret[0]);
+        assertEquals("success", ret[1]);
     }
 
     /**
@@ -174,26 +170,26 @@ public class ConfigProxyRpcServerTest {
         Request req = new Request("getMode");
         client.invoke(req);
         assertFalse(req.errorMessage(), req.isError());
-        assertThat(req.returnValues().size(), is(1));
-        assertThat(req.returnValues().get(0).asString(), is("default"));
+        assertEquals(1, req.returnValues().size());
+        assertEquals("default", req.returnValues().get(0).asString());
 
         req = new Request("setMode");
         String mode = "memorycache";
         req.parameters().add(new StringValue(mode));
         client.invoke(req);
         assertFalse(req.errorMessage(), req.isError());
-        assertThat(req.returnValues().size(), is(1));
+        assertEquals(1, req.returnValues().size());
         String[] ret = req.returnValues().get(0).asStringArray();
-        assertThat(ret.length, is(2));
-        assertThat(ret[0], is("0"));
-        assertThat(ret[1], is("success"));
-        assertThat(server.proxyServer().getMode().name(), is(mode));
+        assertEquals(2, ret.length);
+        assertEquals("0", ret[0]);
+        assertEquals("success", ret[1]);
+        assertEquals(mode, server.proxyServer().getMode().name());
 
         req = new Request("getMode");
         client.invoke(req);
         assertFalse(req.errorMessage(), req.isError());
-        assertThat(req.returnValues().size(), is(1));
-        assertThat(req.returnValues().get(0).asString(), is(mode));
+        assertEquals(1, req.returnValues().size());
+        assertEquals(mode, req.returnValues().get(0).asString());
 
         req = new Request("setMode");
         String oldMode = mode;
@@ -203,10 +199,10 @@ public class ConfigProxyRpcServerTest {
 
         assertFalse(req.errorMessage(), req.isError());
         ret = req.returnValues().get(0).asStringArray();
-        assertThat(ret.length, is(2));
-        assertThat(ret[0], is("1"));
-        assertThat(ret[1], is("Unrecognized mode '" + mode + "' supplied. Legal modes are '" + Mode.modes() + "'"));
-        assertThat(server.proxyServer().getMode().name(), is(oldMode));
+        assertEquals(2, ret.length);
+        assertEquals("1", ret[0]);
+        assertEquals("Unrecognized mode '" + mode + "' supplied. Legal modes are '" + Mode.modes() + "'", ret[1]);
+        assertEquals(oldMode, server.proxyServer().getMode().name());
     }
 
     /**
@@ -222,8 +218,8 @@ public class ConfigProxyRpcServerTest {
         req.parameters().add(new StringValue(spec1 + "," + spec2));
         client.invoke(req);
         assertFalse(req.errorMessage(), req.isError());
-        assertThat(req.returnValues().size(), is(1));
-        assertThat(req.returnValues().get(0).asString(), is("Updated config sources to: " + spec1 + "," + spec2));
+        assertEquals(1, req.returnValues().size());
+        assertEquals("Updated config sources to: " + spec1 + "," + spec2, req.returnValues().get(0).asString());
 
 
         server.proxyServer().setMode(Mode.ModeName.MEMORYCACHE.name());
@@ -232,17 +228,17 @@ public class ConfigProxyRpcServerTest {
         req.parameters().add(new StringValue(spec1 + "," + spec2));
         client.invoke(req);
         assertFalse(req.errorMessage(), req.isError());
-        assertThat(req.returnValues().size(), is(1));
-        assertThat(req.returnValues().get(0).asString(), is("Cannot update sources when in '" + Mode.ModeName.MEMORYCACHE.name().toLowerCase() + "' mode"));
+        assertEquals(1, req.returnValues().size());
+        assertEquals("Cannot update sources when in '" + Mode.ModeName.MEMORYCACHE.name().toLowerCase() + "' mode", req.returnValues().get(0).asString());
 
         // TODO source connections needs to have deterministic order to work
         /*req = new Request("listSourceConnections");
         rpcServer.listSourceConnections(req);
         assertFalse(req.errorMessage(), req.isError());
         final String[] ret = req.returnValues().get(0).asStringArray();
-        assertThat(ret.length, is(2));
-        assertThat(ret[0], is("Current source: " + spec1));
-        assertThat(ret[1], is("All sources:\n" + spec2 + "\n" + spec1 + "\n"));
+        assertEquals(ret.length, is(2));
+        assertEquals(ret[0], is("Current source: " + spec1));
+        assertEquals(ret[1], is("All sources:\n" + spec2 + "\n" + spec1 + "\n"));
         */
     }
 
@@ -256,8 +252,8 @@ public class ConfigProxyRpcServerTest {
         req.parameters().add(new StringValue(path));
         client.invoke(req);
         assertFalse(req.errorMessage(), req.isError());
-        assertThat(req.returnValues().size(), is(1));
-        assertThat(req.returnValues().get(0).asString(), is("success"));
+        assertEquals(1, req.returnValues().size());
+        assertEquals("success", req.returnValues().get(0).asString());
     }
 
     private static ProxyServer createTestServer(ConfigSourceSet source) {
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponseTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponseTest.java
index 142f69d41da..d8c03961ddb 100644
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponseTest.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponseTest.java
@@ -7,8 +7,7 @@ import org.junit.Test;
 import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -28,17 +27,17 @@ public class DelayedResponseTest {
         final String configName = "foo";
         final JRTServerConfigRequest request = tester.createRequest(configName, configId, namespace, timeout);
         DelayedResponse delayedResponse = new DelayedResponse(request, returnTime);
-        assertThat(delayedResponse.getRequest(), is(request));
-        assertThat(delayedResponse.getReturnTime(), is(returnTime));
+        assertEquals(request, delayedResponse.getRequest());
+        assertEquals(returnTime, delayedResponse.getReturnTime().longValue());
         assertTrue(delayedResponse.getDelay(TimeUnit.SECONDS) < returnTime);
 
         DelayedResponse before = new DelayedResponse(request, returnTime - 1000L);
         DelayedResponse after = new DelayedResponse(request, returnTime + 1000L);
 
-        assertThat(delayedResponse.compareTo(delayedResponse), is(0));
-        assertThat(delayedResponse.compareTo(before), is(1));
-        assertThat(delayedResponse.compareTo(after), is(-1));
-        assertThat(delayedResponse.compareTo(new Delayed() {
+        assertEquals(0, delayedResponse.compareTo(delayedResponse));
+        assertEquals(1, delayedResponse.compareTo(before));
+        assertEquals(-1, delayedResponse.compareTo(after));
+        assertEquals(0, delayedResponse.compareTo(new Delayed() {
             @Override
             public long getDelay(TimeUnit unit) {
                 return 0;
@@ -48,7 +47,7 @@ public class DelayedResponseTest {
             public int compareTo(Delayed o) {
                 return 0;
             }
-        }), is(0));
+        }));
     }
 
     @Test
@@ -75,9 +74,9 @@ public class DelayedResponseTest {
                 delayed2.getReturnTime() > delayed1.getReturnTime());
 
         // Test compareTo() method
-        assertThat(delayed1.compareTo(delayed1), is(0));
-        assertThat(delayed1.compareTo(delayed2), is(-1));
-        assertThat(delayed2.compareTo(delayed1), is(1));
+        assertEquals(0, delayed1.compareTo(delayed1));
+        assertEquals(-1, delayed1.compareTo(delayed2));
+        assertEquals(1, delayed2.compareTo(delayed1));
     }
 
 }
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponsesTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponsesTest.java
index f317550228b..c9e714a11a3 100644
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponsesTest.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponsesTest.java
@@ -3,8 +3,7 @@ package com.yahoo.vespa.config.proxy;
 
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author hmusum
@@ -18,14 +17,14 @@ public class DelayedResponsesTest {
         DelayedResponse delayedResponse = new DelayedResponse(tester.createRequest("foo", "id", "bar", 10));
         responses.add(delayedResponse);
 
-        assertThat(responses.size(), is(1));
-        assertThat(responses.responses().take(), is(delayedResponse));
-        assertThat(responses.size(), is(0));
+        assertEquals(1, responses.size());
+        assertEquals(delayedResponse, responses.responses().take());
+        assertEquals(0, responses.size());
 
         responses.add(delayedResponse);
-        assertThat(responses.size(), is(1));
+        assertEquals(1, responses.size());
         responses.remove(delayedResponse);
-        assertThat(responses.size(), is(0));
+        assertEquals(0, responses.size());
     }
 
 }
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java
index 0b590aea789..f84d447e3a1 100644
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java
@@ -3,11 +3,10 @@ package com.yahoo.vespa.config.proxy;
 
 import org.junit.Test;
 
-import java.util.Collections;
+import java.util.List;
 
-import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 
 /**
  * @author hmusum
@@ -18,11 +17,11 @@ public class MemoryCacheConfigClientTest {
     public void basic() {
         MemoryCacheConfigClient client = new MemoryCacheConfigClient(new MemoryCache());
         client.memoryCache().update(ConfigTester.fooConfig);
-        assertThat(client.getConfig(ConfigTester.fooConfig, null), is(ConfigTester.fooConfig));
+        assertEquals(ConfigTester.fooConfig, client.getConfig(ConfigTester.fooConfig, null));
         assertNull(client.getConfig(ConfigTester.barConfig, null));
 
-        assertThat(client.getActiveSourceConnection(), is("N/A"));
-        assertThat(client.getSourceConnections(), is(Collections.singletonList("N/A")));
+        assertEquals("N/A", client.getActiveSourceConnection());
+        assertEquals(List.of("N/A"), client.getSourceConnections());
     }
 
 }
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java
index 953b67b3ea5..1a919ad3988 100644
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheTest.java
@@ -14,8 +14,9 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.Optional;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author hmusum
@@ -79,21 +80,21 @@ public class MemoryCacheTest {
 
         cache.update(config);
         cache.update(config2);
-        assertThat(cache.size(), is(2));
+        assertEquals(2, cache.size());
         assertTrue(cache.containsKey(cacheKey));
         assertTrue(cache.containsKey(cacheKey2));
 
         RawConfig response = cache.get(cacheKey);
         assertNotNull(response);
-        assertThat(response.getName(), is(defName));
-        assertThat(response.getPayload().toString(), is(payload.toString()));
-        assertThat(response.getGeneration(), is(generation));
+        assertEquals(defName, response.getName());
+        assertEquals(payload.toString(), response.getPayload().toString());
+        assertEquals(generation, response.getGeneration());
 
         response = cache.get(cacheKey2);
         assertNotNull(response);
-        assertThat(response.getName(), is(defName2));
-        assertThat(response.getPayload().toString(), is(payload2.toString()));
-        assertThat(response.getGeneration(), is(generation));
+        assertEquals(defName2, response.getName());
+        assertEquals(payload2.toString(), response.getPayload().toString());
+        assertEquals(generation, response.getGeneration());
 
         cache.clear();
     }
@@ -104,22 +105,22 @@ public class MemoryCacheTest {
 
         cache.update(config);
         cache.update(configDifferentMd5); // same name, different defMd5
-        assertThat(cache.size(), is(2));
+        assertEquals(2, cache.size());
         assertTrue(cache.containsKey(cacheKey));
 
         RawConfig response = cache.get(cacheKey);
         assertNotNull(response);
-        assertThat(response.getName(), is(defName));
-        assertThat(response.getPayload().getData(), is(payload.getData()));
-        assertThat(response.getGeneration(), is(generation));
+        assertEquals(defName, response.getName());
+        assertEquals(payload.getData(), response.getPayload().getData());
+        assertEquals(generation, response.getGeneration());
 
         response = cache.get(cacheKeyDifferentMd5);
         assertNotNull(response);
-        assertThat(response.getName(), is(defName));
-        assertThat(response.getPayload().getData(), is(payloadDifferentMd5.getData()));
-        assertThat(response.getGeneration(), is(generation));
+        assertEquals(defName, response.getName());
+        assertEquals(payloadDifferentMd5.getData(), response.getPayload().getData());
+        assertEquals(generation, response.getGeneration());
 
         cache.clear();
-        assertThat(cache.size(), is(0));
+        assertEquals(0, cache.size());
     }
 }
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java
index 15de93b748f..ee058ba903e 100644
--- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java
@@ -16,11 +16,9 @@ import org.junit.rules.TemporaryFolder;
 
 import java.util.Optional;
 
-import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -59,16 +57,16 @@ public class ProxyServerTest {
     @Test
     public void basic() {
         assertTrue(proxy.getMode().isDefault());
-        assertThat(proxy.memoryCache().size(), is(0));
+        assertEquals(0, proxy.memoryCache().size());
 
         ConfigTester tester = new ConfigTester();
         MemoryCache memoryCache = proxy.memoryCache();
         assertEquals(0, memoryCache.size());
         RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig));
         assertNotNull(res);
-        assertThat(res.getPayload().toString(), is(ConfigTester.fooPayload.toString()));
+        assertEquals(ConfigTester.fooPayload.toString(), res.getPayload().toString());
         assertEquals(1, memoryCache.size());
-        assertThat(memoryCache.get(new ConfigCacheKey(fooConfig.getKey(), fooConfig.getDefMd5())), is(res));
+        assertEquals(res, memoryCache.get(new ConfigCacheKey(fooConfig.getKey(), fooConfig.getDefMd5())));
     }
 
     /**
@@ -81,7 +79,7 @@ public class ProxyServerTest {
 
         for (String mode : Mode.modes()) {
             proxy.setMode(mode);
-            assertThat(proxy.getMode().name(), is(mode));
+            assertEquals(mode, proxy.getMode().name());
         }
 
         // Try setting an invalid mode
@@ -115,9 +113,9 @@ public class ProxyServerTest {
         assertEquals(0, memoryCache.size());
         RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig));
         assertNotNull(res);
-        assertThat(res.getPayload().toString(), is(ConfigTester.fooPayload.toString()));
+        assertEquals(ConfigTester.fooPayload.toString(), res.getPayload().toString());
         assertEquals(1, memoryCache.size());
-        assertThat(memoryCache.get(new ConfigCacheKey(fooConfig.getKey(), fooConfig.getDefMd5())), is(res));
+        assertEquals(res, memoryCache.get(new ConfigCacheKey(fooConfig.getKey(), fooConfig.getDefMd5())));
 
         // Trying same config again
         JRTServerConfigRequest newRequestBasedOnResponse = tester.createRequest(res);
@@ -153,7 +151,7 @@ public class ProxyServerTest {
         res = proxy.resolveConfig(tester.createRequest(fooConfig));
         assertNotNull(res);
         assertNotNull(res.getPayload().getData());
-        assertThat(res.getPayload().toString(), is(ConfigTester.fooPayload.toString()));
+        assertEquals(ConfigTester.fooPayload.toString(), res.getPayload().toString());
         assertEquals(1, memoryCache.size());
 
         JRTServerConfigRequest newRequestBasedOnResponse = tester.createRequest(res);
@@ -176,7 +174,7 @@ public class ProxyServerTest {
         assertEquals(0, cache.size());
         RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig));
         assertNotNull(res);
-        assertThat(res.getPayload().toString(), is(ConfigTester.fooPayload.toString()));
+        assertEquals(ConfigTester.fooPayload.toString(), res.getPayload().toString());
         assertEquals(1, cache.size());
 
         // Simulate an empty response
@@ -187,7 +185,7 @@ public class ProxyServerTest {
 
         res = proxy.resolveConfig(tester.createRequest(fooConfig));
         assertNotNull(res.getPayload());
-        assertThat(res.getPayload().toString(), is(emptyConfig.getPayload().toString()));
+        assertEquals(emptyConfig.getPayload().toString(), res.getPayload().toString());
         assertEquals(0, cache.size());
 
         // Put a version of the same config into backend with new generation and see that it now works (i.e. we are
@@ -197,7 +195,7 @@ public class ProxyServerTest {
         // Verify that we get the config now and that it is cached
         res = proxy.resolveConfig(tester.createRequest(fooConfig));
         assertNotNull(res.getPayload().getData());
-        assertThat(res.getPayload().toString(), is(ConfigTester.fooPayload.toString()));
+        assertEquals(ConfigTester.fooPayload.toString(), res.getPayload().toString());
         assertEquals(1, cache.size());
     }
 
@@ -206,7 +204,7 @@ public class ProxyServerTest {
         ConfigTester tester = new ConfigTester();
         RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig));
         assertNotNull(res);
-        assertThat(res.getPayload().toString(), is(ConfigTester.fooPayload.toString()));
+        assertEquals(ConfigTester.fooPayload.toString(), res.getPayload().toString());
 
         // Simulate deployment, add config with new config generation
         long previousGeneration = res.getGeneration();
@@ -220,8 +218,8 @@ public class ProxyServerTest {
     @Test
     public void testReadingSystemProperties() {
         ProxyServer.Properties properties = ProxyServer.getSystemProperties();
-        assertThat(properties.configSources.length, is(1));
-        assertThat(properties.configSources[0], is(ProxyServer.DEFAULT_PROXY_CONFIG_SOURCES));
+        assertEquals(1, properties.configSources.length);
+        assertEquals(ProxyServer.DEFAULT_PROXY_CONFIG_SOURCES, properties.configSources[0]);
     }
 
     private static ProxyServer createTestServer(ConfigSourceSet source, ConfigSourceClient configSourceClient) {