You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2014/12/01 13:57:28 UTC
svn commit: r1642675 - in
/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr:
AbstractRepositoryTest.java FixturesHelper.java NodeStoreFixture.java
tck/TCKBase.java
Author: reschke
Date: Mon Dec 1 12:57:27 2014
New Revision: 1642675
URL: http://svn.apache.org/r1642675
Log:
OAK-1941 - rename RDB fixture for consistency
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/FixturesHelper.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java?rev=1642675&r1=1642674&r2=1642675&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java Mon Dec 1 12:57:27 2014
@@ -78,8 +78,8 @@ public abstract class AbstractRepository
if (FIXTURES.contains(Fixture.SEGMENT_MK)) {
result.add(new Object[] { NodeStoreFixture.SEGMENT_MK });
}
- if (FIXTURES.contains(Fixture.DOCUMENT_JDBC)) {
- result.add(new Object[] { NodeStoreFixture.DOCUMENT_JDBC });
+ if (FIXTURES.contains(Fixture.DOCUMENT_RDB)) {
+ result.add(new Object[] { NodeStoreFixture.DOCUMENT_RDB });
}
return result;
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/FixturesHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/FixturesHelper.java?rev=1642675&r1=1642674&r2=1642675&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/FixturesHelper.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/FixturesHelper.java Mon Dec 1 12:57:27 2014
@@ -42,9 +42,9 @@ public class FixturesHelper {
* default fixtures when no {@code ns-fixtures} is provided
*/
public static enum Fixture {
- DOCUMENT_MK, DOCUMENT_NS, SEGMENT_MK, DOCUMENT_JDBC
+ DOCUMENT_MK, DOCUMENT_NS, SEGMENT_MK, DOCUMENT_RDB
};
-
+
private static final Set<Fixture> FIXTURES;
static {
String raw = System.getProperty(NS_FIXTURES, "");
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=1642675&r1=1642674&r2=1642675&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 Mon Dec 1 12:57:27 2014
@@ -77,7 +77,7 @@ public abstract class NodeStoreFixture {
public static final NodeStoreFixture DOCUMENT_NS = createDocumentFixture("mongodb://localhost:27017/oak");
- public static final NodeStoreFixture DOCUMENT_JDBC = new NodeStoreFixture() {
+ public static final NodeStoreFixture DOCUMENT_RDB = new NodeStoreFixture() {
private DataSource ds;
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java?rev=1642675&r1=1642674&r2=1642675&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/tck/TCKBase.java Mon Dec 1 12:57:27 2014
@@ -58,12 +58,12 @@ public abstract class TCKBase extends Te
if (FIXTURES.contains(Fixture.DOCUMENT_NS)) {
if (OakMongoNSRepositoryStub.isMongoDBAvailable()) {
Setup.wrap(this, OakMongoNSRepositoryStub.class.getName());
- }
+ }
}
- if (FIXTURES.contains(Fixture.DOCUMENT_JDBC)) {
+ if (FIXTURES.contains(Fixture.DOCUMENT_RDB)) {
if (OakDocumentRDBRepositoryStub.isAvailable()) {
Setup.wrap(this, OakDocumentRDBRepositoryStub.class.getName());
- }
+ }
}
}