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 am...@apache.org on 2018/10/09 08:46:08 UTC

svn commit: r1843231 - /jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java

Author: amitj
Date: Tue Oct  9 08:46:08 2018
New Revision: 1843231

URL: http://svn.apache.org/viewvc?rev=1843231&view=rev
Log:
OAK-7798: Return stream for downloaded files rather than directly from backend

- assert temp file presence before reading

Modified:
    jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java

Modified: jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java?rev=1843231&r1=1843230&r2=1843231&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java Tue Oct  9 08:46:08 2018
@@ -46,6 +46,7 @@ import org.apache.jackrabbit.oak.spi.blo
 import org.apache.jackrabbit.oak.spi.blob.BlobOptions;
 import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider;
 import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.apache.jackrabbit.util.LazyFileInputStream;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -191,13 +192,17 @@ public class CachingDataStoreTest extend
         InputStream is = rec.getStream();
         closer.register(is);
 
-        assertFile(is, f, folder, false);
+        assertNotNull(is);
+        assertTrue(is instanceof LazyFileInputStream);
+        ((LazyFileInputStream)is).open();
 
         File tmp = new File(new File(path), "tmp");
         Collection<File> temp0cacheFiles =
             FileUtils.listFiles(tmp, FileFilterUtils.prefixFileFilter("temp0cache"), null);
         assertEquals(1, temp0cacheFiles.size());
 
+        assertFile(is, f, folder, false);
+
         LOG.info("Finished loadDirectBackendTemp");
     }