diff options
| author | Vlad Uspensky <v.uspenskiy@icloud.com> | 2017-07-06 15:05:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 15:05:35 -0700 |
| commit | c83566d7e22be806a6fc490b670eb5024a0b882d (patch) | |
| tree | 33c48ae644866491a5b6b5cb9695b9c2e37cf327 /src/test/scala/xyz/driver/core/FileTest.scala | |
| parent | 6fa693851222057d459d23330474ea83a3fb73f1 (diff) | |
| parent | d967ca5b62bd790f0ff750d2f94e3f392cc1f8ad (diff) | |
| download | driver-core-c83566d7e22be806a6fc490b670eb5024a0b882d.tar.gz driver-core-c83566d7e22be806a6fc490b670eb5024a0b882d.tar.bz2 driver-core-c83566d7e22be806a6fc490b670eb5024a0b882d.zip | |
Merge pull request #49 from drivergroup/pubsubv0.13.16
Pubsub
Diffstat (limited to 'src/test/scala/xyz/driver/core/FileTest.scala')
| -rw-r--r-- | src/test/scala/xyz/driver/core/FileTest.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/scala/xyz/driver/core/FileTest.scala b/src/test/scala/xyz/driver/core/FileTest.scala index 246cd95..717233e 100644 --- a/src/test/scala/xyz/driver/core/FileTest.scala +++ b/src/test/scala/xyz/driver/core/FileTest.scala @@ -133,7 +133,7 @@ class FileTest extends FlatSpec with Matchers with MockitoSugar { } "Google Cloud Storage" should "upload and download files" in { - import com.google.cloud.Page + import com.google.api.gax.paging.Page import com.google.cloud.storage.{Blob, Bucket, Storage} import Bucket.BlobWriteOption import Storage.BlobListOption @@ -162,9 +162,9 @@ class FileTest extends FlatSpec with Matchers with MockitoSugar { val gcsStorage = new GcsStorage(gcsMock, testBucket, scala.concurrent.ExecutionContext.global) when(pageMock.iterateAll()).thenReturn( - Iterator[Blob]().asJava, - Iterator[Blob](blobMock).asJava, - Iterator[Blob]().asJava + Iterable[Blob]().asJava, + Iterable[Blob](blobMock).asJava, + Iterable[Blob]().asJava ) when(gcsMock.list(testBucket.value, BlobListOption.currentDirectory(), BlobListOption.prefix(s"$testDirPath/"))) .thenReturn(pageMock) |