Skip to content

Commit 33dfec3

Browse files
committed
Fix RegexFilterTest (#3086)
1 parent 4439b08 commit 33dfec3

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
class RegexFilterTest {
4141
@BeforeAll
4242
static void before() {
43-
StatusLogger.getLogger().setLevel(Level.OFF);
43+
StatusLogger.getLogger().getFallbackListener().setLevel(Level.OFF);
4444
}
4545

4646
@Test
@@ -152,8 +152,6 @@ void testWithValidRegex() {
152152
.setOnMatch(Result.ACCEPT)
153153
.setOnMismatch(Result.DENY);
154154

155-
assertTrue(builder.isValid());
156-
157155
final RegexFilter filter = builder.build();
158156

159157
assertNotNull(filter);
@@ -195,8 +193,6 @@ void testBuilderWithoutRegexNotValid() {
195193

196194
final RegexFilter.Builder builder = RegexFilter.newBuilder();
197195

198-
assertFalse(builder.isValid());
199-
200196
assertNull(builder.build());
201197
}
202198

@@ -210,8 +206,6 @@ void testBuilderWithInvalidRegexNotValid() {
210206

211207
builder.setRegex("[a-z");
212208

213-
assertFalse(builder.isValid());
214-
215209
assertNull(builder.build());
216210
}
217211
}

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

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

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

0 commit comments

Comments
 (0)