From 65dfeb73636dbf8455ed11dd2378f15eaffa8c3b Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Thu, 21 Apr 2022 18:53:12 +0200 Subject: Remove flag: Always true --- .../provision/provisioning/NodeIncidesTest.java | 72 ---------------------- .../provision/provisioning/NodeIndicesTest.java | 44 +++++++++++++ .../provision/provisioning/ProvisioningTester.java | 4 +- 3 files changed, 45 insertions(+), 75 deletions(-) delete mode 100644 node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeIncidesTest.java create mode 100644 node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeIndicesTest.java (limited to 'node-repository/src/test/java/com/yahoo') diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeIncidesTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeIncidesTest.java deleted file mode 100644 index 4e35bd54435..00000000000 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeIncidesTest.java +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.provision.provisioning; - -import org.junit.Test; - -import java.util.List; - -import static org.junit.Assert.assertEquals; - -/** - * @author jonmv - */ -public class NodeIncidesTest { - - @Test - public void testNonCompactIndices() { - NodeIndices indices = new NodeIndices(List.of(1, 3, 4), false); - assertEquals(5, indices.probeNext()); - assertEquals(6, indices.probeNext()); - - indices.resetProbe(); - assertEquals(5, indices.probeNext()); - assertEquals(6, indices.probeNext()); - - indices.commitProbe(); - assertEquals(7, indices.probeNext()); - assertEquals(8, indices.probeNext()); - - indices.resetProbe(); - assertEquals(7, indices.next()); - assertEquals(8, indices.next()); - - assertEquals(9, indices.probeNext()); - try { - indices.next(); - } - catch (IllegalStateException e) { - assertEquals("Must commit ongoing probe before calling 'next'", e.getMessage()); - } - } - - - @Test - public void testCompactIndices() { - NodeIndices indices = new NodeIndices(List.of(1, 3, 4), true); - assertEquals(0, indices.probeNext()); - assertEquals(2, indices.probeNext()); - assertEquals(5, indices.probeNext()); - assertEquals(6, indices.probeNext()); - - indices.resetProbe(); - assertEquals(0, indices.probeNext()); - assertEquals(2, indices.probeNext()); - - indices.commitProbe(); - assertEquals(5, indices.probeNext()); - assertEquals(6, indices.probeNext()); - - indices.resetProbe(); - assertEquals(5, indices.next()); - assertEquals(6, indices.next()); - - assertEquals(7, indices.probeNext()); - try { - indices.next(); - } - catch (IllegalStateException e) { - assertEquals("Must commit ongoing probe before calling 'next'", e.getMessage()); - } - } - -} diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeIndicesTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeIndicesTest.java new file mode 100644 index 00000000000..a2f9fa80b42 --- /dev/null +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeIndicesTest.java @@ -0,0 +1,44 @@ +// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.hosted.provision.provisioning; + +import org.junit.Test; + +import java.util.List; + +import static org.junit.Assert.assertEquals; + +/** + * @author jonmv + */ +public class NodeIndicesTest { + + @Test + public void testNodeIndices() { + NodeIndices indices = new NodeIndices(List.of(1, 3, 4)); + assertEquals(0, indices.probeNext()); + assertEquals(2, indices.probeNext()); + assertEquals(5, indices.probeNext()); + assertEquals(6, indices.probeNext()); + + indices.resetProbe(); + assertEquals(0, indices.probeNext()); + assertEquals(2, indices.probeNext()); + + indices.commitProbe(); + assertEquals(5, indices.probeNext()); + assertEquals(6, indices.probeNext()); + + indices.resetProbe(); + assertEquals(5, indices.next()); + assertEquals(6, indices.next()); + + assertEquals(7, indices.probeNext()); + try { + indices.next(); + } + catch (IllegalStateException e) { + assertEquals("Must commit ongoing probe before calling 'next'", e.getMessage()); + } + } + +} diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java index 9f722507ba2..af94bba2e70 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java @@ -689,9 +689,7 @@ public class ProvisioningTester { } private FlagSource defaultFlagSource() { - var flagSource = new InMemoryFlagSource(); - flagSource.withBooleanFlag(Flags.REUSE_NODE_INDEXES.id(), true); - return flagSource; + return new InMemoryFlagSource(); } public ProvisioningTester build() { -- cgit v1.2.3