svn commit: r1738743 - in /jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak: NodeStoreFixtures.java spi/state/NodeStoreTest.java

[mr...@apache.org]

Author: mreutegg
Date: Tue Apr 12 09:30:28 2016
New Revision: 1738743

URL: http://svn.apache.org/viewvc?rev=1738743&view=rev
Log:
OAK-4187: Add DOCUMENT_MEM to NodeStoreFixtures

Modified:
    jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
    jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java

Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java?rev=1738743&r1=1738742&r2=1738743&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java Tue Apr 12 09:30:28 2016
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.jackrabbit.oak.commons.FixturesHelper;
+import org.apache.jackrabbit.oak.fixture.DocumentMemoryFixture;
 import org.apache.jackrabbit.oak.fixture.DocumentMongoFixture;
 import org.apache.jackrabbit.oak.fixture.DocumentRdbFixture;
 import org.apache.jackrabbit.oak.fixture.MemoryFixture;
@@ -39,6 +40,8 @@ public class NodeStoreFixtures {
 
     public static final NodeStoreFixture DOCUMENT_RDB = new DocumentRdbFixture();
 
+    public static final NodeStoreFixture DOCUMENT_MEM = new DocumentMemoryFixture();
+
     public static Collection<Object[]> asJunitParameters(Set<FixturesHelper.Fixture> fixtures) {
         List<NodeStoreFixture> configuredFixtures = new ArrayList<NodeStoreFixture>();
         if (fixtures.contains(FixturesHelper.Fixture.DOCUMENT_NS)) {
@@ -53,6 +56,9 @@ public class NodeStoreFixtures {
         if (fixtures.contains(FixturesHelper.Fixture.DOCUMENT_RDB)) {
             configuredFixtures.add(DOCUMENT_RDB);
         }
+        if (fixtures.contains(FixturesHelper.Fixture.DOCUMENT_MEM)) {
+            configuredFixtures.add(DOCUMENT_MEM);
+        }
 
         Collection<Object[]> result = new ArrayList<Object[]>();
         for (NodeStoreFixture f : configuredFixtures) {

Modified: jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java?rev=1738743&r1=1738742&r2=1738743&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java Tue Apr 12 09:30:28 2016
@@ -101,6 +101,7 @@ public class NodeStoreTest extends OakBa
     @Test
     public void addExistingNode() throws CommitFailedException {
         // FIXME OAK-1550 Incorrect handling of addExistingNode conflict in NodeStore
+        assumeTrue(fixture != NodeStoreFixtures.DOCUMENT_MEM);
         assumeTrue(fixture != NodeStoreFixtures.DOCUMENT_NS);
         assumeTrue(fixture != NodeStoreFixtures.DOCUMENT_RDB);