You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by th...@apache.org on 2012/03/14 13:14:24 UTC
svn commit: r1300520 - in
/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk: ./
api/ blobs/ store/
Author: thomasm
Date: Wed Mar 14 12:14:23 2012
New Revision: 1300520
URL: http://svn.apache.org/viewvc?rev=1300520&view=rev
Log:
Add missing @Override
Modified:
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConflictingMoveTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/MoveNodeTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/FileBlobStoreTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStoreTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/store/CopyHeadRevisionTest.java
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteTest.java?rev=1300520&r1=1300519&r2=1300520&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConcurrentWriteTest.java Wed Mar 14 12:14:23 2012
@@ -34,11 +34,13 @@ public class ConcurrentWriteTest extends
MicroKernel mk;
+ @Override
public void setUp() throws Exception {
mk = MicroKernelFactory.getInstance(URL);
mk.commit("/", "+ \"" + TEST_PATH.substring(1) + "\": {\"jcr:primaryType\":\"nt:unstructured\"}", mk.getHeadRevision(), null);
}
+ @Override
public void tearDown() throws InterruptedException {
String head = mk.commit("/", "- \"" + TEST_PATH.substring(1) + "\"", mk.getHeadRevision(), null);
System.out.println("new HEAD: " + head);
@@ -105,6 +107,7 @@ public class ConcurrentWriteTest extends
rand = new Random();
}
+ @Override
public void run() {
StringBuilder sb = new StringBuilder();
sb.append("+\"");
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConflictingMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConflictingMoveTest.java?rev=1300520&r1=1300519&r2=1300520&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConflictingMoveTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/ConflictingMoveTest.java Wed Mar 14 12:14:23 2012
@@ -36,6 +36,7 @@ public class ConflictingMoveTest extends
super(url);
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/MoveNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/MoveNodeTest.java?rev=1300520&r1=1300519&r2=1300520&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/MoveNodeTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/MoveNodeTest.java Wed Mar 14 12:14:23 2012
@@ -38,6 +38,7 @@ public class MoveNodeTest extends MultiM
super(url);
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java?rev=1300520&r1=1300519&r2=1300520&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java Wed Mar 14 12:14:23 2012
@@ -35,6 +35,7 @@ public class MicroKernelTest extends Mul
super(url);
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java?rev=1300520&r1=1300519&r2=1300520&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java Wed Mar 14 12:14:23 2012
@@ -46,6 +46,7 @@ public class DbBlobStoreTest extends Tes
protected AbstractBlobStore store;
private Connection sentinel;
+ @Override
public void setUp() throws Exception {
Class.forName("org.h2.Driver");
JdbcConnectionPool cp = JdbcConnectionPool.create("jdbc:h2:mem:", "", "");
@@ -57,6 +58,7 @@ public class DbBlobStoreTest extends Tes
this.store = blobStore;
}
+ @Override
public void tearDown() throws Exception {
if (sentinel != null) {
sentinel.close();
@@ -105,9 +107,11 @@ public class DbBlobStoreTest extends Tes
public void testCloseStream() throws Exception {
final AtomicBoolean closed = new AtomicBoolean();
InputStream in = new InputStream() {
+ @Override
public void close() {
closed.set(true);
}
+ @Override
public int read() throws IOException {
return -1;
}
@@ -119,9 +123,11 @@ public class DbBlobStoreTest extends Tes
public void testExceptionWhileReading() throws Exception {
final AtomicBoolean closed = new AtomicBoolean();
InputStream in = new InputStream() {
+ @Override
public void close() {
closed.set(true);
}
+ @Override
public int read() throws IOException {
throw new RuntimeException("abc");
}
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/FileBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/FileBlobStoreTest.java?rev=1300520&r1=1300519&r2=1300520&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/FileBlobStoreTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/FileBlobStoreTest.java Wed Mar 14 12:14:23 2012
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.mk.blobs;
*/
public class FileBlobStoreTest extends DbBlobStoreTest {
+ @Override
public void setUp() throws Exception {
FileBlobStore store = new FileBlobStore("target/temp");
store.setBlockSize(128);
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStoreTest.java?rev=1300520&r1=1300519&r2=1300520&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStoreTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStoreTest.java Wed Mar 14 12:14:23 2012
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.mk.blobs;
*/
public class MemoryBlobStoreTest extends DbBlobStoreTest {
+ @Override
public void setUp() throws Exception {
store = new MemoryBlobStore();
}
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java?rev=1300520&r1=1300519&r2=1300520&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java Wed Mar 14 12:14:23 2012
@@ -21,13 +21,10 @@ package org.apache.jackrabbit.mk.blobs;
*/
public class MongoBlobStoreTest extends DbBlobStoreTest {
+ @Override
public void setUp() throws Exception {
store = new MemoryBlobStore();
// store = new MongoBlobStore();
}
- public void testGarbageCollection() throws Exception {
- // TODO
- }
-
}
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/store/CopyHeadRevisionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/store/CopyHeadRevisionTest.java?rev=1300520&r1=1300519&r2=1300520&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/store/CopyHeadRevisionTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/store/CopyHeadRevisionTest.java Wed Mar 14 12:14:23 2012
@@ -18,21 +18,18 @@ package org.apache.jackrabbit.mk.store;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-
import java.io.File;
-
import org.apache.jackrabbit.mk.MicroKernelImpl;
import org.apache.jackrabbit.mk.Repository;
import org.apache.jackrabbit.mk.api.MicroKernelException;
import org.apache.jackrabbit.mk.fs.FileUtils;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
/**
* Use-case: start off a new revision store that contains just the head revision
* and its nodes.
- *
+ *
* TODO: if copying starts at some point in time and ends some time later, copy
* all revisions that are accessed in the meantime to the new store.
* This must be done in a way that ensures the integrity of the parental
@@ -46,22 +43,18 @@ public class CopyHeadRevisionTest {
FileUtils.deleteRecursive("target/mk2", false);
}
- @After
- public void tearDown() throws Exception {
- }
-
@Test
public void testCopyHeadRevisionToNewStore() throws Exception {
String[] revs = new String[3];
-
+
DefaultRevisionStore rsFrom = new DefaultRevisionStore();
rsFrom.initialize(new File("target/mk1"));
- DefaultRevisionStore rsTo = new DefaultRevisionStore();
+ DefaultRevisionStore rsTo = new DefaultRevisionStore();
rsTo.initialize(new File("target/mk2"));
CopyingGC gc = new CopyingGC(rsFrom, rsTo);
-
+
MicroKernelImpl mk = new MicroKernelImpl(new Repository(gc));
revs[0] = mk.commit("/", "+\"a\" : { \"c\":{}, \"d\":{} }", mk.getHeadRevision(), null);
revs[1] = mk.commit("/", "+\"b\" : {}", mk.getHeadRevision(), null);
@@ -70,13 +63,13 @@ public class CopyHeadRevisionTest {
gc.start();
revs[2] = mk.commit("/b", "+\"e\" : {}", mk.getHeadRevision(), null);
-
+
// Simulate a GC cycle stop
gc.stop();
-
+
// Assert head revision is contained after GC
assertEquals(mk.getHeadRevision(), revs[2]);
-
+
// Assert unused revision was GCed
try {
mk.getNodes("/", revs[0]);