OAK-11310: add properties before datastore is initialized

apache · Dec 14, 2024 · 8c95416 · 8c95416
1 parent 104c0b4
commit 8c95416
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...b-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DSWithSmallCache.java b/...b-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DSWithSmallCache.java
@@ -38,7 +38,7 @@ public class TestS3DSWithSmallCache extends TestS3Ds {
     @Override
     @Before
     public void setUp() throws Exception {
-        super.setUp();
         props.setProperty("cacheSize", String.valueOf(dataLength * 10));
+        super.setUp();
     }
 }
diff --git a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3Ds.java
@@ -100,7 +100,7 @@ public class TestS3Ds extends AbstractDataStoreTest {
     private static Date overallStartTime = getBackdatedDate();
     private Date thisTestStartTime = null;
 
-    protected Properties props;
+    protected Properties props = new Properties();
 
     protected String bucket;
 
@@ -127,7 +127,7 @@ public static void assumptions() {
     @Override
     @Before
     public void setUp() throws Exception {
-        props = getS3Config();
+        props.putAll(getS3Config());
         thisTestStartTime = getBackdatedDate();
         bucket = randomGen.nextInt(9999) + "-" +
                 randomGen.nextInt(9999) + "-s3ds-unittest-autogenerated";

diff --git a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DsCacheOff.java b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/TestS3DsCacheOff.java
@@ -36,7 +36,7 @@ public class TestS3DsCacheOff extends TestS3Ds {
     @Override
     @Before
     public void setUp() throws Exception {
-        super.setUp();
         props.setProperty("cacheSize", "0");
+        super.setUp();
     }
 }