svn commit: r1325357 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk: large/NodeVersionTest.java simple/NodeVersionTest.java

[ju...@apache.org]

Author: jukka
Date: Thu Apr 12 16:30:13 2012
New Revision: 1325357

URL: http://svn.apache.org/viewvc?rev=1325357&view=rev
Log:
OAK-12: Implement a test suite for the MicroKernel

NodeVersionTest is specific to SimpleKernelImpl, so move it to .simple and don't extend MultiMkTestBase

Added:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java   (contents, props changed)
      - copied, changed from r1325354, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/NodeVersionTest.java
Removed:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/NodeVersionTest.java

Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java (from r1325354, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/NodeVersionTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/NodeVersionTest.java&r1=1325354&r2=1325357&rev=1325357&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/NodeVersionTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java Thu Apr 12 16:30:13 2012
@@ -14,49 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.mk.large;
+package org.apache.jackrabbit.mk.simple;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import org.apache.jackrabbit.mk.MultiMkTestBase;
+import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.apache.jackrabbit.mk.simple.NodeImpl;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
 /**
  * Test moving nodes.
  */
-@RunWith(Parameterized.class)
-public class NodeVersionTest extends MultiMkTestBase {
+public class NodeVersionTest {
 
-    private String head;
-
-    public NodeVersionTest(String url) {
-        super(url);
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        super.setUp();
-    }
-
-    @After
-    public void tearDown() throws InterruptedException {
-        if (isSimpleKernel(mk)) {
-            head = mk.commit("/:root/head/config", "^ \"nodeVersion\": false", head, "");
-            head = mk.commit("/:root/head/config", "^ \"nodeVersion\": null", head, "");
-        }
-        super.tearDown();
-    }
+    private final MicroKernel mk = new SimpleKernelImpl("mem:NodeVersionTest");
 
     @Test
     public void nodeVersion() {
-        if (!isSimpleKernel(mk)) {
-            return;
-        }
         String head = mk.getHeadRevision();
         head = mk.commit("/:root/head/config", "^ \"nodeVersion\": true", head, "");
 

Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native