From f57d5749b65972ea4f852ddcd24e5082e40254a1 Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <venstad@gmail.com>
Date: Tue, 13 Oct 2020 20:58:07 +0200
Subject: Remove unneeded threading in unit test

---
 .../com/yahoo/document/restapi/resource/DocumentV1ApiTest.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'vespaclient-container-plugin')

diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
index 6de21e82524..da09d076728 100644
--- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
+++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
@@ -170,7 +170,6 @@ public class DocumentV1ApiTest {
 
     @Test
     public void testResponses() {
-        Executor visitCompleter = Executors.newSingleThreadExecutor();
         RequestHandlerTestDriver driver = new RequestHandlerTestDriver(handler);
         // GET at non-existent path returns 404 with available paths
         var response = driver.sendRequest("http://localhost/document/v1/not-found");
@@ -200,7 +199,7 @@ public class DocumentV1ApiTest {
             ((DumpVisitorDataHandler) parameters.getLocalDataHandler()).onDocument(doc1, 0);
             ((DumpVisitorDataHandler) parameters.getLocalDataHandler()).onDocument(doc2, 0);
             ((DumpVisitorDataHandler) parameters.getLocalDataHandler()).onDocument(doc3, 0);
-            visitCompleter.execute(() -> parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.SUCCESS, "message"));
+            parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.SUCCESS, "message");
         });
         response = driver.sendRequest("http://localhost/document/v1?cluster=content&bucketSpace=default&wantedDocumentCount=1025&concurrency=123" +
                                       "&selection=all%20the%20things&fieldSet=[id]");
@@ -242,7 +241,7 @@ public class DocumentV1ApiTest {
         // GET with namespace, document type and group is a restricted visit.
         access.expect(parameters -> {
             assertEquals("(music) and (id.namespace=='space') and (id.group=='best\\'')", parameters.getDocumentSelection());
-            visitCompleter.execute(() -> parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.FAILURE, "error"));
+            parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.FAILURE, "error");
         });
         response = driver.sendRequest("http://localhost/document/v1/space/music/group/best%27");
         assertSameJson("{" +
@@ -255,7 +254,7 @@ public class DocumentV1ApiTest {
         // GET with namespace, document type and number is a restricted visit.
         access.expect(parameters -> {
             assertEquals("(music) and (id.namespace=='space') and (id.user==123)", parameters.getDocumentSelection());
-            visitCompleter.execute(() -> parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.ABORTED, "aborted"));
+            parameters.getControlHandler().onDone(VisitorControlHandler.CompletionCode.ABORTED, "aborted");
         });
         response = driver.sendRequest("http://localhost/document/v1/space/music/number/123");
         assertSameJson("{" +
-- 
cgit v1.2.3