From 2929a966494b8e8f9444079e14d7d626387b9818 Mon Sep 17 00:00:00 2001 From: Vasily Vasilkov Date: Fri, 6 Sep 2019 17:51:05 +0400 Subject: [PATCH] #186: Unify consul versions in tests --- src/test/java/com/ecwid/consul/v1/ConsulClientTest.java | 5 +++-- .../java/com/ecwid/consul/v1/acl/AclConsulClientTest.java | 3 ++- .../com/ecwid/consul/v1/kv/KeyValueConsulClientTest.java | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/ecwid/consul/v1/ConsulClientTest.java b/src/test/java/com/ecwid/consul/v1/ConsulClientTest.java index f5d0a93d..8d8829e4 100644 --- a/src/test/java/com/ecwid/consul/v1/ConsulClientTest.java +++ b/src/test/java/com/ecwid/consul/v1/ConsulClientTest.java @@ -1,5 +1,6 @@ package com.ecwid.consul.v1; +import com.ecwid.consul.ConsulTestConstants; import com.ecwid.consul.transport.TLSConfig; import com.ecwid.consul.v1.agent.model.NewService; import com.ecwid.consul.v1.agent.model.Service; @@ -40,7 +41,7 @@ public void setup() { "}\n"; consul = ConsulStarterBuilder.consulStarter() - .withConsulVersion("1.0.6") + .withConsulVersion(ConsulTestConstants.CONSUL_VERSION) .withCustomConfig(customConfiguration) .build() .start(); @@ -90,4 +91,4 @@ private void serviceRegisterTest(ConsulClient consulClient) { Map services = agentServicesResponse.getValue(); assertThat(services, IsMapContaining.hasKey(serviceName)); } -} \ No newline at end of file +} diff --git a/src/test/java/com/ecwid/consul/v1/acl/AclConsulClientTest.java b/src/test/java/com/ecwid/consul/v1/acl/AclConsulClientTest.java index b0f6ca12..120fb0c4 100644 --- a/src/test/java/com/ecwid/consul/v1/acl/AclConsulClientTest.java +++ b/src/test/java/com/ecwid/consul/v1/acl/AclConsulClientTest.java @@ -1,5 +1,6 @@ package com.ecwid.consul.v1.acl; +import com.ecwid.consul.ConsulTestConstants; import com.ecwid.consul.v1.Response; import com.ecwid.consul.v1.acl.model.Acl; import com.ecwid.consul.v1.acl.model.AclType; @@ -31,7 +32,7 @@ public void setup() { ", \"datacenter\": \"dc-test\" }"; consul = ConsulStarterBuilder.consulStarter() - .withConsulVersion("1.0.6") + .withConsulVersion(ConsulTestConstants.CONSUL_VERSION) .withHttpPort(port) .withCustomConfig(customConfiguration) .build() diff --git a/src/test/java/com/ecwid/consul/v1/kv/KeyValueConsulClientTest.java b/src/test/java/com/ecwid/consul/v1/kv/KeyValueConsulClientTest.java index edebf023..adad46c1 100644 --- a/src/test/java/com/ecwid/consul/v1/kv/KeyValueConsulClientTest.java +++ b/src/test/java/com/ecwid/consul/v1/kv/KeyValueConsulClientTest.java @@ -1,5 +1,6 @@ package com.ecwid.consul.v1.kv; +import com.ecwid.consul.ConsulTestConstants; import com.pszymczyk.consul.ConsulProcess; import com.pszymczyk.consul.ConsulStarterBuilder; import com.pszymczyk.consul.infrastructure.Ports; @@ -23,7 +24,7 @@ class KeyValueConsulClientTest { @BeforeEach void setUp() { consul = ConsulStarterBuilder.consulStarter() - .withConsulVersion("1.6.0") + .withConsulVersion(ConsulTestConstants.CONSUL_VERSION) .withHttpPort(port) .build() .start();