svn commit: r1681105 - /jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegradeTest.java

[thomasm]

Author: thomasm
Date: Fri May 22 13:18:33 2015
New Revision: 1681105

URL: http://svn.apache.org/r1681105
Log:
OAK-2876 Test failure: RepositorySidegradeTest.verifyAsync (NPE)

Modified:
    
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegradeTest.java

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegradeTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegradeTest.java?rev=1681105&r1=1681104&r2=1681105&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegradeTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/RepositorySidegradeTest.java
 Fri May 22 13:18:33 2015
@@ -69,8 +69,6 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class RepositorySidegradeTest {
@@ -83,35 +81,22 @@ public class RepositorySidegradeTest {
         new Random().nextBytes(BINARY);
     }
     
-    protected static final Credentials CREDENTIALS = new 
SimpleCredentials("admin", "admin".toCharArray());
+    private static final Credentials CREDENTIALS = new 
SimpleCredentials("admin", "admin".toCharArray());
 
     private NodeStore targetNodeStore;
-    private static Repository targetRepository;
-
-    
-    @BeforeClass
-    public static void init() {
-        // ensure that we create a new repository for the next test
-        targetRepository = null;
-    }
+    private Repository targetRepository;
 
     @Before
     public synchronized void upgradeRepository() throws Exception {
-        if (targetRepository == null) {
-            targetNodeStore = new SegmentNodeStore();
-            targetRepository = new Jcr(new 
Oak(targetNodeStore)).createRepository();
-            NodeStore source = createSourceContent();
-            RepositorySidegrade sidegrade = new RepositorySidegrade(source, 
targetNodeStore);
-            sidegrade.copy();
-        }
-    }
-    
-    public Repository getTargetRepository() {
-        return targetRepository;
+        targetNodeStore = new SegmentNodeStore();
+        targetRepository = new Jcr(new 
Oak(targetNodeStore)).createRepository();
+        NodeStore source = createSourceContent();
+        RepositorySidegrade sidegrade = new RepositorySidegrade(source, 
targetNodeStore);
+        sidegrade.copy();
     }
     
     public JackrabbitSession createAdminSession() throws RepositoryException {
-        return (JackrabbitSession) getTargetRepository().login(CREDENTIALS);
+        return (JackrabbitSession) targetRepository.login(CREDENTIALS);
     }
     
     // OAK-2869
@@ -123,7 +108,6 @@ public class RepositorySidegradeTest {
     
     // OAK-2869
     @Test
-    @Ignore("OAK-2876")  // FIXME See OAK-2876
     public void verifyAsync() throws Exception {
         NodeState state = targetNodeStore.getRoot().getChildNode(":async");
         assertFalse(state.hasProperty("test"));