From 8fd641b074d5915076e6d385f8544222f49dbe5e Mon Sep 17 00:00:00 2001 From: Bahtiyar Kaba Date: Thu, 14 Jun 2018 14:55:32 +0300 Subject: [PATCH] formatting corrections on test-container tests --- .../DockerComposeContainerTests.java | 19 ++++++++++++------- .../testconainers/GenericContainerTests.java | 18 ++++++++++++------ .../WebDriverContainerTests.java | 4 +++- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/DockerComposeContainerTests.java b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/DockerComposeContainerTests.java index 32345a486c..745cb67145 100644 --- a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/DockerComposeContainerTests.java +++ b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/DockerComposeContainerTests.java @@ -13,17 +13,22 @@ import org.junit.Test; import org.testcontainers.containers.DockerComposeContainer; public class DockerComposeContainerTests { -@ClassRule -public static DockerComposeContainer compose = new DockerComposeContainer(new File("src/test/resources/test-compose.yml")) - .withExposedService("simpleWebServer_1", 80); - + @ClassRule + public static DockerComposeContainer compose = + new DockerComposeContainer( + new File("src/test/resources/test-compose.yml")) + .withExposedService("simpleWebServer_1", 80); + @Test - public void when() throws Exception { - String address ="http://" + compose.getServiceHost("simpleWebServer_1", 80)+ ":"+ compose.getServicePort("simpleWebServer_1", 80); + public void givenSimpleWebServerContainer_whenGetReuqest_thenReturnsResponse() + throws Exception { + String address = "http://" + compose.getServiceHost("simpleWebServer_1", 80) + + ":" + compose.getServicePort("simpleWebServer_1", 80); String response = simpleGetRequest(address); + assertEquals(response, "Hello World!"); } - + private String simpleGetRequest(String address) throws Exception { URL url = new URL(address); HttpURLConnection con = (HttpURLConnection) url.openConnection(); diff --git a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/GenericContainerTests.java b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/GenericContainerTests.java index 132fca5ad3..61da6fc57b 100644 --- a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/GenericContainerTests.java +++ b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/GenericContainerTests.java @@ -15,15 +15,20 @@ import org.testcontainers.containers.GenericContainer; @Testable public class GenericContainerTests { @ClassRule - public static GenericContainer simpleWebServer = new GenericContainer("alpine:3.2") + public static GenericContainer simpleWebServer = + new GenericContainer("alpine:3.2") .withExposedPorts(80) - .withCommand("/bin/sh", "-c", "while true; do echo " - + "\"HTTP/1.1 200 OK\n\nHello World!\" | nc -l -p 80; done"); + .withCommand("/bin/sh", "-c", "while true; do echo " + + "\"HTTP/1.1 200 OK\n\nHello World!\" | nc -l -p 80; done"); @Test - public void givenSimpleWebServerContainer_whenGetReuqest_thenReturnsResponse() throws Exception { - String address = "http://" + simpleWebServer.getContainerIpAddress() + ":" + simpleWebServer.getMappedPort(80); + public void givenSimpleWebServerContainer_whenGetReuqest_thenReturnsResponse() + throws Exception { + String address = "http://" + + simpleWebServer.getContainerIpAddress() + + ":" + simpleWebServer.getMappedPort(80); String response = simpleGetRequest(address); + assertEquals(response, "Hello World!"); } @@ -32,7 +37,8 @@ public class GenericContainerTests { HttpURLConnection con = (HttpURLConnection) url.openConnection(); con.setRequestMethod("GET"); - BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); + BufferedReader in = new BufferedReader( + new InputStreamReader(con.getInputStream())); String inputLine; StringBuffer content = new StringBuffer(); while ((inputLine = in.readLine()) != null) { diff --git a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerTests.java b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerTests.java index deadf130a3..8f7b0af762 100644 --- a/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerTests.java +++ b/testing-modules/test-containers/src/test/java/com/baeldung/testconainers/WebDriverContainerTests.java @@ -14,7 +14,9 @@ import org.testcontainers.containers.GenericContainer; public class WebDriverContainerTests { @Rule - public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer().withDesiredCapabilities(DesiredCapabilities.chrome()); + public BrowserWebDriverContainer chrome + = new BrowserWebDriverContainer() + .withDesiredCapabilities(DesiredCapabilities.chrome()); @Test public void whenNavigatedToPage_thenHeadingIsInThePage() {