From 19fcb232f75fbfbb878e34847fdc7edf6a4aa453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Haarla=CC=88nder?= Date: Mon, 20 Nov 2023 15:58:57 +0100 Subject: [PATCH] Shutdown test container --- .../test/integration/MyTestContainerFactory.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/test/java/de/mpg/imeji/test/rest/resources/test/integration/MyTestContainerFactory.java b/src/test/java/de/mpg/imeji/test/rest/resources/test/integration/MyTestContainerFactory.java index 5d9f32d82..c788e5e30 100644 --- a/src/test/java/de/mpg/imeji/test/rest/resources/test/integration/MyTestContainerFactory.java +++ b/src/test/java/de/mpg/imeji/test/rest/resources/test/integration/MyTestContainerFactory.java @@ -3,6 +3,8 @@ import java.io.IOException; import java.net.URI; import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.servlet.Servlet; import javax.ws.rs.ProcessingException; @@ -15,6 +17,7 @@ import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; import org.glassfish.jersey.servlet.ServletContainer; import org.glassfish.jersey.test.DeploymentContext; +import org.glassfish.jersey.test.grizzly.GrizzlyTestContainerFactory; import org.glassfish.jersey.test.spi.TestContainer; import org.glassfish.jersey.test.spi.TestContainerException; import org.glassfish.jersey.test.spi.TestContainerFactory; @@ -31,6 +34,8 @@ */ public class MyTestContainerFactory implements TestContainerFactory { + private static final Logger LOGGER = Logger.getLogger(MyTestContainerFactory.class.getName()); + public static final String REST_CONTEXT_PATH = "/rest"; public static final String STATIC_CONTEXT_PATH = "/static"; public static final String STATIC_CONTEXT_STORAGE = "src/test/resources/storage"; @@ -67,7 +72,13 @@ public void start() { @Override public void stop() { - this.server.shutdownNow(); + if (this.server.isStarted()) { + LOGGER.log(Level.FINE, "Stopping GrizzlyTestContainer..."); + this.server.shutdownNow(); + } else { + LOGGER.log(Level.WARNING, "Ignoring stop request - GrizzlyTestContainer is already stopped."); + } + } };