1 files changed, 12 insertions, 6 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
index c17b68c6d12..373b39c8365 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/filedistribution/FileServerTest.java
@@ -61,9 +61,9 @@ public class FileServerTest {
         String dir = "123";
         assertFalse(fileServer.hasFile(dir));
         FileReferenceDownload foo = new FileReferenceDownload(new FileReference(dir), "test");
-        assertFalse(fileServer.hasFileDownloadIfNeeded(foo));
+        assertFalse(fileServer.getFileDownloadIfNeeded(foo).isPresent());
         writeFile(dir);
-        assertTrue(fileServer.hasFileDownloadIfNeeded(foo));
+        assertTrue(fileServer.getFileDownloadIfNeeded(foo).isPresent());
     }
 
     @Test
@@ -79,7 +79,9 @@ public class FileServerTest {
         File dir = getFileServerRootDir();
         IOUtils.writeFile(dir + "/12y/f1", "dummy-data", true);
         CompletableFuture<byte []> content = new CompletableFuture<>();
-        fileServer.startFileServing(new FileReference("12y"), new FileReceiver(content), Set.of(gzip));
+        FileReference fileReference = new FileReference("12y");
+        var file = fileServer.getFileDownloadIfNeeded(new FileReferenceDownload(fileReference, "test"));
+        fileServer.startFileServing(fileReference, file.get(), new FileReceiver(content), Set.of(gzip));
         assertEquals(new String(content.get()), "dummy-data");
     }
 
@@ -90,7 +92,9 @@ public class FileServerTest {
         File dir = getFileServerRootDir();
         IOUtils.writeFile(dir + "/subdir/12z/f1", "dummy-data-2", true);
         CompletableFuture<byte []> content = new CompletableFuture<>();
-        fileServer.startFileServing(new FileReference("subdir"), new FileReceiver(content), Set.of(gzip, lz4));
+        FileReference fileReference = new FileReference("subdir");
+        var file = fileServer.getFileDownloadIfNeeded(new FileReferenceDownload(fileReference, "test"));
+        fileServer.startFileServing(fileReference, file.get(), new FileReceiver(content), Set.of(gzip, lz4));
 
         // Decompress with lz4 and check contents
         var compressor = new FileReferenceCompressor(FileReferenceData.Type.compressed, lz4);
@@ -139,14 +143,16 @@ public class FileServerTest {
         FailingFileReceiver fileReceiver = new FailingFileReceiver(content);
 
         // Should fail the first time, see FailingFileReceiver
+        FileReference reference = new FileReference("12y");
+        var file = fileServer.getFileDownloadIfNeeded(new FileReferenceDownload(reference, "test"));
         try {
-            fileServer.startFileServing(new FileReference("12y"), fileReceiver, Set.of(gzip));
+            fileServer.startFileServing(reference, file.get(), fileReceiver, Set.of(gzip));
             fail("Should have failed");
         } catch (RuntimeException e) {
             // expected
         }
 
-        fileServer.startFileServing(new FileReference("12y"), fileReceiver, Set.of(gzip));
+        fileServer.startFileServing(reference, file.get(), fileReceiver, Set.of(gzip));
         assertEquals(new String(content.get()), "dummy-data");
     }