You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cs...@apache.org on 2022/03/08 08:35:53 UTC
[sling-org-apache-sling-distribution-journal] 01/02: SLING-11190 - Upgrade to current sling parent and mocks
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch SLING-11190
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
commit 8f604df4692e91288331052f4360c2cd55785d82
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Mon Mar 7 17:55:08 2022 +0100
SLING-11190 - Upgrade to current sling parent and mocks
---
pom.xml | 11 ++++++-----
.../journal/bookkeeper/ContentPackageExtractorTest.java | 10 +++++-----
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index c218c27..5df545d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>35</version>
+ <version>47</version>
<relativePath />
</parent>
@@ -41,6 +41,7 @@
<properties>
<sling.java.version>8</sling.java.version>
+ <project.build.outputTimestamp>10</project.build.outputTimestamp>
</properties>
<scm>
@@ -212,18 +213,18 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
- <version>2.1.2</version>
+ <version>2.1.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.jcr-mock</artifactId>
- <version>1.3.2</version>
+ <version>1.5.4</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.testing.osgi-mock.junit4</artifactId>
- <version>3.1.2</version>
+ <artifactId>org.apache.sling.testing.sling-mock.junit4</artifactId>
+ <version>3.2.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/src/test/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractorTest.java b/src/test/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractorTest.java
index 4fc9f8c..fca2a40 100644
--- a/src/test/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractorTest.java
+++ b/src/test/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractorTest.java
@@ -45,20 +45,21 @@ import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.distribution.common.DistributionException;
-import org.apache.sling.testing.mock.osgi.MockOsgi;
-import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
-import org.osgi.framework.BundleContext;
@RunWith(MockitoJUnitRunner.class)
public class ContentPackageExtractorTest {
+ @Rule
+ public final SlingContext scontext = new SlingContext(ResourceResolverType.JCR_MOCK);
@Mock
private Packaging packaging;
@@ -73,8 +74,7 @@ public class ContentPackageExtractorTest {
@Before
public void before() throws RepositoryException {
- BundleContext context = MockOsgi.newBundleContext();
- resourceResolver = MockSling.newResourceResolver(ResourceResolverType.JCR_MOCK, context);
+ resourceResolver = scontext.resourceResolver();
when(packaging.getPackageManager(Mockito.any(Session.class)))
.thenReturn(packageManager);
when(packageManager.open(Mockito.any(Node.class))).thenReturn(pkg);