aboutsummaryrefslogtreecommitdiffstats
path: root/config-provisioning/src/test/java/com/yahoo/config/provision
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-08-28 09:33:13 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-08-28 09:33:13 +0200
commitfc2f74f461fe2a049f3c7c362f83b48c0d3ae68b (patch)
treef37c4837ee3bb13eb0d1a3d3f5f1bce9eb52d208 /config-provisioning/src/test/java/com/yahoo/config/provision
parentde0d1ef384f75c8c0fc08503d75cfcaa5e494a5a (diff)
Allocation consistency between model versions
Diffstat (limited to 'config-provisioning/src/test/java/com/yahoo/config/provision')
-rw-r--r--config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java16
1 files changed, 1 insertions, 15 deletions
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
index 4fa69eb77e0..435b6e3a28a 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ProvisionInfoTest.java
@@ -13,8 +13,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
- * @author lulf
- * @since 5.12
+ * @author Ulf Lilleengen
*/
public class ProvisionInfoTest {
@@ -32,19 +31,6 @@ public class ProvisionInfoTest {
assertProvisionInfo(info);
}
- @Test
- public void testProvisionInfoMerging() throws IOException {
- Set<HostSpec> hostsA = new LinkedHashSet<>(Collections.singleton(h1));
- Set<HostSpec> hostsB = new LinkedHashSet<>();
- hostsB.add(h2);
- hostsB.add(h3);
-
- ProvisionInfo infoA = ProvisionInfo.withHosts(hostsA);
- ProvisionInfo infoB = ProvisionInfo.withHosts(hostsB);
- assertProvisionInfo(infoA.merge(infoB));
- assertProvisionInfo(infoB.merge(infoA));
- }
-
private void assertProvisionInfo(ProvisionInfo info) throws IOException {
ProvisionInfo serializedInfo = ProvisionInfo.fromJson(info.toJson(), Optional.empty());
assertEquals(info.getHosts().size(), serializedInfo.getHosts().size());