svn commit: r1687062 - in /jackrabbit/oak/branches/1.2: ./ oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java

[reschke]

Author: reschke
Date: Tue Jun 23 13:51:01 2015
New Revision: 1687062

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

Modified:
    jackrabbit/oak/branches/1.2/   (props changed)
    
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java

Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 23 13:51:01 2015
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684868,1685023,1685370,1685552,1685589,1685840,1685999,1686097,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971
 ,1687053
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684868,1685023,1685370,1685552,1685589,1685840,1685999,1686097,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971
 ,1687053-1687054
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java?rev=1687062&r1=1687061&r2=1687062&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
 (original)
+++ 
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
 Tue Jun 23 13:51:01 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;
+        }
     }
 }