Remove on Vespa 8

2 files changed, 1 insertions, 51 deletions

diff --git a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java
index 6d641eaba08..0a0191a9815 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java
@@ -6,10 +6,8 @@ import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-@SuppressWarnings("removal") // TODO: Vespa 9: Remove
 public class VisitorParametersTestCase {
 
-    @SuppressWarnings("removal")// TODO: Vespa 9: Remove
     private VisitorParameters createVisitorParameters() {
         VisitorParameters params = new VisitorParameters("");
         params.setDocumentSelection("id.user==5678");
@@ -33,8 +31,6 @@ public class VisitorParametersTestCase {
         params.setRemoteDataHandler("mars_rover");
         params.setControlHandler(new VisitorControlHandler());
         params.setMaxTotalHits(777);
-        params.setDynamicallyIncreaseMaxBucketsPerVisitor(true);
-        params.setDynamicMaxBucketsIncreaseFactor(2.5f);
         params.skipBucketsOnFatalErrors(true);
 
         return params;
@@ -67,8 +63,6 @@ public class VisitorParametersTestCase {
         assertEquals("mars_rover", copy.getRemoteDataHandler());
         assertEquals(params.getControlHandler(), copy.getControlHandler());
         assertEquals(777, copy.getMaxTotalHits());
-        assertEquals(true, copy.getDynamicallyIncreaseMaxBucketsPerVisitor());
-        assertEquals(2.5f, copy.getDynamicMaxBucketsIncreaseFactor(), 0.0001);
         assertEquals(true, copy.skipBucketsOnFatalErrors());
 
         // Test local data handler copy
@@ -101,9 +95,8 @@ public class VisitorParametersTestCase {
                 "  Max total hits:     777\n" +
                 "  Max buckets:        55\n" +
                 "  Priority:           HIGHEST\n" +
-                "  Dynamically increasing max buckets per visitor\n" +
-                "  Increase factor:    2.5\n" +
                 ")",
                 params.toString());
     }
+
 }
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
index d729bb9aa76..43dd0ee392e 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
@@ -2290,49 +2290,6 @@ public class MessageBusVisitorSessionTestCase {
                 mc.controlHandler.toString());
     }
 
-    @SuppressWarnings("removal")// TODO: Vespa 8: remove test
-    @Test
-    public void testDynamicallyIncreaseMaxBucketsPerVisitorOption() {
-        VisitorParameters visitorParameters = createVisitorParameters("id.user==1234");
-        visitorParameters.setDynamicallyIncreaseMaxBucketsPerVisitor(true);
-        visitorParameters.setMaxBucketsPerVisitor(2);
-        visitorParameters.setDynamicMaxBucketsIncreaseFactor(10);
-        MockComponents mc = createDefaultMock(visitorParameters);
-
-        mc.visitorSession.start();
-        mc.executor.expectAndProcessTasks(1);
-
-        assertEquals("CreateVisitorMessage(buckets=[\n" +
-                "BucketId(0x80000000000004d2)\n" +
-                "BucketId(0x0000000000000000)\n" +
-                "]\n" +
-                "selection='id.user==1234'\n" +
-                "max buckets per visitor=2\n)",
-                replyToCreateVisitor(mc.sender, new BucketId(33, 1234 | (1L << 32))));
-        mc.executor.expectAndProcessTasks(1); // reply
-        mc.executor.expectAndProcessTasks(1); // send create visitors
-
-        assertEquals("CreateVisitorMessage(buckets=[\n" +
-                "BucketId(0x80000000000004d2)\n" +
-                "BucketId(0x84000001000004d2)\n" +
-                "]\n" +
-                "selection='id.user==1234'\n" +
-                "max buckets per visitor=20\n)",
-                replyToCreateVisitor(mc.sender, new BucketId(34, 1234 | (1L << 33))));
-
-        mc.executor.expectAndProcessTasks(1); // reply
-        mc.executor.expectAndProcessTasks(1); // send create visitors
-
-        // Saturate at 128
-        assertEquals("CreateVisitorMessage(buckets=[\n" +
-                "BucketId(0x80000000000004d2)\n" +
-                "BucketId(0x88000002000004d2)\n" +
-                "]\n" +
-                "selection='id.user==1234'\n" +
-                "max buckets per visitor=128\n)",
-                replyToCreateVisitor(mc.sender, ProgressToken.FINISHED_BUCKET));
-    }
-
     @Test
     public void testVisitorTimeoutsNotConsideredFatal() {
         VisitorParameters visitorParameters = createVisitorParameters("id.user==1234");