Merge remote-tracking branch 'origin/master'

1 files changed, 27 insertions, 2 deletions

diff --git a/src/test/scala/xyz/driver/core/FileTest.scala b/src/test/scala/xyz/driver/core/FileTest.scala
index 67878b4..717233e 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)
@@ -150,13 +166,19 @@ class FileTest extends FlatSpec with Matchers with MockitoSugar {
       Iterable[Blob](blobMock).asJava,
       Iterable[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)
+    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]))
@@ -167,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 {