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 ch...@apache.org on 2015/06/18 11:57:40 UTC
svn commit: r1686163 - in /jackrabbit/oak/trunk/oak-pojosr/src/test:
groovy/org/apache/jackrabbit/oak/run/osgi/
java/org/apache/jackrabbit/oak/run/osgi/
Author: chetanm
Date: Thu Jun 18 09:57:40 2015
New Revision: 1686163
URL: http://svn.apache.org/r1686163
Log:
OAK-2936 - PojoSR should use Felix Connect API instead of pojosr
Minor refactoring to replace custom tmp folder management with TemporaryFolder rule
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java
jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/SimpleRepositoryFactoryTest.java
Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy?rev=1686163&r1=1686162&r2=1686163&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy Thu Jun 18 09:57:40 2015
@@ -20,33 +20,35 @@
package org.apache.jackrabbit.oak.run.osgi
import org.apache.felix.connect.launch.PojoServiceRegistry
-import org.apache.commons.io.FileUtils
import org.apache.commons.io.FilenameUtils
import org.apache.jackrabbit.api.JackrabbitRepository
import org.junit.After
import org.junit.Before
+import org.junit.Rule
+import org.junit.rules.TemporaryFolder
import org.osgi.framework.ServiceReference
import org.osgi.service.cm.ConfigurationAdmin
import org.osgi.util.tracker.ServiceTracker
import javax.jcr.*
import java.util.concurrent.TimeUnit
-import java.util.concurrent.atomic.AtomicInteger
import static org.apache.jackrabbit.oak.run.osgi.OakOSGiRepositoryFactory.REPOSITORY_HOME
import static org.apache.jackrabbit.oak.run.osgi.OakOSGiRepositoryFactory.REPOSITORY_STARTUP_TIMEOUT
abstract class AbstractRepositoryFactoryTest{
static final int SVC_WAIT_TIME = Integer.getInteger("pojosr.waitTime", 10)
- static final AtomicInteger counter = new AtomicInteger()
Map config
File workDir
Repository repository
RepositoryFactory repositoryFactory = new OakOSGiRepositoryFactory();
+ @Rule
+ public final TemporaryFolder tmpFolder = new TemporaryFolder()
+
@Before
void setUp() {
- workDir = new File("target", "repotest-${counter.incrementAndGet()}-${System.currentTimeMillis()}");
+ workDir = tmpFolder.getRoot();
config = [
(REPOSITORY_HOME): workDir.absolutePath,
(REPOSITORY_STARTUP_TIMEOUT) : 2
@@ -58,10 +60,6 @@ abstract class AbstractRepositoryFactory
if (repository instanceof JackrabbitRepository) {
((JackrabbitRepository) repository).shutdown();
}
-
- if (workDir.exists()) {
- FileUtils.deleteQuietly(workDir);
- }
}
protected PojoServiceRegistry getRegistry() {
Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy?rev=1686163&r1=1686162&r2=1686163&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/ConfigTest.groovy Thu Jun 18 09:57:40 2015
@@ -25,7 +25,9 @@ import groovy.json.JsonOutput
import org.apache.commons.io.FileUtils
import org.junit.After
import org.junit.Before
+import org.junit.Rule
import org.junit.Test
+import org.junit.rules.TemporaryFolder
import org.osgi.framework.Constants
import org.osgi.service.cm.Configuration
import org.osgi.service.cm.ConfigurationAdmin
@@ -39,23 +41,18 @@ class ConfigTest {
PojoServiceRegistry registry
ConfigurationAdmin cm
+ @Rule
+ public final TemporaryFolder tmpFolder = new TemporaryFolder()
+
@Before
void setUp(){
- workDir = new File("target", "ConfigTest");
- workDir.mkdirs()
+ workDir = tmpFolder.getRoot();
config = [
(REPOSITORY_HOME) : workDir.absolutePath,
'magic.spell' : 'Alohomora'
]
}
- @After
- void tearDown(){
- if(workDir.exists()) {
- FileUtils.cleanDirectory(workDir);
- }
- }
-
@Test
void testRuntimeConfig(){
config[REPOSITORY_CONFIG] = createConfigMap()
Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java?rev=1686163&r1=1686162&r2=1686163&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java Thu Jun 18 09:57:40 2015
@@ -49,14 +49,14 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableAction;
import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableActionProvider;
import org.junit.Before;
-import org.junit.Ignore;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import static org.apache.commons.io.FilenameUtils.concat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-@Ignore("OAK-1522")
public class OakOSGiRepositoryFactoryTest {
private String repositoryHome;
@@ -64,9 +64,12 @@ public class OakOSGiRepositoryFactoryTes
private Map config = new HashMap();
private String newPassword;
+ @Rule
+ public final TemporaryFolder tmpFolder = new TemporaryFolder();
+
@Before
public void setUp() throws IOException {
- repositoryHome = concat(getBaseDir(), "target/repository");
+ repositoryHome = tmpFolder.getRoot().getAbsolutePath();
config.put("org.apache.jackrabbit.repository.home", repositoryHome);
File repoHome = new File(repositoryHome);
Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/SimpleRepositoryFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/SimpleRepositoryFactoryTest.java?rev=1686163&r1=1686162&r2=1686163&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/SimpleRepositoryFactoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/SimpleRepositoryFactoryTest.java Thu Jun 18 09:57:40 2015
@@ -30,26 +30,21 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.jackrabbit.commons.JcrUtils;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
import static org.junit.Assert.assertNotNull;
public class SimpleRepositoryFactoryTest {
- private File workDir;
-
- @Before
- public void setUp() throws IOException {
- workDir = new File(FilenameUtils.concat(getBaseDir(), "target/repository"));
- if(workDir.exists()){
- FileUtils.cleanDirectory(workDir);
- }
- }
+ @Rule
+ public final TemporaryFolder tmpFolder = new TemporaryFolder();
@Test
public void testRepositoryService() throws Exception{
Map<String,String> config = new HashMap<String, String>();
config.put("org.apache.jackrabbit.repository.home",
- workDir.getAbsolutePath());
+ tmpFolder.getRoot().getAbsolutePath());
config.put("org.apache.jackrabbit.oak.repository.configFile",
path("oak-base-config.json")+","+path("oak-tar-config.json"));