update Mockito version to 4.3.0, make sure tests pass under Java 18, …

…other minor costmetic changes Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Jan 31, 2022 · 0a83e1a · 0a83e1a
1 parent e89a08e
commit 0a83e1a
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 39 deletions.
diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java
@@ -37,6 +37,7 @@
 import ch.qos.logback.core.net.SyslogConstants;
 import ch.qos.logback.core.pattern.DynamicConverter;
 import ch.qos.logback.core.pattern.FormatInfo;
+import ch.qos.logback.core.util.EnvUtil;
 
 public class ConverterTest {
 
@@ -74,7 +75,7 @@ public void testLineOfCaller() {
             StringBuilder buf = new StringBuilder();
             converter.write(buf, le);
             // the number below should be the line number of the previous line
-            assertEquals("75", buf.toString());
+            assertEquals("76", buf.toString());
         }
     }
 
@@ -305,15 +306,26 @@ public void testCallerData() {
         {
             DynamicConverter<ILoggingEvent> converter = new CallerDataConverter();
             this.optionList.clear();
-            this.optionList.add("4..5");
+
+            boolean jdk18 = EnvUtil.isJDK18OrHigher();
+            // jdk 18EA creates a different stack trace
+            if(jdk18) {
+               this.optionList.add("2..3");
+            } else {
+                this.optionList.add("4..5");
+            }
             converter.setOptionList(this.optionList);
             converter.start();
 
             StringBuilder buf = new StringBuilder();
             converter.write(buf, le);
             assertTrue("buf is too short", buf.length() >= 10);
 
-            String expectedRegex = "Caller\\+4\t at (java.base\\/)?java.lang.reflect.Method.invoke.*$";
+            String expectedRegex = "Caller\\+4";
+            if(jdk18) {
+                expectedRegex = "Caller\\+2";
+            }
+            expectedRegex+="\t at (java.base\\/)?java.lang.reflect.Method.invoke.*$";
             String actual = buf.toString();
             assertTrue("actual: " + actual, Pattern.compile(expectedRegex).matcher(actual).find());
 

diff --git a/logback-core/src/main/java/ch/qos/logback/core/model/processor/AppenderModelHandler.java b/logback-core/src/main/java/ch/qos/logback/core/model/processor/AppenderModelHandler.java
@@ -56,14 +56,6 @@ public void handle(ModelInterpretationContext mic, Model model) throws ModelHand
             return;
         }
 
-//		//this.appenderAttachable = appenderRefBag.get(appenderName);
-//		
-//		if(this.appenderAttachable == null) {
-//			addWarn("Appender named ["+appenderName+"] not referenced. Skipping further processing.");
-//			skipped = true;
-//			return;
-//		}
-
         addInfo("Processing appender named [" + appenderName + "]");
 
         String originalClassName = appenderModel.getClassName();
@@ -104,8 +96,6 @@ public void postHandle(ModelInterpretationContext mic, Model model) throws Model
             addWarn("The object at the of the stack is not the appender named [" + appender.getName()
                     + "] pushed earlier.");
         } else {
-//        	addInfo("Attaching appender ["+appender.getName()+"] to "+appenderAttachable);
-//        	appenderAttachable.addAppender(appender);
             mic.popObject();
         }
 

diff --git a/...ck-core/src/main/java/ch/qos/logback/core/model/processor/ModelInterpretationContext.java b/...ck-core/src/main/java/ch/qos/logback/core/model/processor/ModelInterpretationContext.java
@@ -177,7 +177,7 @@ public List<DependencyDefinition> getDependencyDefinitions() {
         return Collections.unmodifiableList(dependencyDefinitionList);
     }
 
-    List<String> getDependencyNamesForModel(Model model) {
+    public List<String> getDependencyNamesForModel(Model model) {
         for (DependencyDefinition dd : dependencyDefinitionList) {
             if (dd.getDependee() == model) {
                 return Collections.unmodifiableList(dd.dependenciesList);
@@ -198,30 +198,8 @@ public boolean hasDependencies(String name) {
         }
 
         return false;
-
-//        Collection<List<String>> nameLists = dependenciesMap.values();
-//        if (nameLists == null || nameLists.isEmpty())
-//            return false;
-//
-//        for (List<String> aList : nameLists) {
-//            if (aList.contains(name))
-//                return true;
-//        }
-//        return false;
     }
 
-//    public void addDependency(Model model, String ref) {
-//        List<String> refList = dependenciesMap.get(model);
-//        if (refList == null) {
-//            refList = new ArrayList<>();
-//        }
-//        refList.add(ref);
-//        dependenciesMap.put(model, refList);
-//    }
-//
-//    public List<String> getDependencies(Model model) {
-//        return dependenciesMap.get(model);
-//    }
 
     public void markStartOfNamedDependency(String name) {
         startedDependencies.add(name);

diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/EnvUtil.java b/logback-core/src/main/java/ch/qos/logback/core/util/EnvUtil.java
@@ -61,6 +61,10 @@ static public boolean isJDK16OrHigher() {
         return isJDK_N_OrHigher(16);
     }
 
+    static public boolean isJDK18OrHigher() {
+        return isJDK_N_OrHigher(18);
+    }
+
     static public boolean isJaninoAvailable() {
         ClassLoader classLoader = EnvUtil.class.getClassLoader();
         try {

diff --git a/...ack-core/src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderIntegrationTest.java b/...ack-core/src/test/java/ch/qos/logback/core/net/AbstractSocketAppenderIntegrationTest.java
@@ -16,7 +16,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.timeout;

diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html
@@ -36,13 +36,20 @@ <h2>Logback News</h2>
     
     <h3>, Release of version 1.3.0-alpha13</h3>
 
+    <p>&bull;&nbsp; Once the <code>Model</code> is created from XML
+    confifuration file, <code>Model</code> processing is now
+    independent of any XML related code.  This
+    fixes <a href="https://jira.qos.ch/browse/LOGBACK-1613">LOGBACK-1613</a>.
+    </p>
+
+
     <p>&bull;&nbsp; Fixed incorrect <code>String</code> cast in
     <code>JNDIUtil</code>. This corrects <a
     href="https://jira.qos.ch/browse/LOGBACK-1604">LOGBACK-1604</a>
     reported by Chris Cheshire.</p>
 
     <p>&bull;&nbsp; In <code>SMTPAppenderBase</code> empty username
-    parameter is now treatede the same <code>null</code>. This fixes
+    parameter is now treated same as <code>null</code>. This fixes
     <a href="https://jira.qos.ch/browse/LOGBACK-1594">LOGBACK-1594</a>
     reported by Mark Woon who also provided the relevant PR.</p>
 

diff --git a/pom.xml b/pom.xml
@@ -242,7 +242,7 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>3.11.2</version>
+        <version>4.3.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>