Cleaned up AbstractFilterableTest to better match JUnit5 (#3086)

Author: JWT007

log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java

@@ -18,16 +18,16 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.Filter;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class AbstractFilterableTest {
+class AbstractFilterableTest {
 
     MockedAbstractFilterable filterable;
 
@@ -37,15 +37,15 @@ public void setup() {
     }
 
     @Test
-    public void testAddSimpleFilter() throws Exception {
+    void testAddSimpleFilter() {
         final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null);
 
         filterable.addFilter(filter);
         assertSame(filter, filterable.getFilter());
     }
 
     @Test
-    public void testAddMultipleSimpleFilters() throws Exception {
+    void testAddMultipleSimpleFilters() {
         final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null);
 
         filterable.addFilter(filter);
@@ -58,7 +58,7 @@ public void testAddMultipleSimpleFilters() throws Exception {
     }
 
     @Test
-    public void testAddMultipleEqualSimpleFilter() throws Exception {
+    void testAddMultipleEqualSimpleFilter() {
         final Filter filter = new EqualFilter("test");
 
         filterable.addFilter(filter);
@@ -71,7 +71,7 @@ public void testAddMultipleEqualSimpleFilter() throws Exception {
     }
 
     @Test
-    public void testAddCompositeFilter() throws Exception {
+    void testAddCompositeFilter() {
         final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2});
@@ -81,7 +81,7 @@ public void testAddCompositeFilter() throws Exception {
     }
 
     @Test
-    public void testAddMultipleCompositeFilters() throws Exception {
+    void testAddMultipleCompositeFilters() {
         final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter filter3 = ThresholdFilter.createFilter(Level.ERROR, null, null);
@@ -97,7 +97,7 @@ public void testAddMultipleCompositeFilters() throws Exception {
     }
 
     @Test
-    public void testAddSimpleFilterAndCompositeFilter() throws Exception {
+    void testAddSimpleFilterAndCompositeFilter() {
         final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter notInCompositeFilterFilter = ThresholdFilter.createFilter(Level.ERROR, null, null);
@@ -113,7 +113,7 @@ public void testAddSimpleFilterAndCompositeFilter() throws Exception {
     }
 
     @Test
-    public void testAddCompositeFilterAndSimpleFilter() throws Exception {
+    void testAddCompositeFilterAndSimpleFilter() {
         final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter notInCompositeFilterFilter = ThresholdFilter.createFilter(Level.ERROR, null, null);
@@ -129,7 +129,7 @@ public void testAddCompositeFilterAndSimpleFilter() throws Exception {
     }
 
     @Test
-    public void testRemoveSimpleFilterFromSimpleFilter() throws Exception {
+    void testRemoveSimpleFilterFromSimpleFilter() {
         final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null);
 
         filterable.addFilter(filter);
@@ -138,7 +138,7 @@ public void testRemoveSimpleFilterFromSimpleFilter() throws Exception {
     }
 
     @Test
-    public void testRemoveSimpleEqualFilterFromSimpleFilter() throws Exception {
+    void testRemoveSimpleEqualFilterFromSimpleFilter() {
         final Filter filterOriginal = new EqualFilter("test");
         final Filter filterCopy = new EqualFilter("test");
 
@@ -148,7 +148,7 @@ public void testRemoveSimpleEqualFilterFromSimpleFilter() throws Exception {
     }
 
     @Test
-    public void testRemoveSimpleEqualFilterFromTwoSimpleFilters() throws Exception {
+    void testRemoveSimpleEqualFilterFromTwoSimpleFilters() {
         final Filter filterOriginal = new EqualFilter("test");
         final Filter filterCopy = new EqualFilter("test");
 
@@ -161,7 +161,7 @@ public void testRemoveSimpleEqualFilterFromTwoSimpleFilters() throws Exception {
     }
 
     @Test
-    public void testRemoveSimpleEqualFilterFromMultipleSimpleFilters() throws Exception {
+    void testRemoveSimpleEqualFilterFromMultipleSimpleFilters() {
         final Filter filterOriginal = new EqualFilter("test");
         final Filter filterCopy = new EqualFilter("test");
 
@@ -178,7 +178,7 @@ public void testRemoveSimpleEqualFilterFromMultipleSimpleFilters() throws Except
     }
 
     @Test
-    public void testRemoveNullFromSingleSimpleFilter() throws Exception {
+    void testRemoveNullFromSingleSimpleFilter() {
         final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null);
 
         filterable.addFilter(filter);
@@ -187,7 +187,7 @@ public void testRemoveNullFromSingleSimpleFilter() throws Exception {
     }
 
     @Test
-    public void testRemoveNonExistingFilterFromSingleSimpleFilter() throws Exception {
+    void testRemoveNonExistingFilterFromSingleSimpleFilter() {
         final Filter filter = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter newFilter = ThresholdFilter.createFilter(Level.WARN, null, null);
 
@@ -197,7 +197,7 @@ public void testRemoveNonExistingFilterFromSingleSimpleFilter() throws Exception
     }
 
     @Test
-    public void testRemoveSimpleFilterFromCompositeFilter() {
+    void testRemoveSimpleFilterFromCompositeFilter() {
         final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2});
@@ -212,7 +212,7 @@ public void testRemoveSimpleFilterFromCompositeFilter() {
     }
 
     @Test
-    public void testRemoveSimpleFilterFromCompositeAndSimpleFilter() {
+    void testRemoveSimpleFilterFromCompositeAndSimpleFilter() {
         final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2});
@@ -228,7 +228,7 @@ public void testRemoveSimpleFilterFromCompositeAndSimpleFilter() {
     }
 
     @Test
-    public void testRemoveCompositeFilterFromCompositeFilter() {
+    void testRemoveCompositeFilterFromCompositeFilter() {
         final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2});
@@ -239,7 +239,7 @@ public void testRemoveCompositeFilterFromCompositeFilter() {
     }
 
     @Test
-    public void testRemoveFiltersFromComposite() {
+    void testRemoveFiltersFromComposite() {
         final Filter filter1 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter filter2 = ThresholdFilter.createFilter(Level.ERROR, null, null);
         final Filter compositeFilter = CompositeFilter.createFilters(new Filter[] {filter1, filter2});