svn commit: r1766386 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore: AbstractDataStoreTest.java CachingFileDataStoreTest.java

[am...@apache.org]

Author: amitj
Date: Mon Oct 24 11:35:36 2016
New Revision: 1766386

URL: http://svn.apache.org/viewvc?rev=1766386&view=rev
Log:
OAK-4971: Implement caching for FileDataStore

* Fix intermittently failing test #testAddRecord

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

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreTest.java?rev=1766386&r1=1766385&r2=1766386&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/AbstractDataStoreTest.java Mon Oct 24 11:35:36 2016
@@ -318,15 +318,12 @@ public abstract class AbstractDataStoreT
         random.nextBytes(data3);
         DataRecord rec3 = ds.addRecord(new ByteArrayInputStream(data3));
 
-        ((MultiDataStoreAware)ds).deleteRecord(rec2.getIdentifier());
-        // Try again if async uploads
-        if (ds.getRecordIfStored(rec2.getIdentifier()) != null) {
-            ((MultiDataStoreAware)ds).deleteRecord(rec2.getIdentifier());
-        }
-        assertNull("rec2 should be null",
-            ds.getRecordIfStored(rec2.getIdentifier()));
-        assertEquals(new ByteArrayInputStream(data1),
-            ds.getRecord(rec1.getIdentifier()).getStream());
+        ((MultiDataStoreAware)ds).deleteRecord(rec1.getIdentifier());
+
+        assertNull("rec1 should be null",
+            ds.getRecordIfStored(rec1.getIdentifier()));
+        assertEquals(new ByteArrayInputStream(data2),
+            ds.getRecord(rec2.getIdentifier()).getStream());
         assertEquals(new ByteArrayInputStream(data3),
             ds.getRecord(rec3.getIdentifier()).getStream());
     }

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/CachingFileDataStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/CachingFileDataStoreTest.java?rev=1766386&r1=1766385&r2=1766386&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/CachingFileDataStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/CachingFileDataStoreTest.java Mon Oct 24 11:35:36 2016
@@ -23,6 +23,7 @@ import java.util.Properties;
 
 import javax.jcr.RepositoryException;
 
+import com.google.common.collect.Maps;
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.core.data.DataRecord;
 import org.apache.jackrabbit.core.data.DataStore;
@@ -50,6 +51,7 @@ public class CachingFileDataStoreTest ex
     public void setUp() throws Exception {
         fsBackendPath = folder.newFolder().getAbsolutePath();
         props = new Properties();
+        props.setProperty("cacheSize", "0");
         props.setProperty("fsBackendPath", fsBackendPath);
         super.setUp();
     }
@@ -60,7 +62,7 @@ public class CachingFileDataStoreTest ex
             ds = new CachingFileDataStore();
             Map<String, ?> config = DataStoreUtils.getConfig();
             props.putAll(config);
-            PropertiesUtil.populate(ds, config, false);
+            PropertiesUtil.populate(ds, Maps.fromProperties(props), false);
             ds.setProperties(props);
             ds.init(dataStoreDir);
         } catch (Exception e) {