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 mr...@apache.org on 2016/04/12 16:35:45 UTC
svn commit: r1738808 - in /jackrabbit/oak/trunk/oak-pojosr: ./
src/test/groovy/org/apache/jackrabbit/oak/run/osgi/
src/test/java/org/apache/jackrabbit/oak/run/osgi/
Author: mreutegg
Date: Tue Apr 12 14:35:45 2016
New Revision: 1738808
URL: http://svn.apache.org/viewvc?rev=1738808&view=rev
Log:
OAK-3858: Review slow running tests
Logout sessions before repository is shutdown and replace copy of MongoUtils with test dependency to oak-core-tests
Removed:
jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/MongoUtils.java
Modified:
jackrabbit/oak/trunk/oak-pojosr/pom.xml
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java
Modified: jackrabbit/oak/trunk/oak-pojosr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/pom.xml?rev=1738808&r1=1738807&r2=1738808&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-pojosr/pom.xml Tue Apr 12 14:35:45 2016
@@ -262,6 +262,13 @@
<!-- Test dependencies -->
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-core</artifactId>
+ <classifier>tests</classifier>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy?rev=1738808&r1=1738807&r2=1738808&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy Tue Apr 12 14:35:45 2016
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.oak.api.jmx
import org.apache.jackrabbit.oak.plugins.blob.CachingBlobStore
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreStatsMBean
+import org.apache.jackrabbit.oak.plugins.document.MongoUtils
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoBlobStore
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection
import org.apache.jackrabbit.oak.spi.blob.BlobStore
@@ -220,8 +221,8 @@ class DocumentNodeStoreConfigTest extend
registry = repositoryFactory.initializeServiceRegistry(config)
createConfig([
'org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService': [
- mongouri : MongoUtils.mongoURI,
- db : MongoUtils.mongoDB,
+ mongouri : MongoUtils.URL,
+ db : MongoUtils.DB,
customBlobStore: true
]
])
@@ -244,8 +245,8 @@ class DocumentNodeStoreConfigTest extend
registry = repositoryFactory.initializeServiceRegistry(config)
createConfig([
'org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService': [
- mongouri: MongoUtils.mongoURI,
- db : MongoUtils.mongoDB,
+ mongouri: MongoUtils.URL,
+ db : MongoUtils.DB,
blobCacheSize : 1,
]
])
@@ -311,7 +312,7 @@ class DocumentNodeStoreConfigTest extend
private mongoCheck() {
//Somehow in Groovy assumeNotNull cause issue as Groovy probably
//does away with null array causing a NPE
- assumeTrue(mongoConn != null)
+ assumeTrue(MongoUtils.isAvailable())
}
private Collection<String> getCollectionNames() {
Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy?rev=1738808&r1=1738807&r2=1738808&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy Tue Apr 12 14:35:45 2016
@@ -77,6 +77,7 @@ class JaasConfigSpiTest extends Abstract
Session session = repository.login(new SimpleCredentials("batman", "password".toCharArray()))
assert session
+ session.logout()
}
public static class TestLoginModule extends AbstractLoginModule {
Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy?rev=1738808&r1=1738807&r2=1738808&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/LuceneSupportTest.groovy Tue Apr 12 14:35:45 2016
@@ -27,6 +27,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer
import org.apache.jackrabbit.oak.spi.state.NodeBuilder
+import org.junit.After
import org.junit.Before
import org.junit.Ignore;
import org.junit.Test
@@ -51,6 +52,11 @@ class LuceneSupportTest extends Abstract
config[REPOSITORY_CONFIG_FILE] = createConfigValue("oak-base-config.json", "oak-tar-config.json")
}
+ @After
+ void logout() {
+ session.logout()
+ }
+
@Test
public void fullTextSearch() throws Exception {
repository = repositoryFactory.getRepository(config)
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=1738808&r1=1738807&r2=1738808&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 Tue Apr 12 14:35:45 2016
@@ -124,6 +124,7 @@ public class OakOSGiRepositoryFactoryTes
session.save();
assertEquals("newPassword", newPassword);
+ session.logout();
}
private void basicCrudTest(Repository repository) throws RepositoryException {