From f6a67a8400e12de6e0ae83d0b4c744e07fc4901c Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Mon, 19 Jun 2017 11:40:34 -0700 Subject: Check for null values in gcs directory listing GCS: when listing, always assume the path is a directory GCS: fix unit test --- src/test/scala/xyz/driver/core/FileTest.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/test/scala/xyz/driver/core') diff --git a/src/test/scala/xyz/driver/core/FileTest.scala b/src/test/scala/xyz/driver/core/FileTest.scala index a1b0329..c35eb5b 100644 --- a/src/test/scala/xyz/driver/core/FileTest.scala +++ b/src/test/scala/xyz/driver/core/FileTest.scala @@ -150,8 +150,7 @@ class FileTest extends FlatSpec with Matchers with MockitoSugar { Iterator[Blob](blobMock).asJava, Iterator[Blob]().asJava ) - when( - gcsMock.list(testBucket.value, BlobListOption.currentDirectory(), BlobListOption.prefix(testDirPath.toString))) + when(gcsMock.list(testBucket.value, BlobListOption.currentDirectory(), BlobListOption.prefix(s"$testDirPath/"))) .thenReturn(pageMock) val filesBefore = Await.result(gcsStorage.list(testDirPath).run, 10 seconds) -- cgit v1.2.3