You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2022/11/02 11:10:54 UTC
[sling-org-apache-sling-resourceresolver] branch master updated: SLING-11659: Resource Resolver - remove dead test code remove dead test code related to persisted bloom filter (#86)
This is an automated email from the ASF dual-hosted git repository.
cziegeler 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 54fa958 SLING-11659: Resource Resolver - remove dead test code remove dead test code related to persisted bloom filter (#86)
54fa958 is described below
commit 54fa958e6e1b645d204e3748fee8d7ebbe159586
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Wed Nov 2 12:10:48 2022 +0100
SLING-11659: Resource Resolver - remove dead test code remove dead test code related to persisted bloom filter (#86)
* SLING-11659: AbstractMappingMapEntriesTest - remove dead test code related to persisted bloom filter
* SLING-11659: EtcMappingResourceResolverTest - remove dead test code related to persisted bloom filter
---
.../resourceresolver/impl/EtcMappingResourceResolverTest.java | 9 ++-------
.../impl/mapping/AbstractMappingMapEntriesTest.java | 8 +-------
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/EtcMappingResourceResolverTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/EtcMappingResourceResolverTest.java
index 3a19ce1..5193b62 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/EtcMappingResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/EtcMappingResourceResolverTest.java
@@ -40,7 +40,6 @@ import org.osgi.framework.BundleContext;
import org.osgi.service.event.EventAdmin;
import javax.servlet.http.HttpServletRequest;
-import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -85,7 +84,7 @@ public class EtcMappingResourceResolverTest {
@Mock
EventAdmin eventAdmin;
-
+
@Mock
ResourceResolverMetrics metrics;
@@ -100,8 +99,6 @@ public class EtcMappingResourceResolverTest {
StringInterpolationProvider stringInterpolationProvider = new StringInterpolationProviderImpl();
MapEntries mapEntries;
- File vanityBloomFilterFile;
-
CommonResourceResolverFactoryImpl commonFactory;
Resource etc;
@@ -116,7 +113,6 @@ public class EtcMappingResourceResolverTest {
MockitoAnnotations.initMocks(this);
List<MapConfigurationProvider.VanityPathConfig> configs = getVanityPathConfigs();
- vanityBloomFilterFile = new File("target/test-classes/resourcesvanityBloomFilter.txt");
List<ResourceProviderHandler> handlers = asList(createRPHandler(resourceProvider, "rp1", 0, "/"));
ResourceProviderTracker resourceProviderTracker = mock(ResourceProviderTracker.class);
ResourceProviderStorage storage = new ResourceProviderStorage(handlers);
@@ -132,12 +128,11 @@ public class EtcMappingResourceResolverTest {
setInaccessibleField("mapRootPrefix", activator, "/etc/map");
setInaccessibleField("observationPaths", activator, new Path[] {new Path("/")});
setInaccessibleField("metrics", activator, metrics);
-
+
ServiceUserMapper serviceUserMapper = mock(ServiceUserMapper.class);
setInaccessibleField("serviceUserMapper", activator, serviceUserMapper);
commonFactory = spy(new CommonResourceResolverFactoryImpl(activator));
when(bundleContext.getBundle()).thenReturn(bundle);
- when(bundleContext.getDataFile("vanityBloomFilter.txt")).thenReturn(vanityBloomFilterFile);
when(serviceUserMapper.getServiceUserID(any(Bundle.class),anyString())).thenReturn("mapping");
// Activate method is package private so we use reflection to to call it
callInaccessibleMethod("activate", null, commonFactory, BundleContext.class, bundleContext);
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AbstractMappingMapEntriesTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AbstractMappingMapEntriesTest.java
index 46e787c..6b2bca0 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AbstractMappingMapEntriesTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/mapping/AbstractMappingMapEntriesTest.java
@@ -34,7 +34,6 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.service.event.EventAdmin;
-import java.io.File;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
@@ -78,7 +77,7 @@ public abstract class AbstractMappingMapEntriesTest {
@Mock
EventAdmin eventAdmin;
-
+
Optional<ResourceResolverMetrics> metrics = Optional.empty();
@Mock
@@ -89,7 +88,6 @@ public abstract class AbstractMappingMapEntriesTest {
StringInterpolationProviderImpl stringInterpolationProvider = new StringInterpolationProviderImpl();
MapEntries mapEntries;
- File vanityBloomFilterFile;
Resource map;
Resource http;
@@ -102,10 +100,8 @@ public abstract class AbstractMappingMapEntriesTest {
MockitoAnnotations.initMocks(this);
List<MapConfigurationProvider.VanityPathConfig> configs = getVanityPathConfigs();
- vanityBloomFilterFile = new File("target/test-classes/resourcesvanityBloomFilter.txt");
when(bundle.getSymbolicName()).thenReturn("TESTBUNDLE");
when(bundleContext.getBundle()).thenReturn(bundle);
- when(bundleContext.getDataFile("vanityBloomFilter.txt")).thenReturn(vanityBloomFilterFile);
when(resourceResolverFactory.getServiceResourceResolver(any(Map.class))).thenReturn(resourceResolver);
when(resourceResolverFactory.isVanityPathEnabled()).thenReturn(true);
when(resourceResolverFactory.getVanityPathConfig()).thenReturn(configs);
@@ -135,10 +131,8 @@ public abstract class AbstractMappingMapEntriesTest {
@After
public void tearDown() throws Exception {
- vanityBloomFilterFile.delete();
}
-
// -------------------------- private methods ----------
ValueMap buildValueMap(Object... string) {