tests: remove shared instance variable

mjeanroy · Nov 27, 2023 · 12aa002 · 12aa002
1 parent 21d8bad
commit 12aa002
Show file tree

Hide file tree

Showing 4 changed files with 264 additions and 208 deletions.
diff --git a/...s-jetty-10/src/test/java/com/github/mjeanroy/junit/servers/jetty10/EmbeddedJettyTest.java b/...s-jetty-10/src/test/java/com/github/mjeanroy/junit/servers/jetty10/EmbeddedJettyTest.java
@@ -27,7 +27,6 @@
 import com.github.mjeanroy.junit.servers.jetty.EmbeddedJettyConfiguration;
 import com.github.mjeanroy.junit.servers.testing.HttpTestUtils.HttpResponse;
 import org.eclipse.jetty.webapp.WebAppContext;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
@@ -36,6 +35,7 @@
 import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.function.Consumer;
 
 import static com.github.mjeanroy.junit.servers.testing.HttpTestUtils.get;
 import static com.github.mjeanroy.junit.servers.testing.HttpTestUtils.localhost;
@@ -44,72 +44,67 @@
 
 class EmbeddedJettyTest {
 
-	private volatile EmbeddedJetty jetty;
-
-	@AfterEach
-	void tearDown() {
-		jetty.stop();
-	}
-
 	@Test
 	void it_should_start_jetty() {
-		jetty = new EmbeddedJetty();
+		EmbeddedJetty jetty = new EmbeddedJetty();
 		assertThat(jetty.getScheme()).isEqualTo("http");
 		assertThat(jetty.getHost()).isEqualTo("localhost");
 		assertThat(jetty.getPath()).isEqualTo("/");
 
-		jetty.start();
-		assertThat(jetty.isStarted()).isTrue();
-		assertThat(jetty.getPort()).isNotZero();
-		assertThat(jetty.getUrl()).isEqualTo(localhost(jetty.getPort()));
+		doRun(jetty, () -> {
+			assertThat(jetty.isStarted()).isTrue();
+			assertThat(jetty.getPort()).isNotZero();
+			assertThat(jetty.getUrl()).isEqualTo(localhost(jetty.getPort()));
 
-		// Since there is no webapp deployed, we should get a 404
-		HttpResponse rsp = get(jetty.getUrl());
-		assertThat(rsp.getStatusCode()).isEqualTo(404);
-		assertThat(rsp.getResponseBody()).isNotEmpty();
+			// Since there is no webapp deployed, we should get a 404
+			HttpResponse rsp = get(jetty.getUrl());
+			assertThat(rsp.getStatusCode()).isEqualTo(404);
+			assertThat(rsp.getResponseBody()).isNotEmpty();
+		});
 	}
 
 	@Test
 	void it_should_stop_jetty() {
-		jetty = new EmbeddedJetty();
+		EmbeddedJetty jetty = new EmbeddedJetty();
 		assertThat(jetty.getScheme()).isEqualTo("http");
 		assertThat(jetty.getHost()).isEqualTo("localhost");
 		assertThat(jetty.getPath()).isEqualTo("/");
 
-		jetty.start();
-		assertThat(jetty.isStarted()).isTrue();
-		assertThat(jetty.getPort()).isNotZero();
-		assertThat(jetty.getUrl()).isEqualTo(localhost(jetty.getPort()));
+		doRun(jetty, () -> {
+			assertThat(jetty.isStarted()).isTrue();
+			assertThat(jetty.getPort()).isNotZero();
+			assertThat(jetty.getUrl()).isEqualTo(localhost(jetty.getPort()));
+		});
 
-		jetty.stop();
 		assertThat(jetty.isStarted()).isFalse();
 		assertThat(jetty.getPort()).isZero();
 		assertThat(jetty.getUrl()).isEqualTo(localhost(jetty.getPort()));
 	}
 
 	@Test
 	void it_should_get_configuration_port_until_jetty_is_started() {
-		jetty = new EmbeddedJetty();
+		EmbeddedJetty jetty = new EmbeddedJetty();
 		assertThat(jetty.getPort()).isZero();
 
-		jetty.start();
-		assertThat(jetty.getPort()).isNotZero();
+		doRun(jetty, () ->
+			assertThat(jetty.getPort()).isNotZero()
+		);
 
-		jetty.stop();
 		assertThat(jetty.getPort()).isZero();
 	}
 
 	@Test
 	void it_should_get_servlet_context() {
-		jetty = new EmbeddedJetty();
-		jetty.start();
-		assertThat(jetty.getServletContext()).isNotNull();
+		run((jetty) ->
+			assertThat(jetty.getServletContext()).isNotNull()
+		);
 	}
 
 	@Test
 	void it_should_get_original_jetty() {
-		jetty = new EmbeddedJetty();
-		assertThat(jetty.getDelegate()).isNotNull();
+		run((jetty) ->
+			assertThat(jetty.getDelegate()).isNotNull()
+		);
 	}
 
 	@Test
@@ -122,38 +117,57 @@ void it_should_add_parent_classloader(@TempDir Path tmp) throws Exception {
 		try (URLClassLoader urlClassLoader = new URLClassLoader(new URL[] { url })) {
 			assertThat(urlClassLoader.getResource(name)).isNotNull();
 
-			jetty = new EmbeddedJetty(EmbeddedJettyConfiguration.builder()
+			EmbeddedJettyConfiguration configuration = EmbeddedJettyConfiguration.builder()
 				.withWebapp(dir)
 				.withParentClasspath(url)
-				.build());
-
-			jetty.start();
-
-			HttpResponse rsp = get(jetty.getUrl());
-			assertThat(rsp.getStatusCode()).isEqualTo(200);
-			assertThat(rsp.getResponseBody()).isNotEmpty();
-
-			WebAppContext ctx = (WebAppContext) jetty.getDelegate().getHandler();
-			ClassLoader cl = ctx.getClassLoader();
-			assertThat(cl).isNotNull();
-			assertThat(cl.getResource("custom-web.xml")).isNotNull();
-			assertThat(cl.getResource(name)).isNotNull();
+				.build();
+
+			run(configuration, (jetty) -> {
+				HttpResponse rsp = get(jetty.getUrl());
+				assertThat(rsp.getStatusCode()).isEqualTo(200);
+				assertThat(rsp.getResponseBody()).isNotEmpty();
+
+				WebAppContext ctx = (WebAppContext) jetty.getDelegate().getHandler();
+				ClassLoader cl = ctx.getClassLoader();
+				assertThat(cl).isNotNull();
+				assertThat(cl.getResource("custom-web.xml")).isNotNull();
+				assertThat(cl.getResource(name)).isNotNull();
+			});
 		}
 	}
 
 	@Test
 	void it_should_override_web_xml() {
 		File customWebXml = getFileFromClasspath("/custom-web.xml");
-
-		jetty = new EmbeddedJetty(EmbeddedJettyConfiguration.builder()
+		EmbeddedJettyConfiguration configuration = EmbeddedJettyConfiguration.builder()
 			.withWebapp(customWebXml.getParentFile())
 			.withOverrideDescriptor(customWebXml.getAbsolutePath())
-			.build());
+			.build();
 
+		run(configuration, (jetty) -> {
+			HttpResponse rsp = get(jetty.getUrl() + "hello");
+			assertThat(rsp.getStatusCode()).isEqualTo(200);
+			assertThat(rsp.getResponseBody()).isNotEmpty().contains("Hello World");
+		});
+	}
+
+	private static void run(Consumer<EmbeddedJetty> testFn) {
+		EmbeddedJetty jetty = new EmbeddedJetty();
+		doRun(jetty, () -> testFn.accept(jetty));
+	}
+
+	private static void run(EmbeddedJettyConfiguration configuration, Consumer<EmbeddedJetty> testFn) {
+		EmbeddedJetty jetty = new EmbeddedJetty(configuration);
+		doRun(jetty, () -> testFn.accept(jetty));
+	}
+
+	private static void doRun(EmbeddedJetty jetty, Runnable testFn) {
 		jetty.start();
 
-		HttpResponse rsp = get(jetty.getUrl() + "hello");
-		assertThat(rsp.getStatusCode()).isEqualTo(200);
-		assertThat(rsp.getResponseBody()).isNotEmpty().contains("Hello World");
+		try {
+			testFn.run();
+		} finally {
+			jetty.stop();
+		}
 	}
 }
diff --git a/...s-jetty-11/src/test/java/com/github/mjeanroy/junit/servers/jetty11/EmbeddedJettyTest.java b/...s-jetty-11/src/test/java/com/github/mjeanroy/junit/servers/jetty11/EmbeddedJettyTest.java
@@ -27,7 +27,6 @@
 import com.github.mjeanroy.junit.servers.jetty.EmbeddedJettyConfiguration;
 import com.github.mjeanroy.junit.servers.testing.HttpTestUtils.HttpResponse;
 import org.eclipse.jetty.webapp.WebAppContext;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
@@ -36,6 +35,7 @@
 import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.function.Consumer;
 
 import static com.github.mjeanroy.junit.servers.testing.HttpTestUtils.get;
 import static com.github.mjeanroy.junit.servers.testing.HttpTestUtils.localhost;
@@ -44,72 +44,67 @@
 
 class EmbeddedJettyTest {
 
-	private volatile EmbeddedJetty jetty;
-
-	@AfterEach
-	void tearDown() {
-		jetty.stop();
-	}
-
 	@Test
 	void it_should_start_jetty() {
-		jetty = new EmbeddedJetty();
+		EmbeddedJetty jetty = new EmbeddedJetty();
 		assertThat(jetty.getScheme()).isEqualTo("http");
 		assertThat(jetty.getHost()).isEqualTo("localhost");
 		assertThat(jetty.getPath()).isEqualTo("/");
 
-		jetty.start();
-		assertThat(jetty.isStarted()).isTrue();
-		assertThat(jetty.getPort()).isNotZero();
-		assertThat(jetty.getUrl()).isEqualTo(localhost(jetty.getPort()));
+		doRun(jetty, () -> {
+			assertThat(jetty.isStarted()).isTrue();
+			assertThat(jetty.getPort()).isNotZero();
+			assertThat(jetty.getUrl()).isEqualTo(localhost(jetty.getPort()));
 
-		// Since there is no webapp deployed, we should get a 404
-		HttpResponse rsp = get(jetty.getUrl());
-		assertThat(rsp.getStatusCode()).isEqualTo(404);
-		assertThat(rsp.getResponseBody()).isNotEmpty();
+			// Since there is no webapp deployed, we should get a 404
+			HttpResponse rsp = get(jetty.getUrl());
+			assertThat(rsp.getStatusCode()).isEqualTo(404);
+			assertThat(rsp.getResponseBody()).isNotEmpty();
+		});
 	}
 
 	@Test
 	void it_should_stop_jetty() {
-		jetty = new EmbeddedJetty();
+		EmbeddedJetty jetty = new EmbeddedJetty();
 		assertThat(jetty.getScheme()).isEqualTo("http");
 		assertThat(jetty.getHost()).isEqualTo("localhost");
 		assertThat(jetty.getPath()).isEqualTo("/");
 
-		jetty.start();
-		assertThat(jetty.isStarted()).isTrue();
-		assertThat(jetty.getPort()).isNotZero();
-		assertThat(jetty.getUrl()).isEqualTo(localhost(jetty.getPort()));
+		doRun(jetty, () -> {
+			assertThat(jetty.isStarted()).isTrue();
+			assertThat(jetty.getPort()).isNotZero();
+			assertThat(jetty.getUrl()).isEqualTo(localhost(jetty.getPort()));
+		});
 
-		jetty.stop();
 		assertThat(jetty.isStarted()).isFalse();
 		assertThat(jetty.getPort()).isZero();
 		assertThat(jetty.getUrl()).isEqualTo(localhost(jetty.getPort()));
 	}
 
 	@Test
 	void it_should_get_configuration_port_until_jetty_is_started() {
-		jetty = new EmbeddedJetty();
+		EmbeddedJetty jetty = new EmbeddedJetty();
 		assertThat(jetty.getPort()).isZero();
 
-		jetty.start();
-		assertThat(jetty.getPort()).isNotZero();
+		doRun(jetty, () ->
+			assertThat(jetty.getPort()).isNotZero()
+		);
 
-		jetty.stop();
 		assertThat(jetty.getPort()).isZero();
 	}
 
 	@Test
 	void it_should_get_servlet_context() {
-		jetty = new EmbeddedJetty();
-		jetty.start();
-		assertThat(jetty.getServletContext()).isNotNull();
+		run((jetty) ->
+			assertThat(jetty.getServletContext()).isNotNull()
+		);
 	}
 
 	@Test
 	void it_should_get_original_jetty() {
-		jetty = new EmbeddedJetty();
-		assertThat(jetty.getDelegate()).isNotNull();
+		run((jetty) ->
+			assertThat(jetty.getDelegate()).isNotNull()
+		);
 	}
 
 	@Test
@@ -122,38 +117,57 @@ void it_should_add_parent_classloader(@TempDir Path tmp) throws Exception {
 		try (URLClassLoader urlClassLoader = new URLClassLoader(new URL[] { url })) {
 			assertThat(urlClassLoader.getResource(name)).isNotNull();
 
-			jetty = new EmbeddedJetty(EmbeddedJettyConfiguration.builder()
+			EmbeddedJettyConfiguration configuration = EmbeddedJettyConfiguration.builder()
 				.withWebapp(dir)
 				.withParentClasspath(url)
-				.build());
-
-			jetty.start();
-
-			HttpResponse rsp = get(jetty.getUrl());
-			assertThat(rsp.getStatusCode()).isEqualTo(200);
-			assertThat(rsp.getResponseBody()).isNotEmpty();
-
-			WebAppContext ctx = (WebAppContext) jetty.getDelegate().getHandler();
-			ClassLoader cl = ctx.getClassLoader();
-			assertThat(cl).isNotNull();
-			assertThat(cl.getResource("custom-web.xml")).isNotNull();
-			assertThat(cl.getResource(name)).isNotNull();
+				.build();
+
+			run(configuration, (jetty) -> {
+				HttpResponse rsp = get(jetty.getUrl());
+				assertThat(rsp.getStatusCode()).isEqualTo(200);
+				assertThat(rsp.getResponseBody()).isNotEmpty();
+
+				WebAppContext ctx = (WebAppContext) jetty.getDelegate().getHandler();
+				ClassLoader cl = ctx.getClassLoader();
+				assertThat(cl).isNotNull();
+				assertThat(cl.getResource("custom-web.xml")).isNotNull();
+				assertThat(cl.getResource(name)).isNotNull();
+			});
 		}
 	}
 
 	@Test
 	void it_should_override_web_xml() {
 		File customWebXml = getFileFromClasspath("/custom-web.xml");
-
-		jetty = new EmbeddedJetty(EmbeddedJettyConfiguration.builder()
+		EmbeddedJettyConfiguration configuration = EmbeddedJettyConfiguration.builder()
 			.withWebapp(customWebXml.getParentFile())
 			.withOverrideDescriptor(customWebXml.getAbsolutePath())
-			.build());
+			.build();
 
+		run(configuration, (jetty) -> {
+			HttpResponse rsp = get(jetty.getUrl() + "hello");
+			assertThat(rsp.getStatusCode()).isEqualTo(200);
+			assertThat(rsp.getResponseBody()).isNotEmpty().contains("Hello World");
+		});
+	}
+
+	private static void run(Consumer<EmbeddedJetty> testFn) {
+		EmbeddedJetty jetty = new EmbeddedJetty();
+		doRun(jetty, () -> testFn.accept(jetty));
+	}
+
+	private static void run(EmbeddedJettyConfiguration configuration, Consumer<EmbeddedJetty> testFn) {
+		EmbeddedJetty jetty = new EmbeddedJetty(configuration);
+		doRun(jetty, () -> testFn.accept(jetty));
+	}
+
+	private static void doRun(EmbeddedJetty jetty, Runnable testFn) {
 		jetty.start();
 
-		HttpResponse rsp = get(jetty.getUrl() + "hello");
-		assertThat(rsp.getStatusCode()).isEqualTo(200);
-		assertThat(rsp.getResponseBody()).isNotEmpty().contains("Hello World");
+		try {
+			testFn.run();
+		} finally {
+			jetty.stop();
+		}
 	}
 }