svn commit: r1721496 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore: DataStoreTextWriterTest.java DataStoreUtils.java

[chetanm]

Author: chetanm
Date: Wed Dec 23 06:23:56 2015
New Revision: 1721496

URL: http://svn.apache.org/viewvc?rev=1721496&view=rev
Log:
OAK-3806 - Collect and expose statistics related to BlobStore operations

Refactor FileDataStore creation to a util method

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextWriterTest.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreUtils.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextWriterTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextWriterTest.java?rev=1721496&r1=1721495&r2=1721496&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextWriterTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTextWriterTest.java
 Wed Dec 23 06:23:56 2015
@@ -46,7 +46,7 @@ public class DataStoreTextWriterTest {
     @Test
     public void basicOperation() throws Exception {
         File fdsDir = temporaryFolder.newFolder();
-        FileDataStore fds = createFDS(fdsDir);
+        FileDataStore fds = DataStoreUtils.createFDS(fdsDir, 0);
         ByteArrayInputStream is = new ByteArrayInputStream("hello".getBytes());
         DataRecord dr = fds.addRecord(is);
 
@@ -54,7 +54,7 @@ public class DataStoreTextWriterTest {
         TextWriter writer = new DataStoreTextWriter(writerDir, false);
         writer.write(dr.getIdentifier().toString(), "hello");
 
-        FileDataStore fds2 = createFDS(writerDir);
+        FileDataStore fds2 = DataStoreUtils.createFDS(writerDir, 0);
         DataRecord dr2 = fds2.getRecordIfStored(dr.getIdentifier());
 
         is.reset();
@@ -88,7 +88,7 @@ public class DataStoreTextWriterTest {
     @Test
     public void nonExistingEntry() throws Exception{
         File fdsDir = temporaryFolder.newFolder();
-        FileDataStore fds = createFDS(fdsDir);
+        FileDataStore fds = DataStoreUtils.createFDS(fdsDir, 0);
         ByteArrayInputStream is = new ByteArrayInputStream("hello".getBytes());
         DataRecord dr = fds.addRecord(is);
 
@@ -109,14 +109,6 @@ public class DataStoreTextWriterTest {
 
     }
 
-    private FileDataStore createFDS(File root) {
-        FileDataStore fds = new FileDataStore();
-        fds.setPath(root.getAbsolutePath());
-        fds.setMinRecordLength(0);
-        fds.init(null);
-        return fds;
-    }
-
     private static class IdBlob extends ArrayBasedBlob {
         final String id;
 

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/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?rev=1721496&r1=1721495&r2=1721496&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreUtils.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreUtils.java
 Wed Dec 23 06:23:56 2015
@@ -96,6 +96,14 @@ public class DataStoreUtils {
             (time == -1 ? 0 : time));
     }
 
+    public static FileDataStore createFDS(File root, int minRecordLength) {
+        FileDataStore fds = new FileDataStore();
+        fds.setPath(root.getAbsolutePath());
+        fds.setMinRecordLength(minRecordLength);
+        fds.init(null);
+        return fds;
+    }
+
     @Test
     public void testPropertySetup() throws Exception {
         System.setProperty(DS_CLASS_NAME, FileDataStore.class.getName());