Simnplify testing by sticking to assertEquals/True/False

1 files changed, 8 insertions, 6 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 40c66e115e4..b45fc037ca8 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
@@ -11,6 +11,8 @@ import com.yahoo.jdisc.http.filter.ResponseFilter;
 import com.yahoo.jdisc.http.server.jetty.FilterBindings;
 import org.junit.Test;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
@@ -39,9 +41,9 @@ public class FilterBindingsProviderTest {
 
         final FilterBindings filterBindings = provider.get();
 
-        assertThat(filterBindings).isNotNull();
-        assertThat(filterBindings.requestFilterIds()).isEmpty();
-        assertThat(filterBindings.responseFilterIds()).isEmpty();
+        assertNotNull(filterBindings);
+        assertTrue(filterBindings.requestFilterIds().isEmpty());
+        assertTrue(filterBindings.responseFilterIds().isEmpty());
     }
 
     @Test
@@ -92,7 +94,7 @@ public class FilterBindingsProviderTest {
         final FilterBindings filterBindings = provider.get();
 
         // Verify.
-        assertThat(filterBindings).isNotNull();
+        assertNotNull(filterBindings);
         assertThat(filterBindings.requestFilters())
                 .containsExactlyInAnyOrder(requestFilter1Instance, requestFilter2Instance);
         assertThat(filterBindings.responseFilters())
@@ -127,7 +129,7 @@ public class FilterBindingsProviderTest {
                     new ComponentRegistry<>());
             fail("Dual-role filter should not be accepted");
         } catch (RuntimeException e) {
-            assertThat(e.getMessage()).contains("Invalid config");
+            assertTrue(e.getMessage().contains("Invalid config"));
         }
     }
 
@@ -152,7 +154,7 @@ public class FilterBindingsProviderTest {
                     new ComponentRegistry<>());
             fail("Config with unknown filter reference should not be accepted");
         } catch (RuntimeException e) {
-            assertThat(e.getMessage()).contains("Invalid config");
+            assertTrue(e.getMessage().contains("Invalid config"));
         }
     }