svn commit: r1687054 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java

[reschke]

Author: reschke
Date: Tue Jun 23 13:40:57 2015
New Revision: 1687054

URL: http://svn.apache.org/r1687054
Log:
OAK-3024: NodeStoreFixture: add "toString()" for diagnostics, allow config of 
RDB JDBC connection via system properties

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java?rev=1687054&r1=1687053&r2=1687054&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
 Tue Jun 23 13:40:57 2015
@@ -50,13 +50,19 @@ public abstract class NodeStoreFixture {
     public static final NodeStoreFixture DOCUMENT_RDB = new NodeStoreFixture() 
{
 
         private DataSource ds;
+        private String jdbcUrl;
         private String fname = (new File("target")).isDirectory() ? "target/" 
: "";
 
+        private final String pUrl = System.getProperty("rdb.jdbc-url", 
"jdbc:h2:file:./{fname}oaktest");
+        private final String pUser = System.getProperty("rdb.jdbc-user", "sa");
+        private final String pPasswd = System.getProperty("rdb.jdbc-passwd", 
"");
+
         @Override
         public NodeStore createNodeStore() {
             String prefix = "T" + UUID.randomUUID().toString().replace("-",  
"");
             RDBOptions options = new 
RDBOptions().tablePrefix(prefix).dropTablesOnClose(true);
-            this.ds = RDBDataSourceFactory.forJdbcUrl("jdbc:h2:file:./" + 
fname + "oaktest", "sa", "");
+            this.jdbcUrl = pUrl.replace("{fname}", fname);
+            this.ds = RDBDataSourceFactory.forJdbcUrl(jdbcUrl, pUser, pPasswd);
             return new DocumentMK.Builder().
                     setPersistentCache("target/persistentCache,time").
                     setRDBConnection(this.ds, options).
@@ -81,6 +87,11 @@ public abstract class NodeStoreFixture {
                 }
             }
         }
+
+        @Override
+        public String toString() {
+            return "RDBDocumentStore on " + this.jdbcUrl;
+        }
     };
 
     public static NodeStoreFixture createDocumentFixture(final String uri) {
@@ -131,6 +142,11 @@ public abstract class NodeStoreFixture {
         @Override
         public void dispose(NodeStore nodeStore) {
         }
+
+        @Override
+        public String toString() {
+            return "SegmentStore";
+        }
     }
 
     public static class DocumentFixture extends NodeStoreFixture {
@@ -203,5 +219,10 @@ public abstract class NodeStoreFixture {
                 ((DocumentNodeStore) nodeStore).dispose();
             }
         }
+
+        @Override
+        public String toString() {
+            return "MongoDocumentStore on " + this.uri;
+        }
     }
 }