diff options
author | Jakob Odersky <jakob@driver.xyz> | 2017-06-21 15:06:20 -0700 |
---|---|---|
committer | Jakob Odersky <jakob@driver.xyz> | 2017-06-21 16:40:27 -0700 |
commit | e41050b75308aab2736eea11b67bf9387a90dfe5 (patch) | |
tree | 4138f96ec7381b54c1339cb6577198ae067486e3 /src/test/scala | |
parent | c5bc3df97dd7670d6271efe440068b44f6521562 (diff) | |
download | driver-core-e41050b75308aab2736eea11b67bf9387a90dfe5.tar.gz driver-core-e41050b75308aab2736eea11b67bf9387a90dfe5.tar.bz2 driver-core-e41050b75308aab2736eea11b67bf9387a90dfe5.zip |
Add file existence checking to file storagev0.13.15
Diffstat (limited to 'src/test/scala')
-rw-r--r-- | src/test/scala/xyz/driver/core/FileTest.scala | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/test/scala/xyz/driver/core/FileTest.scala b/src/test/scala/xyz/driver/core/FileTest.scala index c35eb5b..246cd95 100644 --- a/src/test/scala/xyz/driver/core/FileTest.scala +++ b/src/test/scala/xyz/driver/core/FileTest.scala @@ -54,16 +54,25 @@ class FileTest extends FlatSpec with Matchers with MockitoSugar { when(amazonS3Mock.listObjectsV2(any[ListObjectsV2Request]())).thenReturn(s3ResultsMock) when(amazonS3Mock.putObject(testBucket.value, testFilePath.toString, sourceTestFile)).thenReturn(s3PutMock) when(amazonS3Mock.getObject(any[GetObjectRequest](), any[File]())).thenReturn(s3ObjectMetadataMock) + when(amazonS3Mock.doesObjectExist(testBucket.value, testFilePath.toString)).thenReturn( + false, // before file is uploaded + true // after file is uploaded + ) val s3Storage = new S3Storage(amazonS3Mock, testBucket, scala.concurrent.ExecutionContext.global) val filesBefore = Await.result(s3Storage.list(testDirPath).run, 10 seconds) filesBefore shouldBe empty + val fileExistsBeforeUpload = Await.result(s3Storage.exists(testFilePath), 10 seconds) + fileExistsBeforeUpload should be(false) + Await.result(s3Storage.upload(sourceTestFile, testFilePath), 10 seconds) val filesAfterUpload = Await.result(s3Storage.list(testDirPath).run, 10 seconds) filesAfterUpload.size should be(1) + val fileExistsAfterUpload = Await.result(s3Storage.exists(testFilePath), 10 seconds) + fileExistsAfterUpload should be(true) val uploadedFileLine = filesAfterUpload.head uploadedFileLine.name should be(Name[File](testFileName)) uploadedFileLine.location should be(testFilePath) @@ -96,10 +105,17 @@ class FileTest extends FlatSpec with Matchers with MockitoSugar { val filesBefore = Await.result(fileStorage.list(testDirPath).run, 10 seconds) filesBefore shouldBe empty + val fileExistsBeforeUpload = Await.result(fileStorage.exists(testFilePath), 10 seconds) + fileExistsBeforeUpload should be(false) + Await.result(fileStorage.upload(sourceTestFile, testFilePath), 10 seconds) val filesAfterUpload = Await.result(fileStorage.list(testDirPath).run, 10 seconds) filesAfterUpload.size should be(1) + + val fileExistsAfterUpload = Await.result(fileStorage.exists(testFilePath), 10 seconds) + fileExistsAfterUpload should be(true) + val uploadedFileLine = filesAfterUpload.head uploadedFileLine.name should be(Name[File]("uploadTestFile")) uploadedFileLine.location should be(testFilePath) @@ -152,10 +168,17 @@ class FileTest extends FlatSpec with Matchers with MockitoSugar { ) when(gcsMock.list(testBucket.value, BlobListOption.currentDirectory(), BlobListOption.prefix(s"$testDirPath/"))) .thenReturn(pageMock) + when(gcsMock.get(testBucket.value, testFilePath.toString)).thenReturn( + null, // before file is uploaded + blobMock // after file is uploaded + ) val filesBefore = Await.result(gcsStorage.list(testDirPath).run, 10 seconds) filesBefore shouldBe empty + val fileExistsBeforeUpload = Await.result(gcsStorage.exists(testFilePath), 10 seconds) + fileExistsBeforeUpload should be(false) + when(gcsMock.get(testBucket.value)).thenReturn(bucketMock) when(gcsMock.get(testBucket.value, testFilePath.toString)).thenReturn(blobMock) when(bucketMock.create(org.mockito.Matchers.eq(testFileName), any[FileInputStream], any[BlobWriteOption])) @@ -166,6 +189,9 @@ class FileTest extends FlatSpec with Matchers with MockitoSugar { val filesAfterUpload = Await.result(gcsStorage.list(testDirPath).run, 10 seconds) filesAfterUpload.size should be(1) + val fileExistsAfterUpload = Await.result(gcsStorage.exists(testFilePath), 10 seconds) + fileExistsAfterUpload should be(true) + val downloadedFile = Await.result(gcsStorage.download(testFilePath).run, 10 seconds) downloadedFile shouldBe defined downloadedFile.foreach { |