Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(s3): expose inMemory flag in test constructor to fix S3 disk-persistence tests (#136)

Juan Diego López522b3696a6ae
diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java b/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java
index 6666e933ed..311552d7b5 100644
--- a/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java
+++ b/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java
@@ -70,8 +70,8 @@ public class S3Service {
*/
S3Service(StorageBackend<String, Bucket> bucketStore,
StorageBackend<String, S3Object> objectStore,
- Path dataRoot) {
- this(bucketStore, objectStore, dataRoot, true, null, null, null, "http://localhost:4566",
+ Path dataRoot, boolean inMemory) {
+ this(bucketStore, objectStore, dataRoot, inMemory, null, null, null, "http://localhost:4566",
new ObjectMapper());
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3MultipartServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3MultipartServiceTest.java
index be17c625c9..31e34bf7b0 100644
--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3MultipartServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3MultipartServiceTest.java
@@ -27,7 +27,7 @@ class S3MultipartServiceTest {
@BeforeEach
void setUp() {
- s3Service = new S3Service(new InMemoryStorage<>(), new InMemoryStorage<>(), tempDir);
+ s3Service = new S3Service(new InMemoryStorage<>(), new InMemoryStorage<>(), tempDir, true);
s3Service.createBucket("test-bucket", "us-east-1");
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTest.java
index 013c9ab2ee..6ddbc65e5a 100644
--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTest.java
@@ -29,7 +29,7 @@ class S3ServiceTest {
@BeforeEach
void setUp() {
Path dataRoot = tempDir.resolve("s3");
- s3Service = new S3Service(new InMemoryStorage<>(), new InMemoryStorage<>(), dataRoot);
+ s3Service = new S3Service(new InMemoryStorage<>(), new InMemoryStorage<>(), dataRoot, false);
}
@Test
diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningServiceTest.java
index c406dc7991..e95ea8013b 100644
--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningServiceTest.java
@@ -22,7 +22,7 @@ class S3VersioningServiceTest {
@BeforeEach
void setUp() {
- s3Service = new S3Service(new InMemoryStorage<>(), new InMemoryStorage<>(), tempDir);
+ s3Service = new S3Service(new InMemoryStorage<>(), new InMemoryStorage<>(), tempDir, true);
s3Service.createBucket("versioned-bucket", "us-east-1");
}