You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2019/06/12 14:27:33 UTC
[sling-whiteboard] 10/11: Use a per-test-method instance of the
mock server.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit b9fcb9a461e9144743ac1cd39a83ab6da34c7a81
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Jun 12 16:21:57 2019 +0200
Use a per-test-method instance of the mock server.
---
.../org/apache/sling/uca/impl/MisbehavingServerExtension.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/url-connection-agent/src/test/java/org/apache/sling/uca/impl/MisbehavingServerExtension.java b/url-connection-agent/src/test/java/org/apache/sling/uca/impl/MisbehavingServerExtension.java
index 601adfd..b659451 100644
--- a/url-connection-agent/src/test/java/org/apache/sling/uca/impl/MisbehavingServerExtension.java
+++ b/url-connection-agent/src/test/java/org/apache/sling/uca/impl/MisbehavingServerExtension.java
@@ -28,8 +28,8 @@ import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.ParameterContext;
import org.junit.jupiter.api.extension.ParameterResolutionException;
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
* will be resolved.</p>
*
*/
-class MisbehavingServerExtension implements BeforeAllCallback, AfterAllCallback, ParameterResolver, MisbehavingServerControl {
+class MisbehavingServerExtension implements BeforeEachCallback, AfterEachCallback, ParameterResolver, MisbehavingServerControl {
private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -70,7 +70,7 @@ class MisbehavingServerExtension implements BeforeAllCallback, AfterAllCallback,
}
@Override
- public void beforeAll(ExtensionContext context) throws Exception {
+ public void beforeEach(ExtensionContext context) throws Exception {
server = new Server();
ServerConnector connector = new ServerConnector(server) {
@@ -104,7 +104,7 @@ class MisbehavingServerExtension implements BeforeAllCallback, AfterAllCallback,
}
@Override
- public void afterAll(ExtensionContext context) throws Exception {
+ public void afterEach(ExtensionContext context) throws Exception {
if ( server == null )
return;
try {