Author: frm
Date: Wed Sep 7 09:43:58 2016
New Revision: 1759571
URL: http://svn.apache.org/viewvc?rev=1759571&view=rev
Log:
OAK-4707 - Fix path of the FileDataStore used in ExternalSharedStoreIT
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalSharedStoreIT.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalSharedStoreIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalSharedStoreIT.java?rev=1759571&r1=1759570&r2=1759571&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalSharedStoreIT.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/ExternalSharedStoreIT.java
Wed Sep 7 09:43:58 2016
@@ -22,29 +22,25 @@ import java.io.File;
import java.util.concurrent.ScheduledExecutorService;
import org.apache.jackrabbit.oak.segment.file.FileStore;
-import org.junit.Before;
public class ExternalSharedStoreIT extends DataStoreTestBase {
- private String commonDataStorePath;
-
public ExternalSharedStoreIT() {
this.storesCanBeEqual = true;
}
- @Before
- public void createCommonDataStoreFolder() throws Exception {
- commonDataStorePath =
folder.newFolder("data-store-common").getAbsolutePath();
+ private String getCommonDataStorePath() {
+ return new File(folder.getRoot(),
"data-store-common").getAbsolutePath();
}
@Override
protected FileStore setupPrimary(File d, ScheduledExecutorService
primaryExecutor) throws Exception {
- return setupFileDataStore(d, commonDataStorePath, primaryExecutor);
+ return setupFileDataStore(d, getCommonDataStorePath(),
primaryExecutor);
}
@Override
protected FileStore setupSecondary(File d, ScheduledExecutorService
secondaryExecutor) throws Exception {
- return setupFileDataStore(d, commonDataStorePath, secondaryExecutor);
+ return setupFileDataStore(d, getCommonDataStorePath(),
secondaryExecutor);
}
}