svn commit: r1745106 - /jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3Ds.java

[am...@apache.org]

Author: amitj
Date: Mon May 23 03:18:22 2016
New Revision: 1745106

URL: http://svn.apache.org/viewvc?rev=1745106&view=rev
Log:
OAK-4377:  TestS3Ds overwrites system property 'config'

Modified:
    jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3Ds.java

Modified: jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3Ds.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3Ds.java?rev=1745106&r1=1745105&r2=1745106&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3Ds.java (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/aws/s3/TestS3Ds.java Mon May 23 03:18:22 2016
@@ -24,6 +24,7 @@ import java.util.Properties;
 
 import javax.jcr.RepositoryException;
 
+import com.google.common.base.Strings;
 import org.apache.jackrabbit.core.data.Backend;
 import org.apache.jackrabbit.core.data.CachingDataStore;
 import org.apache.jackrabbit.core.data.TestCaseBase;
@@ -46,6 +47,8 @@ public class TestS3Ds extends TestCaseBa
 
     protected static final Logger LOG = LoggerFactory.getLogger(TestS3Ds.class);
 
+    private static final String DEFAULT_CONFIG_PATH = "./src/test/resources/aws.properties";
+
     private Date startTime = null;
 
     protected Properties props;
@@ -53,13 +56,14 @@ public class TestS3Ds extends TestCaseBa
     protected String config;
 
     public TestS3Ds() throws IOException {
-        System.setProperty(
-            TestCaseBase.CONFIG,
-            "./src/test/resources/aws.properties");
         config = System.getProperty(CONFIG);
-        props = Utils.readConfig(System.getProperty(CONFIG));
+        if (Strings.isNullOrEmpty(config)) {
+            config = DEFAULT_CONFIG_PATH;
+        }
+        props = Utils.readConfig(config);
     }
 
+
     @Override
     protected void setUp() throws Exception {
         startTime = new Date();
@@ -138,4 +142,4 @@ public class TestS3Ds extends TestCaseBa
         tmx.shutdownNow();
         s3service.shutdown();
     }
-}
\ No newline at end of file
+}