diff options
author | Harald Musum <musum@oath.com> | 2017-11-07 16:56:09 +0100 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2017-11-07 16:56:09 +0100 |
commit | 501c7a25ffc092d47985b0b44a17132e444414d8 (patch) | |
tree | 4270c823a5d7949567a013a8464ccf6fd83996ac /config-proxy | |
parent | b3c80e89982fdf07115b276b737ec9f535c231a9 (diff) |
Fix test to not read from queue
Diffstat (limited to 'config-proxy')
3 files changed, 9 insertions, 6 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDownloader.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDownloader.java index b9b2aa95988..f3c694f31ab 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDownloader.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDownloader.java @@ -147,7 +147,7 @@ public class FileDownloader { } Set<FileReference> queuedDownloads() { - return fileReferenceDownloader.queuedForDownload(); + return fileReferenceDownloader.queuedDownloads(); } } diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileReferenceDownloader.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileReferenceDownloader.java index af5e22ec1bf..917374740f1 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileReferenceDownloader.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileReferenceDownloader.java @@ -59,7 +59,8 @@ class FileReferenceDownloader { this.downloadDirectory = downloadDirectory; this.connectionPool = connectionPool; this.downloadTimeout = timeout; - readFromQueueExecutor.submit(this::readFromQueue); + if (connectionPool != null) + readFromQueueExecutor.submit(this::readFromQueue); } private synchronized Optional<File> startDownload(FileReference fileReference, @@ -95,7 +96,7 @@ class FileReferenceDownloader { } } - synchronized Set<FileReference> queuedForDownload() { + synchronized Set<FileReference> queuedDownloads() { return downloadQueue.stream() .map(FileReferenceDownload::fileReference) .collect(Collectors.toCollection(LinkedHashSet::new)); diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/filedistribution/FileDownloaderTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/filedistribution/FileDownloaderTest.java index dd7923acd53..18d49e9a224 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/filedistribution/FileDownloaderTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/filedistribution/FileDownloaderTest.java @@ -18,7 +18,9 @@ import java.time.Duration; import java.util.Arrays; import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; import java.util.Optional; +import java.util.Set; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -107,14 +109,14 @@ public class FileDownloaderTest { @Test public void setFilesToDownload() throws IOException { File downloadDir = Files.createTempDirectory("filedistribution").toFile(); - MockConnection configSource = new MockConnection(); - FileDownloader fileDownloader = new FileDownloader(configSource, downloadDir, Duration.ofMillis(200)); + FileDownloader fileDownloader = new FileDownloader(null, downloadDir, Duration.ofMillis(200)); FileReference foo = new FileReference("foo"); FileReference bar = new FileReference("bar"); List<FileReference> fileReferences = Arrays.asList(foo, bar); fileDownloader.queueForDownload(fileReferences); - assertEquals(new LinkedHashSet<>(fileReferences), fileDownloader.queuedDownloads()); + // All requested file references should be in queue (since FileDownloader was created without ConnectionPool) + assertEquals(new LinkedHashSet<>(fileReferences), new LinkedHashSet<>(fileDownloader.queuedDownloads())); // Verify download status assertDownloadStatus(fileDownloader, foo, 0.0); |