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 th...@apache.org on 2014/02/13 08:48:09 UTC
svn commit: r1567858 - in
/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs:
DbBlobStoreTest.java FileBlobStoreTest.java MemoryBlobStoreTest.java
Author: thomasm
Date: Thu Feb 13 07:48:09 2014
New Revision: 1567858
URL: http://svn.apache.org/r1567858
Log:
OAK-377 Data store garbage collection (fix tests)
Modified:
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/FileBlobStoreTest.java
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStoreTest.java
Modified: jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java?rev=1567858&r1=1567857&r2=1567858&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/DbBlobStoreTest.java Thu Feb 13 07:48:09 2014
@@ -28,6 +28,7 @@ public class DbBlobStoreTest extends Abs
private Connection sentinel;
private JdbcConnectionPool cp;
+ @Override
public void setUp() throws Exception {
Class.forName("org.h2.Driver");
cp = JdbcConnectionPool.create("jdbc:h2:mem:", "", "");
@@ -39,6 +40,7 @@ public class DbBlobStoreTest extends Abs
this.store = blobStore;
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
if (sentinel != null) {
Modified: jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/FileBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/FileBlobStoreTest.java?rev=1567858&r1=1567857&r2=1567858&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/FileBlobStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/FileBlobStoreTest.java Thu Feb 13 07:48:09 2014
@@ -16,16 +16,27 @@
*/
package org.apache.jackrabbit.mk.blobs;
+import java.io.File;
+
+import org.apache.commons.io.FileUtils;
+
/**
* Tests the FileBlobStore implementation.
*/
public class FileBlobStoreTest extends AbstractBlobStoreTest {
- public void setUp() throws Exception {
+ @Override
+ public void setUp() {
FileBlobStore store = new FileBlobStore("target/temp");
store.setBlockSize(128);
store.setBlockSizeMin(48);
this.store = store;
}
+ @Override
+ public void tearDown() throws Exception {
+ store = null;
+ FileUtils.deleteDirectory(new File("target/temp"));
+ }
+
}
Modified: jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStoreTest.java?rev=1567858&r1=1567857&r2=1567858&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStoreTest.java Thu Feb 13 07:48:09 2014
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.mk.blobs;
*/
public class MemoryBlobStoreTest extends AbstractBlobStoreTest {
+ @Override
public void setUp() throws Exception {
store = new MemoryBlobStore();
store.setBlockSize(128);