diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-05-16 14:24:00 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-05-16 14:24:00 +0200 |
commit | 958dc05771460cf6264b0ed03a812d152d429deb (patch) | |
tree | 39a4a69cf0385e4c343a408087f57ac6c03abdbd /standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainerTest.scala | |
parent | a51888e2d82738c5b12a1a233ae772399c78bb4a (diff) |
Remove Manhattan integration
Diffstat (limited to 'standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainerTest.scala')
-rw-r--r-- | standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainerTest.scala | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainerTest.scala b/standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainerTest.scala index 2705322ab32..00d84d36165 100644 --- a/standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainerTest.scala +++ b/standalone-container/src/test/scala/com/yahoo/container/standalone/StandaloneContainerTest.scala @@ -2,13 +2,11 @@ package com.yahoo.container.standalone +import com.yahoo.container.standalone.StandaloneContainerTest._ +import com.yahoo.vespa.model.AbstractService import org.junit.Assert._ import org.junit.Test -import org.hamcrest.CoreMatchers.is -import org.hamcrest.text.StringContainsInOrder.stringContainsInOrder -import StandaloneContainerTest._ -import com.yahoo.vespa.model.AbstractService -import java.util.Arrays.asList + import scala.util.Try @@ -79,29 +77,6 @@ class StandaloneContainerTest { } } - @Test - def manhattan_http_port_yinst_variable_must_be_set() { - System.clearProperty(StandaloneContainerApplication.manhattanHttpPortYinstVariable) - try { - StandaloneContainerApplication.manhattanHttpPort - fail("Port should be a required setting") - } catch { - case e: Exception => - assertThat(e.getMessage, stringContainsInOrder(asList("Environment variable not set", "manhattan_http_port"))) - } - } - - @Test - def manhattan_http_port_must_be_positive_integer() { - assertThat(setAndGetPort(1234), is(1234)) - assertTrue(Try { setAndGetPort(-1) }.isFailure) - assertTrue(Try { setAndGetPort( 0) }.isFailure) - } - - def setAndGetPort(port: Int): Int = { - System.setProperty(StandaloneContainerApplication.manhattanHttpPortYinstVariable, Integer.toString(port)) - StandaloneContainerApplication.manhattanHttpPort - } } object StandaloneContainerTest { |