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 mr...@apache.org on 2013/04/16 09:44:49 UTC
svn commit: r1468323 - in
/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk:
./ blob/ impl/ impl/command/
Author: mreutegg
Date: Tue Apr 16 07:44:48 2013
New Revision: 1468323
URL: http://svn.apache.org/r1468323
Log:
OAK-619 Lock-free MongoMK implementation
- remove unnecessary base class
Removed:
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/BaseMongoMicroKernelTest.java
Modified:
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKDiffTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthGridFSTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadGridFSTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteGridFSTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetChildCountTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetJournalTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetRevisionHistoryTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKLimitsTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWaitForCommitTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKDiffTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKDiffTest.java?rev=1468323&r1=1468322&r2=1468323&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKDiffTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKDiffTest.java Tue Apr 16 07:44:48 2013
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertTru
/**
* Tests for MicroKernel#diff
*/
-public class MongoMKDiffTest extends BaseMongoMicroKernelTest {
+public class MongoMKDiffTest extends AbstractMongoConnectionTest {
@Test
public void oak596() {
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthGridFSTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthGridFSTest.java?rev=1468323&r1=1468322&r2=1468323&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthGridFSTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthGridFSTest.java Tue Apr 16 07:44:48 2013
@@ -21,13 +21,13 @@ import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
+import org.apache.jackrabbit.mongomk.AbstractMongoConnectionTest;
import org.junit.Test;
/**
* Tests for {@code MongoMicroKernel#getLength(String)}
*/
-public class MongoMKGetLengthGridFSTest extends BaseMongoMicroKernelTest {
+public class MongoMKGetLengthGridFSTest extends AbstractMongoConnectionTest {
@Test
public void nonExistent() throws Exception {
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadGridFSTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadGridFSTest.java?rev=1468323&r1=1468322&r2=1468323&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadGridFSTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadGridFSTest.java Tue Apr 16 07:44:48 2013
@@ -21,14 +21,14 @@ import java.util.Arrays;
import junit.framework.Assert;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
+import org.apache.jackrabbit.mongomk.AbstractMongoConnectionTest;
import org.junit.Ignore;
import org.junit.Test;
/**
* Tests for {@code MongoMicroKernel#read(String, long, byte[], int, int)}
*/
-public class MongoMKReadGridFSTest extends BaseMongoMicroKernelTest {
+public class MongoMKReadGridFSTest extends AbstractMongoConnectionTest {
private byte[] blob;
private String blobId;
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteGridFSTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteGridFSTest.java?rev=1468323&r1=1468322&r2=1468323&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteGridFSTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteGridFSTest.java Tue Apr 16 07:44:48 2013
@@ -22,14 +22,14 @@ import static org.junit.Assert.assertTru
import java.io.ByteArrayInputStream;
import java.util.Arrays;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
+import org.apache.jackrabbit.mongomk.AbstractMongoConnectionTest;
import org.junit.Ignore;
import org.junit.Test;
/**
* Tests for {@code MongoMicroKernel#write(java.io.InputStream)}
*/
-public class MongoMKWriteGridFSTest extends BaseMongoMicroKernelTest {
+public class MongoMKWriteGridFSTest extends AbstractMongoConnectionTest {
@Test
public void small() throws Exception {
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetChildCountTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetChildCountTest.java?rev=1468323&r1=1468322&r2=1468323&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetChildCountTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetChildCountTest.java Tue Apr 16 07:44:48 2013
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.mongomk.im
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
+import org.apache.jackrabbit.mongomk.AbstractMongoConnectionTest;
import org.junit.Ignore;
import org.junit.Test;
@@ -27,7 +27,7 @@ import org.junit.Test;
* Tests getChildNodeCount.
*/
@Ignore("MongoMK does not implement getChildNodeCount()")
-public class MongoMKGetChildCountTest extends BaseMongoMicroKernelTest {
+public class MongoMKGetChildCountTest extends AbstractMongoConnectionTest {
@Test
public void noChild() throws Exception {
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetJournalTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetJournalTest.java?rev=1468323&r1=1468322&r2=1468323&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetJournalTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetJournalTest.java Tue Apr 16 07:44:48 2013
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.mongomk.im
import static org.junit.Assert.assertEquals;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
+import org.apache.jackrabbit.mongomk.AbstractMongoConnectionTest;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.junit.Ignore;
@@ -28,7 +28,7 @@ import org.junit.Test;
* Tests for {@code MongoMicroKernel#getJournal(String, String, String)}
*/
@Ignore("MongoMK does not implement getJournal()")
-public class MongoMKGetJournalTest extends BaseMongoMicroKernelTest {
+public class MongoMKGetJournalTest extends AbstractMongoConnectionTest {
@Test
public void simple() throws Exception {
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetRevisionHistoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetRevisionHistoryTest.java?rev=1468323&r1=1468322&r2=1468323&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetRevisionHistoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetRevisionHistoryTest.java Tue Apr 16 07:44:48 2013
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.mongomk.im
import static org.junit.Assert.assertEquals;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
+import org.apache.jackrabbit.mongomk.AbstractMongoConnectionTest;
import org.json.simple.JSONArray;
import org.junit.Ignore;
import org.junit.Test;
@@ -27,7 +27,7 @@ import org.junit.Test;
* Tests for getRevisionHistory
*/
@Ignore("MongoMK does not implement getRevisionHistory()")
-public class MongoMKGetRevisionHistoryTest extends BaseMongoMicroKernelTest {
+public class MongoMKGetRevisionHistoryTest extends AbstractMongoConnectionTest {
@Test
public void maxEntriesZero() throws Exception {
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKLimitsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKLimitsTest.java?rev=1468323&r1=1468322&r2=1468323&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKLimitsTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKLimitsTest.java Tue Apr 16 07:44:48 2013
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.mongomk.im
import java.util.Arrays;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
+import org.apache.jackrabbit.mongomk.AbstractMongoConnectionTest;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.junit.Ignore;
import org.junit.Test;
@@ -28,7 +28,7 @@ import org.junit.Test;
*
* Tests for MongoMicroKernel limits.
*/
-public class MongoMKLimitsTest extends BaseMongoMicroKernelTest {
+public class MongoMKLimitsTest extends AbstractMongoConnectionTest {
/**
* This test currently fails due to 1000 char limit in property sizes in
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWaitForCommitTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWaitForCommitTest.java?rev=1468323&r1=1468322&r2=1468323&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWaitForCommitTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWaitForCommitTest.java Tue Apr 16 07:44:48 2013
@@ -27,7 +27,7 @@ import java.util.concurrent.ScheduledFut
import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
+import org.apache.jackrabbit.mongomk.AbstractMongoConnectionTest;
import org.apache.jackrabbit.mongomk.MongoMK;
import org.junit.Before;
import org.junit.Ignore;
@@ -39,7 +39,7 @@ import com.mongodb.DB;
* Tests for {@code MongoMicroKernel#waitForCommit(String, long)}
*/
@Ignore("MongoMK does not implement waitForCommit()")
-public class MongoMKWaitForCommitTest extends BaseMongoMicroKernelTest {
+public class MongoMKWaitForCommitTest extends AbstractMongoConnectionTest {
private MicroKernel mk2;
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java?rev=1468323&r1=1468322&r2=1468323&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java Tue Apr 16 07:44:48 2013
@@ -21,7 +21,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
+import org.apache.jackrabbit.mongomk.AbstractMongoConnectionTest;
import org.apache.jackrabbit.mongomk.MongoMK;
import org.junit.Ignore;
import org.junit.Test;
@@ -29,7 +29,8 @@ import org.junit.Test;
/**
* Tests for multiple MongoMKs writing against the same DB in separate trees.
*/
-public class ConcurrentWriteMultipleMkMongoTest extends BaseMongoMicroKernelTest {
+public class ConcurrentWriteMultipleMkMongoTest extends
+ AbstractMongoConnectionTest {
@Test
public void testSmall() throws Exception {