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 2014/05/27 13:29:19 UTC
svn commit: r1597748 - in
/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi:
AbstractRepositoryFactoryTest.groovy JsonConfigRepFactoryTest.groovy
Author: chetanm
Date: Tue May 27 11:29:18 2014
New Revision: 1597748
URL: http://svn.apache.org/r1597748
Log:
OAK-1856 - Enable specifying of OSGi config via JSON file and in memory map
Fix test failures
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/JsonConfigRepFactoryTest.groovy
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=1597748&r1=1597747&r2=1597748&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 Tue May 27 11:29:18 2014
@@ -65,7 +65,7 @@ abstract class AbstractRepositoryFactory
}
}
- PojoServiceRegistry getRegistry() {
+ protected PojoServiceRegistry getRegistry() {
assert repository instanceof ServiceRegistryProvider
return ((ServiceRegistryProvider) repository).getServiceRegistry()
}
@@ -76,7 +76,7 @@ abstract class AbstractRepositoryFactory
return (T) registry.getService(sr)
}
- protected static File getResource(String path){
+ protected File getResource(String path){
File file = new File(FilenameUtils.concat(getBaseDir(), "src/test/resources/$path"))
assert file.exists() : "No file found at ${file.absolutePath}"
return file
Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JsonConfigRepFactoryTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JsonConfigRepFactoryTest.groovy?rev=1597748&r1=1597747&r2=1597748&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JsonConfigRepFactoryTest.groovy (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JsonConfigRepFactoryTest.groovy Tue May 27 11:29:18 2014
@@ -24,15 +24,12 @@ import org.apache.jackrabbit.oak.spi.sta
import org.junit.Before
import org.junit.Test
-import javax.jcr.Repository
import javax.jcr.RepositoryException
import javax.jcr.Session
-import javax.jcr.SimpleCredentials
import static org.apache.jackrabbit.oak.run.osgi.OakOSGiRepositoryFactory.REPOSITORY_CONFIG
import static org.apache.jackrabbit.oak.run.osgi.OakOSGiRepositoryFactory.REPOSITORY_CONFIG_FILE
-
class JsonConfigRepFactoryTest extends AbstractRepositoryFactoryTest{
@Before
@@ -64,6 +61,5 @@ class JsonConfigRepFactoryTest extends A
session = createAdminSession();
assert session.getProperty('/child/foo3').string == 'bar3'
session.logout()
-
}
}