You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2015/10/05 15:00:37 UTC
svn commit: r1706831 - in /sling/trunk/bundles/jcr/contentloader: pom.xml
src/test/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoaderTest.java
src/test/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderServiceTest.java
Author: sseifert
Date: Mon Oct 5 13:00:37 2015
New Revision: 1706831
URL: http://svn.apache.org/viewvc?rev=1706831&view=rev
Log:
SLING-5091 JCR Content Loader Unit Tests do not run with latest sling-mock-oak
Modified:
sling/trunk/bundles/jcr/contentloader/pom.xml
sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoaderTest.java
sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderServiceTest.java
Modified: sling/trunk/bundles/jcr/contentloader/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/pom.xml?rev=1706831&r1=1706830&r2=1706831&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/pom.xml (original)
+++ sling/trunk/bundles/jcr/contentloader/pom.xml Mon Oct 5 13:00:37 2015
@@ -240,7 +240,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -268,19 +268,19 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.jcr-mock</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>1.1.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoaderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoaderTest.java?rev=1706831&r1=1706830&r2=1706831&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoaderTest.java (original)
+++ sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/BundleContentLoaderTest.java Mon Oct 5 13:00:37 2015
@@ -31,7 +31,6 @@ import org.apache.sling.jcr.contentloade
import org.apache.sling.jcr.contentloader.internal.readers.XmlReader;
import org.apache.sling.jcr.contentloader.internal.readers.ZipReader;
import org.apache.sling.testing.mock.osgi.MockBundle;
-import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
@@ -63,12 +62,7 @@ public class BundleContentLoaderTest {
RepositoryUtil.registerSlingNodeTypes(session);
// register the content loader service
- ContentLoaderService contentLoaderService = new ContentLoaderService();
- MockOsgi.injectServices(contentLoaderService, context.bundleContext());
- MockOsgi.activate(contentLoaderService);
- context.registerService(BundleHelper.class, contentLoaderService);
-
- BundleHelper bundleHelper = context.getService(BundleHelper.class);
+ BundleHelper bundleHelper = context.registerInjectActivateService(new ContentLoaderService());
ContentReaderWhiteboard whiteboard = context.getService(ContentReaderWhiteboard.class);
Modified: sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderServiceTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderServiceTest.java?rev=1706831&r1=1706830&r2=1706831&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderServiceTest.java (original)
+++ sling/trunk/bundles/jcr/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/ContentLoaderServiceTest.java Mon Oct 5 13:00:37 2015
@@ -21,10 +21,8 @@ package org.apache.sling.jcr.contentload
import junitx.util.PrivateAccessor;
import org.apache.sling.commons.testing.jcr.RepositoryUtil;
import org.apache.sling.testing.mock.osgi.MockBundle;
-import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.junit.SlingContext;
-import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -62,22 +60,10 @@ public class ContentLoaderServiceTest {
RepositoryUtil.registerSlingNodeTypes(session);
// register the content loader service
- underTest = new ContentLoaderService();
- MockOsgi.injectServices(underTest, context.bundleContext());
- MockOsgi.activate(underTest);
+ underTest = context.registerInjectActivateService(new ContentLoaderService());
contentLoader = (BundleContentLoader) PrivateAccessor.getField(underTest, "bundleContentLoader");
}
- @After
- public void cleanup() throws RepositoryException {
- if(session != null) {
- session.save();
- session.logout();
- session = null;
- }
- MockOsgi.deactivate(underTest);
- }
-
//-------ContentLoaderService#bundleChanged(BundleEvent)-------//
//I'm not very sure how to test this method, it looks like side effect of this method goes very deep
//And more affects BundleContentLoader than ContentLoaderService