Author: amitj
Date: Thu Feb 12 06:43:56 2015
New Revision: 1659155
URL: http://svn.apache.org/r1659155
Log:
OAK-2503: DataStore: Cleanup tests
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreUtils.java
(contents, props changed)
- copied, changed from r1659030,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DataStoreUtils.java
Removed:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DataStoreUtils.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreGetLengthTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreReadTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreWriteTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/MongoDataStoreBlobGCTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCTest.java
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoCloudBlobMicroKernelFixture.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java?rev=1659155&r1=1659154&r2=1659155&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStoreTest.java
Thu Feb 12 06:43:56 2015
@@ -36,7 +36,6 @@ import org.apache.jackrabbit.core.data.D
import org.apache.jackrabbit.core.data.DataRecord;
import org.apache.jackrabbit.core.data.DataStore;
import org.apache.jackrabbit.core.data.DataStoreException;
-import org.apache.jackrabbit.oak.plugins.document.blob.ds.DataStoreUtils;
import org.apache.jackrabbit.oak.spi.blob.AbstractBlobStoreTest;
import org.apache.jackrabbit.oak.spi.blob.BlobStoreInputStream;
import org.junit.After;
@@ -194,7 +193,7 @@ public class DataStoreBlobStoreTest exte
@After
@Override
public void tearDown() throws Exception {
- FileUtils.deleteDirectory(new File(DataStoreUtils.PATH));
+ FileUtils.deleteDirectory(new File(DataStoreUtils.getHomeDir()));
super.tearDown();
}
Copied:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreUtils.java
(from r1659030,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DataStoreUtils.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreUtils.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreUtils.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DataStoreUtils.java&r1=1659030&r2=1659155&rev=1659155&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DataStoreUtils.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreUtils.java
Thu Feb 12 06:43:56 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.document.blob.ds;
+package org.apache.jackrabbit.oak.plugins.blob.datastore;
import java.io.File;
import java.util.Map;
@@ -39,13 +39,17 @@ import static org.junit.Assert.assertEqu
* where the key has a prefix 'ds.' or 'bs.'. So to set 'minRecordLength' of
FileDataStore specify
* the system property as 'ds.minRecordLength'
*/
-public class DataStoreUtils extends AbstractMongoConnectionTest {
+public class DataStoreUtils {
public static final String DS_CLASS_NAME = "dataStore";
- public static final String PATH = "./target/repository/";
private static final String DS_PROP_PREFIX = "ds.";
private static final String BS_PROP_PREFIX = "bs.";
+ /**
+ * By default create a default directory. But if overridden will need to
be unset
+ */
+ private static long time = -1;
+
public static DataStoreBlobStore getBlobStore() throws Exception {
String className = System.getProperty(DS_CLASS_NAME,
FileDataStore.class.getName());
DataStore ds =
Class.forName(className).asSubclass(DataStore.class).newInstance();
@@ -66,8 +70,9 @@ public class DataStoreUtils extends Abst
return result;
}
- private static String getHomeDir() {
- return concat(new File(".").getAbsolutePath(), "target/blobstore/" +
System.currentTimeMillis());
+ public static String getHomeDir() {
+ return concat(new File(".").getAbsolutePath(), "target/blobstore/" +
+ (time == -1 ? 0 : System.currentTimeMillis()));
}
@Test
Propchange:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreGetLengthTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreGetLengthTest.java?rev=1659155&r1=1659154&r2=1659155&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreGetLengthTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreGetLengthTest.java
Thu Feb 12 06:43:56 2015
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.plugin
import java.io.File;
import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.blob.DocumentMKGetLengthTest;
@@ -52,7 +53,7 @@ public class DocumentMKDataStoreGetLengt
@Override
@After
public void tearDownConnection() throws Exception {
- FileUtils.deleteDirectory(new File(DataStoreUtils.PATH));
+ FileUtils.deleteDirectory(new File(DataStoreUtils.getHomeDir()));
mk.dispose();
// the db might already be closed
mongoConnection.close();
@@ -60,4 +61,4 @@ public class DocumentMKDataStoreGetLengt
MongoUtils.dropCollections(mongoConnection.getDB());
mongoConnection.close();
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreReadTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreReadTest.java?rev=1659155&r1=1659154&r2=1659155&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreReadTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreReadTest.java
Thu Feb 12 06:43:56 2015
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.plugin
import java.io.File;
import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.blob.DocumentMKReadTest;
@@ -53,7 +54,7 @@ public class DocumentMKDataStoreReadTest
@Override
@After
public void tearDownConnection() throws Exception {
- FileUtils.deleteDirectory(new File(DataStoreUtils.PATH));
+ FileUtils.deleteDirectory(new File(DataStoreUtils.getHomeDir()));
mk.dispose();
// the db might already be closed
mongoConnection.close();
@@ -61,4 +62,4 @@ public class DocumentMKDataStoreReadTest
MongoUtils.dropCollections(mongoConnection.getDB());
mongoConnection.close();
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreWriteTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreWriteTest.java?rev=1659155&r1=1659154&r2=1659155&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreWriteTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/DocumentMKDataStoreWriteTest.java
Thu Feb 12 06:43:56 2015
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.plugin
import java.io.File;
import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.blob.DocumentMKWriteTest;
@@ -53,7 +54,7 @@ public class DocumentMKDataStoreWriteTes
@Override
@After
public void tearDownConnection() throws Exception {
- FileUtils.deleteDirectory(new File(DataStoreUtils.PATH));
+ FileUtils.deleteDirectory(new File(DataStoreUtils.getHomeDir()));
mk.dispose();
// the db might already be closed
mongoConnection.close();
@@ -61,4 +62,4 @@ public class DocumentMKDataStoreWriteTes
MongoUtils.dropCollections(mongoConnection.getDB());
mongoConnection.close();
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/MongoDataStoreBlobGCTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/MongoDataStoreBlobGCTest.java?rev=1659155&r1=1659154&r2=1659155&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/MongoDataStoreBlobGCTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/ds/MongoDataStoreBlobGCTest.java
Thu Feb 12 06:43:56 2015
@@ -20,6 +20,7 @@ import java.io.File;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
+import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.MongoBlobGCTest;
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
@@ -54,7 +55,7 @@ public class MongoDataStoreBlobGCTest ex
@After
@Override
public void tearDownConnection() throws Exception {
- FileUtils.deleteDirectory(new File(DataStoreUtils.PATH));
+ FileUtils.deleteDirectory(new File(DataStoreUtils.getHomeDir()));
mk.dispose();
// the db might already be closed
mongoConnection.close();
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCTest.java?rev=1659155&r1=1659154&r2=1659155&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDataStoreBlobGCTest.java
Thu Feb 12 06:43:56 2015
@@ -39,7 +39,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.blob.MarkSweepGarbageCollector;
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
-import org.apache.jackrabbit.oak.plugins.document.blob.ds.DataStoreUtils;
+import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils;
import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
@@ -48,6 +48,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.junit.After;
+import org.junit.Ignore;
import org.junit.Test;
import javax.annotation.Nonnull;
@@ -130,6 +131,7 @@ public class SegmentDataStoreBlobGCTest
}
@Test
+ @Ignore("OAK-2493")
public void gc() throws Exception {
HashSet<String> remaining = setUp();
@@ -160,6 +162,7 @@ public class SegmentDataStoreBlobGCTest
store.close();
}
FileUtils.cleanDirectory(getWorkDir());
+ FileUtils.cleanDirectory(new File(DataStoreUtils.getHomeDir()));
}
static InputStream randomStream(int seed, int size) {
Modified:
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoCloudBlobMicroKernelFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoCloudBlobMicroKernelFixture.java?rev=1659155&r1=1659154&r2=1659155&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoCloudBlobMicroKernelFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoCloudBlobMicroKernelFixture.java
Thu Feb 12 06:43:56 2015
@@ -80,7 +80,7 @@ public class MongoCloudBlobMicroKernelFi
}
/**
- * See
org.apache.jackrabbit.oak.plugins.document.blob.ds.DataStoreUtils#getConfig()
+ * See
org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreUtils#getConfig()
*/
private static Map<String,?> getConfig(){
Map<String,Object> result = Maps.newHashMap();
