Minor unification of tests.

2 files changed, 16 insertions, 19 deletions

diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java
index f9662dc9f98..e3039e88525 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/FilterBindingsProviderTest.java
@@ -10,8 +10,6 @@ import com.yahoo.jdisc.application.UriPattern;
 import com.yahoo.jdisc.http.ServerConfig;
 import com.yahoo.jdisc.http.filter.RequestFilter;
 import com.yahoo.jdisc.http.filter.ResponseFilter;
-import com.yahoo.jdisc.http.filter.SecurityRequestFilter;
-import com.yahoo.jdisc.http.filter.SecurityResponseFilter;
 import com.yahoo.jdisc.http.server.FilterBindings;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -23,11 +21,11 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 
@@ -54,9 +52,9 @@ public class FilterBindingsProviderTest {
 
         final FilterBindings filterBindings = provider.get();
 
-        assertThat(filterBindings, is(not(nullValue())));
-        assertThat(filterBindings.getRequestFilters().iterator().hasNext(), is(false));
-        assertThat(filterBindings.getResponseFilters().iterator().hasNext(), is(false));
+        assertNotNull(filterBindings);
+        assertFalse(filterBindings.getRequestFilters().iterator().hasNext());
+        assertFalse(filterBindings.getResponseFilters().iterator().hasNext());
     }
 
     @Test
@@ -93,21 +91,21 @@ public class FilterBindingsProviderTest {
                 new ChainsConfig(new ChainsConfig.Builder()),
                 availableRequestFilters,
                 availableResponseFilters,
-                new ComponentRegistry<SecurityRequestFilter>(),
-                new ComponentRegistry<SecurityResponseFilter>());
+                new ComponentRegistry<>(),
+                new ComponentRegistry<>());
 
         // Set up the provider that we aim to test.
         final FilterBindingsProvider provider = new FilterBindingsProvider(
                 new ComponentId("foo"),
                 new ServerConfig(configBuilder),
                 filterChainRepository,
-                new ComponentRegistry<SecurityRequestFilter>());
+                new ComponentRegistry<>());
 
         // Execute.
         final FilterBindings filterBindings = provider.get();
 
         // Verify.
-        assertThat(filterBindings, is(not(nullValue())));
+        assertNotNull(filterBindings);
         assertThat(
                 filterBindings.getRequestFilters(),
                 containsFilters(requestFilter1Instance, requestFilter2Instance));
@@ -150,7 +148,7 @@ public class FilterBindingsProviderTest {
                     new ComponentRegistry<>());
             fail("Dual-role filter should not be accepted");
         } catch (RuntimeException e) {
-            assertThat(e.getMessage(), containsString("Invalid config"));
+            assertTrue(e.getMessage().contains("Invalid config"));
         }
     }
 
@@ -175,7 +173,7 @@ public class FilterBindingsProviderTest {
                     new ComponentRegistry<>());
             fail("Config with unknown filter reference should not be accepted");
         } catch (RuntimeException e) {
-            assertThat(e.getMessage(), containsString("Invalid config"));
+            assertTrue(e.getMessage().contains("Invalid config"));
         }
     }
 
@@ -183,7 +181,7 @@ public class FilterBindingsProviderTest {
     @SuppressWarnings("varargs")
     private static <T> Matcher<? super BindingRepository<T>> containsFilters(
             final T... requiredInstances) {
-        return new TypeSafeMatcher<BindingRepository<T>>() {
+        return new TypeSafeMatcher<>() {
             private final Set<T> requiredFilterSet = new HashSet<>(Arrays.asList(requiredInstances));
 
             @Override
diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetricsTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetricsTest.java
index 6a669d9f7f9..33dd1dade2f 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetricsTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/metric/GarbageCollectionMetricsTest.java
@@ -9,8 +9,7 @@ import java.lang.management.ManagementFactory;
 import java.time.Duration;
 import java.util.LinkedList;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
@@ -29,7 +28,7 @@ public class GarbageCollectionMetricsTest {
 
         Duration interval = GarbageCollectionMetrics.REPORTING_INTERVAL;
         GarbageCollectionMetrics garbageCollectionMetrics = new GarbageCollectionMetrics(clock);
-        assertThat(garbageCollectionMetrics.getGcStatistics().keySet().size(), is(garbageCollectors));
+        assertEquals(garbageCollectors, garbageCollectionMetrics.getGcStatistics().keySet().size());
 
         clock.advance(interval.minus(Duration.ofMillis(10)));
         garbageCollectionMetrics.emitMetrics(metric);
@@ -52,7 +51,7 @@ public class GarbageCollectionMetricsTest {
 
     private static void assertWindowLengths(GarbageCollectionMetrics gcm, int count) {
         for(LinkedList<GarbageCollectionMetrics.GcStats> window: gcm.getGcStatistics().values()) {
-            assertThat(window.size(), is(count));
+            assertEquals(count, window.size());
         }
     }
 }