diff options
author | Martin Polden <mpolden@mpolden.no> | 2017-11-10 18:50:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-10 18:50:24 +0100 |
commit | c56091ffa4da34a2913b73f860cff2b6fa746c43 (patch) | |
tree | 1d7b53c77e927688fb041157de68797187620163 /standalone-container/src/test | |
parent | ef22b222d1862f6b5a56521f43830abae30eec70 (diff) |
Revert "Bjorncs/jdisc http service cleanup"
Diffstat (limited to 'standalone-container/src/test')
-rw-r--r-- | standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerActivatorTest.java | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerActivatorTest.java b/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerActivatorTest.java index 8d413ade0f0..48c882c78db 100644 --- a/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerActivatorTest.java +++ b/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneContainerActivatorTest.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.standalone; +import com.google.inject.Binder; import com.google.inject.Module; import com.yahoo.io.IOUtils; import com.yahoo.jdisc.http.ConnectorConfig; @@ -17,7 +18,6 @@ import java.nio.file.Path; import java.util.List; import static java.util.Arrays.asList; -import static java.util.Collections.singletonList; import static java.util.stream.Collectors.toList; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.collection.IsEmptyCollection.empty; @@ -29,7 +29,7 @@ import static org.junit.Assert.assertThat; */ public class StandaloneContainerActivatorTest { - private static String getJdiscXml(String contents) throws ParserConfigurationException, IOException, SAXException { + private String getJdiscXml(String contents) throws ParserConfigurationException, IOException, SAXException { return "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + "<services>\n" + " <jdisc version=\"1.0\" jetty=\"true\">\n" + @@ -38,7 +38,7 @@ public class StandaloneContainerActivatorTest { "</services>"; } - private static void writeApplicationPackage(String servicesXml, Path tmpDir) throws IOException { + private void writeApplicationPackage(String servicesXml, Path tmpDir) throws IOException { FileWriter fw = new FileWriter(tmpDir.resolve("services.xml").toFile(), false); fw.write(servicesXml); fw.close(); @@ -50,16 +50,16 @@ public class StandaloneContainerActivatorTest { try { writeApplicationPackage(getJdiscXml(""), applicationDir); StandaloneContainerActivator activator = new StandaloneContainerActivator(); - Container container = StandaloneContainerActivator.getContainer(newAppDirBinding(applicationDir)); + Container container = activator.getContainer(newAppDirBinding(applicationDir)); List<Integer> ports = getPorts(activator, container); - assertThat(ports, is(singletonList(Defaults.getDefaults().vespaWebServicePort()))); + assertThat(ports, is(asList(Defaults.getDefaults().vespaWebServicePort()))); } finally { IOUtils.recursiveDeleteDir(applicationDir.toFile()); } } - private static List<Integer> getPorts(StandaloneContainerActivator activator, Container container) { - return StandaloneContainerActivator.getConnectorConfigs(container).stream(). + private List<Integer> getPorts(StandaloneContainerActivator activator, Container container) { + return activator.getConnectorConfigs(container).stream(). map(ConnectorConfig::listenPort). collect(toList()); } @@ -70,7 +70,7 @@ public class StandaloneContainerActivatorTest { try { writeApplicationPackage(getJdiscXml("<http/>"), applicationDir); StandaloneContainerActivator activator = new StandaloneContainerActivator(); - Container container = StandaloneContainerActivator.getContainer(newAppDirBinding(applicationDir)); + Container container = activator.getContainer(newAppDirBinding(applicationDir)); List<Integer> ports = getPorts(activator, container); assertThat(ports, empty()); } finally { @@ -90,7 +90,7 @@ public class StandaloneContainerActivatorTest { "</http>\n"; writeApplicationPackage(getJdiscXml(contents), applicationDir); StandaloneContainerActivator activator = new StandaloneContainerActivator(); - Container container = StandaloneContainerActivator.getContainer(newAppDirBinding(applicationDir)); + Container container = activator.getContainer(newAppDirBinding(applicationDir)); List<Integer> ports = getPorts(activator, container); assertThat(ports, is(asList(123, 456, 789))); } finally { @@ -98,10 +98,15 @@ public class StandaloneContainerActivatorTest { } } - private static Module newAppDirBinding(final Path applicationDir) { - return binder -> binder.bind(Path.class) - .annotatedWith(StandaloneContainerApplication.applicationPathName()) - .toInstance(applicationDir); + private Module newAppDirBinding(final Path applicationDir) { + return new Module() { + @Override + public void configure(Binder binder) { + binder.bind(Path.class) + .annotatedWith(StandaloneContainerApplication.applicationPathName()) + .toInstance(applicationDir); + } + }; } } |