-
Notifications
You must be signed in to change notification settings - Fork 676
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Refactored the functionality into a TestRule, and moved from STCJ4 up to SolrTestCase. Move reinstatement of the root log level to shutdown()
- Loading branch information
Showing
7 changed files
with
126 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
solr/test-framework/src/java/org/apache/solr/util/LogLevelTestRule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.solr.util; | ||
|
|
||
| import java.lang.annotation.Annotation; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import org.apache.logging.log4j.Level; | ||
| import org.apache.solr.common.util.SuppressForbidden; | ||
| import org.junit.rules.TestRule; | ||
| import org.junit.runner.Description; | ||
| import org.junit.runners.model.Statement; | ||
|
|
||
| /** | ||
| * A JUnit {@link TestRule} that sets (and resets) the Log4j2 log level based on the {@code | ||
| * LogLevel} annotation. | ||
| */ | ||
| public class LogLevelTestRule implements TestRule { | ||
|
|
||
| @Override | ||
| public Statement apply(Statement base, Description description) { | ||
| // loop over the annotations to find LogLevel | ||
| final Optional<Annotation> annotationOpt = | ||
| description.getAnnotations().stream() | ||
| .filter(a -> a.annotationType().equals(LogLevel.class)) | ||
| .findAny(); | ||
| if (annotationOpt.isEmpty()) { | ||
| return base; | ||
| } | ||
| final var annotation = (LogLevel) annotationOpt.get(); | ||
| return new LogLevelStatement(base, annotation); | ||
| } | ||
|
|
||
| static class LogLevelStatement extends Statement { | ||
| private final Statement delegate; | ||
| private final LogLevel annotation; | ||
|
|
||
| protected LogLevelStatement(Statement delegate, LogLevel annotation) { | ||
| this.delegate = delegate; | ||
| this.annotation = annotation; | ||
| } | ||
|
|
||
| @SuppressForbidden(reason = "Using the Level class from log4j2 directly") | ||
| @Override | ||
| public void evaluate() throws Throwable { | ||
| Map<String, Level> savedLogLevels = LogLevel.Configurer.setLevels(annotation.value()); | ||
| try { | ||
| delegate.evaluate(); | ||
| } finally { | ||
| LogLevel.Configurer.restoreLogLevels(savedLogLevels); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters