You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2022/01/26 15:06:28 UTC
[sling-org-apache-sling-resourceresolver] branch master updated: SLING-11092: ResourceResolver - update org.apache.sling.testing.osgi-mock test dependency
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
The following commit(s) were added to refs/heads/master by this push:
new d355dea SLING-11092: ResourceResolver - update org.apache.sling.testing.osgi-mock test dependency
d355dea is described below
commit d355deaf7a1c1ce4221b89ab4ad735df81dc12a4
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Wed Jan 26 13:43:39 2022 +0100
SLING-11092: ResourceResolver - update org.apache.sling.testing.osgi-mock test dependency
---
pom.xml | 4 ++--
.../impl/observation/BasicObservationReporterTest.java | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 23e96b7..87f2442 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.2.0</version>
+ <version>2.4.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -194,7 +194,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
- <version>2.3.10</version>
+ <version>3.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/observation/BasicObservationReporterTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/observation/BasicObservationReporterTest.java
index e0f0c12..010e720 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/observation/BasicObservationReporterTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/observation/BasicObservationReporterTest.java
@@ -28,6 +28,7 @@ import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -41,9 +42,6 @@ import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.osgi.framework.ServiceReference;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
public class BasicObservationReporterTest {
private static final List<String> SEARCH_PATHS = Arrays.asList(new String[] { "/apps/", "/libs/" });
@@ -56,7 +54,7 @@ public class BasicObservationReporterTest {
ResourceChangeListenerInfo globListener = resourceChangeListenerInfo("glob:/apps/**/*.html");
BasicObservationReporter underTest = new BasicObservationReporter(SEARCH_PATHS,
- ImmutableList.of(allPathListener, appsPathListener, appsApp2PathListener, globListener),
+ Collections.unmodifiableList(Arrays.asList(allPathListener, appsPathListener, appsApp2PathListener, globListener)),
new Path("/"), PathSet.EMPTY_SET);
underTest.reportChanges(changes("/apps/app1/path1.html"), false);
@@ -76,7 +74,7 @@ public class BasicObservationReporterTest {
ResourceChangeListenerInfo globListener = resourceChangeListenerInfo("glob:/apps/**/*.html");
BasicObservationReporter underTest = new BasicObservationReporter(SEARCH_PATHS,
- ImmutableList.of(allPathListener, appsPathListener, appsApp2PathListener, globListener),
+ Collections.unmodifiableList(Arrays.asList(allPathListener, appsPathListener, appsApp2PathListener, globListener)),
new Path("/apps/app1"), PathSet.EMPTY_SET);
underTest.reportChanges(changes("/apps/app1/path1.html"), false);
@@ -106,7 +104,7 @@ public class BasicObservationReporterTest {
@SuppressWarnings("unchecked")
private static void assertListener(ResourceChangeListenerInfo info, String... paths) {
- Set<String> expectedPaths = ImmutableSet.copyOf(paths);
+ Set<String> expectedPaths = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(paths)));
ArgumentCaptor<List<ResourceChange>> argument = (ArgumentCaptor)ArgumentCaptor.forClass(List.class);
if (paths.length == 0) {
verifyNoMoreInteractions(info.getListener());