Author: chetanm
Date: Wed Mar 26 08:01:08 2014
New Revision: 1581725

URL: http://svn.apache.org/r1581725
Log:
OAK-1604 - Support for signed references in Blob (WIP)

-- Adding fixture for FileBlobStore

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferenceBinaryIT.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferenceBinaryIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferenceBinaryIT.java?rev=1581725&r1=1581724&r2=1581725&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferenceBinaryIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ReferenceBinaryIT.java
 Wed Mar 26 08:01:08 2014
@@ -42,6 +42,7 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
 import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
 import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+import org.apache.jackrabbit.oak.spi.blob.FileBlobStore;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 import org.junit.After;
 import org.junit.Before;
@@ -131,7 +132,7 @@ public class ReferenceBinaryIT {
 
     @Parameterized.Parameters
     public static Collection<Object[]> fixtures() throws IOException {
-        File file = new File(new File("target"), "tar." + System.nanoTime());
+        File file = getTestDir("tar");
         SegmentStore segmentStore = new FileStore(createBlobStore(), file, 
266, true);
 
         List<Object[]> fixtures = Lists.newArrayList();
@@ -139,6 +140,15 @@ public class ReferenceBinaryIT {
         if (segmentFixture.isAvailable()) {
             fixtures.add(new Object[] {segmentFixture});
         }
+
+        FileBlobStore fbs = new 
FileBlobStore(getTestDir("fbs1").getAbsolutePath());
+        fbs.setReferenceKeyPlainText("foobar");
+        SegmentStore segmentStoreWithFBS =  new FileStore(fbs, 
getTestDir("tar2"), 266, true);
+        NodeStoreFixture.SegmentFixture segmentFixtureFBS = new 
NodeStoreFixture.SegmentFixture(segmentStoreWithFBS);
+        if (segmentFixtureFBS.isAvailable()) {
+            fixtures.add(new Object[] {segmentFixtureFBS});
+        }
+
         DocumentFixture documentFixture = new 
DocumentFixture(DocumentFixture.DEFAULT_URI, false, createBlobStore());
         if (documentFixture.isAvailable()) {
             fixtures.add(new Object[]{documentFixture});
@@ -147,16 +157,20 @@ public class ReferenceBinaryIT {
     }
 
     private static BlobStore createBlobStore(){
-        File file = new File(new File("target"), "datastore." + 
System.nanoTime());
+        File file = getTestDir("datastore");
         OakFileDataStore fds = new OakFileDataStore();
         byte[] key = new byte[256];
         new Random().nextBytes(key);
-        fds.setSigningKey(BaseEncoding.base64().encode(key));
+        fds.setReferenceKeyEncoded(BaseEncoding.base64().encode(key));
         fds.setMinRecordLength(4092);
         fds.init(file.getAbsolutePath());
         return new DataStoreBlobStore(fds);
     }
 
+    private static File getTestDir(String prefix) {
+        return new File(new File("target"), prefix+ "." + System.nanoTime());
+    }
+
     private Session createAdminSession() throws RepositoryException {
         return repository.login(new SimpleCredentials("admin", 
"admin".toCharArray()));
     }


Reply via email to