aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2017-02-01 11:26:38 +0100
committerGitHub <noreply@github.com>2017-02-01 11:26:38 +0100
commit6ac1aa95be67abf5a61e65d75669d0540fbf5ed5 (patch)
tree5a1be193f6a174817f8b9a8f92e30697c34e58f4
parent8b02c814e04165067fbe69797d0403b11033e894 (diff)
parentb4736ed729760f8a74e9ff24c124a4cf901ea9ac (diff)
Merge pull request #1660 from yahoo/hmusum/fix-typos-in-test
Fix typo in uri
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceCheckerTest.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceCheckerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceCheckerTest.java
index c383ddb198c..d4226f82005 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceCheckerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationConvergenceCheckerTest.java
@@ -60,29 +60,29 @@ public class ApplicationConvergenceCheckerTest {
@Test
public void converge() throws IOException, SAXException {
ApplicationConvergenceChecker checker = new ApplicationConvergenceChecker((client, serviceUri) -> () -> string2json("{\"config\":{\"generation\":3}}"));
- final HttpResponse httpResponse = checker.listConfigConvergence(application, URI.create("http://foo:234/serviceconvergence"));
+ final HttpResponse httpResponse = checker.listConfigConvergence(application, URI.create("http://foo:234/serviceconverge"));
assertThat(httpResponse.getStatus(), is(200));
assertJsonResponseEquals(httpResponse, "{\"services\":[" +
"{\"port\":1337,\"host\":\"localhost\"," +
- "\"url\":\"http://foo:234/serviceconvergence/localhost:1337\"," +
+ "\"url\":\"http://foo:234/serviceconverge/localhost:1337\"," +
"\"type\":\"container\"}]," +
"\"debug\":{\"wantedVersion\":3}," +
- "\"url\":\"http://foo:234/serviceconvergence\"}");
- final HttpResponse nodeHttpResponse = checker.nodeConvergenceCheck(application, "localhost:1337", URI.create("http://foo:234/serviceconvergence"));
+ "\"url\":\"http://foo:234/serviceconverge\"}");
+ final HttpResponse nodeHttpResponse = checker.nodeConvergenceCheck(application, "localhost:1337", URI.create("http://foo:234/serviceconverge"));
assertThat(nodeHttpResponse.getStatus(), is(200));
assertJsonResponseEquals(nodeHttpResponse, "{" +
"\"converged\":true," +
"\"debug\":{\"wantedGeneration\":3," +
"\"currentGeneration\":3," +
"\"host\":\"localhost:1337\"}," +
- "\"url\":\"http://foo:234/serviceconvergence\"}");
- final HttpResponse hostMissingHttpResponse = checker.nodeConvergenceCheck(application, "notPresent:1337", URI.create("http://foo:234/serviceconvergence"));
+ "\"url\":\"http://foo:234/serviceconverge\"}");
+ final HttpResponse hostMissingHttpResponse = checker.nodeConvergenceCheck(application, "notPresent:1337", URI.create("http://foo:234/serviceconverge"));
assertThat(hostMissingHttpResponse.getStatus(), is(410));
assertJsonResponseEquals(hostMissingHttpResponse, "{\"debug\":{" +
"\"problem\":\"Host:port (service) no longer part of application, refetch list of services.\"," +
"\"wantedGeneration\":3," +
"\"host\":\"notPresent:1337\"}," +
- "\"url\":\"http://foo:234/serviceconvergence\"}");
+ "\"url\":\"http://foo:234/serviceconverge\"}");
}
private void assertJsonResponseEquals(HttpResponse httpResponse, String expected) throws IOException {