[lucene-solr] branch reference_impl_dev updated: @559 Little cleanup.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/reference_impl_dev by this push:
     new 5ae2c48  @559 Little cleanup.
5ae2c48 is described below

commit 5ae2c48a54c1534b0b124e3c74a9faefc3cf2718
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Aug 16 21:17:20 2020 -0500

    @559 Little cleanup.
---
 .../apache/lucene/analysis/synonym/synonyms.txt    | 18 ++++++------
 .../solr/handler/admin/LoggingHandlerTest.java     | 23 +++++++++++++++
 .../org/apache/solr/TestLogLevelAnnotations.java   | 33 +++++++++++-----------
 3 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/synonyms.txt b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/synonyms.txt
index b0e31cb..436964a 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/synonyms.txt
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/synonyms.txt
@@ -12,20 +12,18 @@
 
 #-----------------------------------------------------------------------
 #some test synonym mappings unlikely to appear in real input text
-aaa => aaaa
-bbb => bbbb1 bbbb2
-ccc => cccc1,cccc2
-a\=>a => b\=>b
-a\,a => b\,b
-fooaaa,baraaa,bazaaa
+#aaafoo => aaabar
+#bbbfoo => bbbfoo bbbbar
+#cccfoo => cccbar cccbaz
+#fooaaa,baraaa,bazaaa
 
 # Some synonym groups specific to this example
-GB,gib,gigabyte,gigabytes
-MB,mib,megabyte,megabytes
-Television, Televisions, TV, TVs
+ #GB,gib,gigabyte,gigabytes
+#MB,mib,megabyte,megabytes
+#Television, Televisions, TV, TVs
 #notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming
 #after us won't split it into two words.
 
 # Synonym mappings can be used for spelling correction too
-pixima => pixma
+#pixima => pixma
 
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/LoggingHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/LoggingHandlerTest.java
index 4b76ab3..82405ef 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/LoggingHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/LoggingHandlerTest.java
@@ -27,10 +27,13 @@ import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.util.SuppressForbidden;
 import org.apache.solr.util.LogLevel;
 import org.apache.solr.util.StartupLoggingUtils;
+import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -67,6 +70,26 @@ public class LoggingHandlerTest extends SolrTestCaseJ4 {
     StartupLoggingUtils.changeLogLevel(initialRootLogLevel);
   }
 
+  private Map<String, Level> savedMethodLogLevels = new HashMap<>();
+
+  @Before
+  public void initMethodLogLevels() {
+    Method method = RandomizedContext.current().getTargetMethod();
+    LogLevel annotation = method.getAnnotation(LogLevel.class);
+    if (annotation == null) {
+      return;
+    }
+    Map<String,Level> previousLevels = LogLevel.Configurer
+        .setLevels(annotation.value());
+    savedMethodLogLevels.putAll(previousLevels);
+  }
+
+  @After
+  public void restoreMethodLogLevels() {
+    LogLevel.Configurer.restoreLogLevels(savedMethodLogLevels);
+    savedMethodLogLevels.clear();
+  }
+
   @Test
   public void testLogLevelHandlerOutput() throws Exception {
     
diff --git a/solr/test-framework/src/test/org/apache/solr/TestLogLevelAnnotations.java b/solr/test-framework/src/test/org/apache/solr/TestLogLevelAnnotations.java
index 2f57efe..e0be88c 100644
--- a/solr/test-framework/src/test/org/apache/solr/TestLogLevelAnnotations.java
+++ b/solr/test-framework/src/test/org/apache/solr/TestLogLevelAnnotations.java
@@ -136,24 +136,25 @@ public class TestLogLevelAnnotations extends SolrTestCaseJ4 {
     StartupLoggingUtils.changeLogLevel(initialRootLogLevel);
   }
 
-    private Map<String, Level> savedMethodLogLevels = new HashMap<>();
-
-    @Before
-    public void initMethodLogLevels() {
-      Method method = RandomizedContext.current().getTargetMethod();
-      LogLevel annotation = method.getAnnotation(LogLevel.class);
-      if (annotation == null) {
-        return;
-      }
-      Map<String, Level> previousLevels = LogLevel.Configurer.setLevels(annotation.value());
-      savedMethodLogLevels.putAll(previousLevels);
-    }
+  private Map<String,Level> savedMethodLogLevels = new HashMap<>();
 
-    @After
-    public void restoreMethodLogLevels() {
-      LogLevel.Configurer.restoreLogLevels(savedMethodLogLevels);
-      savedMethodLogLevels.clear();
+  @Before
+  public void initMethodLogLevels() {
+    Method method = RandomizedContext.current().getTargetMethod();
+    LogLevel annotation = method.getAnnotation(LogLevel.class);
+    if (annotation == null) {
+      return;
     }
+    Map<String,Level> previousLevels = LogLevel.Configurer
+        .setLevels(annotation.value());
+    savedMethodLogLevels.putAll(previousLevels);
+  }
+
+  @After
+  public void restoreMethodLogLevels() {
+    LogLevel.Configurer.restoreLogLevels(savedMethodLogLevels);
+    savedMethodLogLevels.clear();
+  }
   
   public void testClassLogLevels() {
     assertEquals(DEFAULT_LOG_LEVEL, LogManager.getLogger("org.apache.solr.bogus_logger").getLevel());