Skip to content

Commit d289be3

Browse files
committed
Fix RegexFilterTest (apache#3086)
1 parent 20d541f commit d289be3

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

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

+2-8
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939

4040
public class RegexFilterTest {
4141
@BeforeAll
42-
public static void before() {
43-
StatusLogger.getLogger().setLevel(Level.OFF);
42+
static void before() {
43+
StatusLogger.getLogger().getFallbackListener().setLevel(Level.OFF);
4444
}
4545

4646
@Test
@@ -154,8 +154,6 @@ void testWithValidRegex() {
154154
.setOnMatch(Result.ACCEPT)
155155
.setOnMismatch(Result.DENY);
156156

157-
assertTrue(builder.isValid());
158-
159157
final RegexFilter filter = builder.build();
160158

161159
assertNotNull(filter);
@@ -197,8 +195,6 @@ void testBuilderWithoutRegexNotValid() {
197195

198196
final RegexFilter.Builder builder = RegexFilter.newBuilder();
199197

200-
assertFalse(builder.isValid());
201-
202198
assertNull(builder.build());
203199
}
204200

@@ -212,8 +208,6 @@ void testBuilderWithInvalidRegexNotValid() {
212208

213209
builder.setRegex("[a-z");
214210

215-
assertFalse(builder.isValid());
216-
217211
assertNull(builder.build());
218212
}
219213
}

log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java

+6
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,12 @@ public Builder setUseRawMsg(final boolean useRawMsg) {
307307
return this;
308308
}
309309

310+
/** {@inheritDoc} */
311+
@Override
312+
public boolean isValid() {
313+
return (Strings.isNotEmpty(this.regex));
314+
}
315+
310316
/**
311317
* Builds and returns a {@link RegexFilter} instance configured by this builder.
312318
*

0 commit comments

Comments
 (0)