This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new 129b48c81d Fix tests checking LifeCycle#stop()
129b48c81d is described below
commit 129b48c81df9fe55aedf634b83b908c869b89929
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Wed Jun 22 21:55:29 2022 +0200
Fix tests checking LifeCycle#stop()
After the merge between `LifeCycle` and `LifeCycle2` some tests broke.
---
.../log4j/web/Log4jServletContextListener.java | 4 ++--
.../web/Log4jShutdownOnContextDestroyedListener.java | 4 ++--
.../log4j/web/Log4jServletContextListenerTest.java | 19 +++++++++++--------
.../Log4jShutdownOnContextDestroyedListenerTest.java | 12 +++++++-----
.../log4j/web/Log4jServletContextListener.java | 4 ++--
.../web/Log4jShutdownOnContextDestroyedListener.java | 4 ++--
.../log4j/web/Log4jServletContextListenerTest.java | 17 ++++++++++-------
.../Log4jShutdownOnContextDestroyedListenerTest.java | 8 +++++---
8 files changed, 41 insertions(+), 31 deletions(-)
diff --git
a/log4j-jakarta-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
b/log4j-jakarta-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
index bf0d364f4e..9a46b74c7f 100644
---
a/log4j-jakarta-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
+++
b/log4j-jakarta-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
@@ -33,8 +33,8 @@ import java.util.concurrent.TimeUnit;
*/
public class Log4jServletContextListener implements ServletContextListener {
- private static final int DEFAULT_STOP_TIMEOUT = 30;
- private static final TimeUnit DEFAULT_STOP_TIMEOUT_TIMEUNIT =
TimeUnit.SECONDS;
+ static final int DEFAULT_STOP_TIMEOUT = 30;
+ static final TimeUnit DEFAULT_STOP_TIMEOUT_TIMEUNIT = TimeUnit.SECONDS;
private static final String KEY_STOP_TIMEOUT = "log4j.stop.timeout";
private static final String KEY_STOP_TIMEOUT_TIMEUNIT =
"log4j.stop.timeout.timeunit";
diff --git
a/log4j-jakarta-web/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java
b/log4j-jakarta-web/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java
index 90bb027f9e..28f7f32f07 100644
---
a/log4j-jakarta-web/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java
+++
b/log4j-jakarta-web/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java
@@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit;
public class Log4jShutdownOnContextDestroyedListener implements
ServletContextListener {
- private static final int DEFAULT_STOP_TIMEOUT = 30;
- private static final TimeUnit DEFAULT_STOP_TIMEOUT_TIMEUNIT =
TimeUnit.SECONDS;
+ static final int DEFAULT_STOP_TIMEOUT = 30;
+ static final TimeUnit DEFAULT_STOP_TIMEOUT_TIMEUNIT = TimeUnit.SECONDS;
private static final String KEY_STOP_TIMEOUT = "log4j.stop.timeout";
private static final String KEY_STOP_TIMEOUT_TIMEUNIT =
"log4j.stop.timeout.timeunit";
diff --git
a/log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java
b/log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java
index bfdae99f3f..fc1e6ecdf6 100644
---
a/log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java
+++
b/log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java
@@ -16,8 +16,14 @@
*/
package org.apache.logging.log4j.web;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletContextEvent;
+import static
org.apache.logging.log4j.web.Log4jServletContextListener.DEFAULT_STOP_TIMEOUT;
+import static
org.apache.logging.log4j.web.Log4jServletContextListener.DEFAULT_STOP_TIMEOUT_TIMEUNIT;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.then;
+import static org.mockito.BDDMockito.willThrow;
import org.apache.logging.log4j.util.Strings;
import org.junit.jupiter.api.BeforeEach;
@@ -26,11 +32,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.BDDMockito.eq;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.then;
-import static org.mockito.BDDMockito.willThrow;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
@ExtendWith(MockitoExtension.class)
public class Log4jServletContextListenerTest {
@@ -63,7 +66,7 @@ public class Log4jServletContextListenerTest {
this.listener.contextDestroyed(this.event);
then(initializer).should().clearLoggerContext();
- then(initializer).should().stop();
+ then(initializer).should().stop(DEFAULT_STOP_TIMEOUT,
DEFAULT_STOP_TIMEOUT_TIMEUNIT);
}
@Test
diff --git
a/log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java
b/log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java
index 76c5de3812..278f7becc4 100644
---
a/log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java
+++
b/log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.logging.log4j.web;
-import static org.junit.jupiter.api.Assertions.*;
+import static
org.apache.logging.log4j.web.Log4jShutdownOnContextDestroyedListener.DEFAULT_STOP_TIMEOUT;
+import static
org.apache.logging.log4j.web.Log4jShutdownOnContextDestroyedListener.DEFAULT_STOP_TIMEOUT_TIMEUNIT;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.then;
import static org.mockito.Mockito.never;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletContextEvent;
-
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+
@ExtendWith(MockitoExtension.class)
public class Log4jShutdownOnContextDestroyedListenerTest {
@Mock(lenient = true)
@@ -60,7 +62,7 @@ public class Log4jShutdownOnContextDestroyedListenerTest {
this.listener.contextDestroyed(this.event);
then(initializer).should().clearLoggerContext();
- then(initializer).should().stop();
+ then(initializer).should().stop(DEFAULT_STOP_TIMEOUT,
DEFAULT_STOP_TIMEOUT_TIMEUNIT);
}
@Test
diff --git
a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
index d27b5896d2..c3c4ed4aea 100644
---
a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
+++
b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
@@ -33,8 +33,8 @@ import java.util.concurrent.TimeUnit;
*/
public class Log4jServletContextListener implements ServletContextListener {
- private static final int DEFAULT_STOP_TIMEOUT = 30;
- private static final TimeUnit DEFAULT_STOP_TIMEOUT_TIMEUNIT =
TimeUnit.SECONDS;
+ static final int DEFAULT_STOP_TIMEOUT = 30;
+ static final TimeUnit DEFAULT_STOP_TIMEOUT_TIMEUNIT = TimeUnit.SECONDS;
private static final String KEY_STOP_TIMEOUT = "log4j.stop.timeout";
private static final String KEY_STOP_TIMEOUT_TIMEUNIT =
"log4j.stop.timeout.timeunit";
diff --git
a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java
b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java
index 75160fd263..99c617fadc 100644
---
a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java
+++
b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListener.java
@@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit;
public class Log4jShutdownOnContextDestroyedListener implements
ServletContextListener {
- private static final int DEFAULT_STOP_TIMEOUT = 30;
- private static final TimeUnit DEFAULT_STOP_TIMEOUT_TIMEUNIT =
TimeUnit.SECONDS;
+ static final int DEFAULT_STOP_TIMEOUT = 30;
+ static final TimeUnit DEFAULT_STOP_TIMEOUT_TIMEUNIT = TimeUnit.SECONDS;
private static final String KEY_STOP_TIMEOUT = "log4j.stop.timeout";
private static final String KEY_STOP_TIMEOUT_TIMEUNIT =
"log4j.stop.timeout.timeunit";
diff --git
a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java
b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java
index ec74bf5ab1..67d7d36194 100644
---
a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java
+++
b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContextListenerTest.java
@@ -16,6 +16,15 @@
*/
package org.apache.logging.log4j.web;
+import static
org.apache.logging.log4j.web.Log4jServletContextListener.DEFAULT_STOP_TIMEOUT;
+import static
org.apache.logging.log4j.web.Log4jServletContextListener.DEFAULT_STOP_TIMEOUT_TIMEUNIT;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.then;
+import static org.mockito.BDDMockito.willThrow;
+
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
@@ -26,12 +35,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.BDDMockito.eq;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.then;
-import static org.mockito.BDDMockito.willThrow;
-
@ExtendWith(MockitoExtension.class)
public class Log4jServletContextListenerTest {
/* event and servletContext are marked lenient because they aren't used
in the
@@ -63,7 +66,7 @@ public class Log4jServletContextListenerTest {
this.listener.contextDestroyed(this.event);
then(initializer).should().clearLoggerContext();
- then(initializer).should().stop();
+ then(initializer).should().stop(DEFAULT_STOP_TIMEOUT,
DEFAULT_STOP_TIMEOUT_TIMEUNIT);
}
@Test
diff --git
a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java
b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java
index f6eec6f52f..7e4d2a180e 100644
---
a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java
+++
b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jShutdownOnContextDestroyedListenerTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.logging.log4j.web;
-import static org.junit.jupiter.api.Assertions.*;
+import static
org.apache.logging.log4j.web.Log4jShutdownOnContextDestroyedListener.DEFAULT_STOP_TIMEOUT;
+import static
org.apache.logging.log4j.web.Log4jShutdownOnContextDestroyedListener.DEFAULT_STOP_TIMEOUT_TIMEUNIT;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.then;
import static org.mockito.Mockito.never;
@@ -60,7 +62,7 @@ public class Log4jShutdownOnContextDestroyedListenerTest {
this.listener.contextDestroyed(this.event);
then(initializer).should().clearLoggerContext();
- then(initializer).should().stop();
+ then(initializer).should().stop(DEFAULT_STOP_TIMEOUT,
DEFAULT_STOP_TIMEOUT_TIMEUNIT);
}
@Test
@@ -69,7 +71,7 @@ public class Log4jShutdownOnContextDestroyedListenerTest {
this.listener.contextDestroyed(this.event);
then(initializer).should(never()).clearLoggerContext();
- then(initializer).should(never()).stop();
+ then(initializer).should(never()).stop(DEFAULT_STOP_TIMEOUT,
DEFAULT_STOP_TIMEOUT_TIMEUNIT);
}
@Test
