summaryrefslogtreecommitdiffstats
path: root/config-provisioning
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-08-28 15:47:36 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-08-28 15:47:36 +0200
commit1701fa777723c1a7d55c7149d0a25429a5596a35 (patch)
treeca744569d77b6c6d49548e7f5ee300cbefbb0fc2 /config-provisioning
parent8c50c885d8f3efb07e10dd585976004ba44cdbbe (diff)
ProvisionInfo -> AllocatedHosts
Diffstat (limited to 'config-provisioning')
-rw-r--r--config-provisioning/src/test/java/com/yahoo/config/provision/AllocatedHostsTest.java23
1 files changed, 12 insertions, 11 deletions
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/AllocatedHostsTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/AllocatedHostsTest.java
index 54ce90d76fc..675af88596a 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/AllocatedHostsTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/AllocatedHostsTest.java
@@ -21,24 +21,25 @@ public class AllocatedHostsTest {
private final HostSpec h3 = new HostSpec("host3", Optional.of(ClusterMembership.from("container/test/0", com.yahoo.component.Version.fromString("6.73.1"))));
@Test
- public void testProvisionInfoSerialization() throws IOException {
+ public void testAllocatedHostsSerialization() throws IOException {
Set<HostSpec> hosts = new LinkedHashSet<>();
hosts.add(h1);
hosts.add(h2);
hosts.add(h3);
AllocatedHosts info = AllocatedHosts.withHosts(hosts);
- assertProvisionInfo(info);
+ assertAllocatedHosts(info);
}
- private void assertProvisionInfo(AllocatedHosts info) throws IOException {
- AllocatedHosts serializedInfo = AllocatedHosts.fromJson(info.toJson(), Optional.empty());
- assertEquals(info.getHosts().size(), serializedInfo.getHosts().size());
- assertTrue(serializedInfo.getHosts().contains(h1));
- assertTrue(serializedInfo.getHosts().contains(h2));
- assertTrue(serializedInfo.getHosts().contains(h3));
- assertTrue(!getHost(h1.hostname(), serializedInfo.getHosts()).membership().isPresent());
- assertEquals("container/test/0", getHost(h3.hostname(), serializedInfo.getHosts()).membership().get().stringValue());
- assertEquals(h3.membership().get().cluster().vespaVersion(), getHost(h3.hostname(), serializedInfo.getHosts()).membership().get().cluster().vespaVersion());
+ private void assertAllocatedHosts(AllocatedHosts info) throws IOException {
+ AllocatedHosts serializedAllocatedHosts = AllocatedHosts.fromJson(info.toJson(), Optional.empty());
+ assertEquals(info.getHosts().size(), serializedAllocatedHosts.getHosts().size());
+ assertTrue(serializedAllocatedHosts.getHosts().contains(h1));
+ assertTrue(serializedAllocatedHosts.getHosts().contains(h2));
+ assertTrue(serializedAllocatedHosts.getHosts().contains(h3));
+ assertTrue(!getHost(h1.hostname(), serializedAllocatedHosts.getHosts()).membership().isPresent());
+ assertEquals("container/test/0", getHost(h3.hostname(), serializedAllocatedHosts.getHosts()).membership().get().stringValue());
+ assertEquals(h3.membership().get().cluster().vespaVersion(), getHost(h3.hostname(),
+ serializedAllocatedHosts.getHosts()).membership().get().cluster().vespaVersion());
}
private HostSpec getHost(String hostname, Set<HostSpec> hosts) {