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/06/14 16:17:24 UTC
[sling-org-apache-sling-resourceresolver] branch feature/resource-provider-mode updated: Clean up tests a little bit
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch feature/resource-provider-mode
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
The following commit(s) were added to refs/heads/feature/resource-provider-mode by this push:
new 65b557c Clean up tests a little bit
65b557c is described below
commit 65b557c2343892c88d159d8c70b92984b1e4e59a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jun 14 18:17:18 2022 +0200
Clean up tests a little bit
---
.../impl/ResourceResolverImpl.java | 1 -
.../impl/helper/RedirectResourceTest.java | 1 -
.../impl/helper/ResourceResolverControlTest.java | 54 ++++++++++------------
.../providers/ResourceProviderTrackerTest.java | 27 +++++------
4 files changed, 36 insertions(+), 47 deletions(-)
diff --git a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
index 69d53e6..7581543 100644
--- a/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
+++ b/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
@@ -21,7 +21,6 @@ package org.apache.sling.resourceresolver.impl;
import static org.apache.commons.lang3.StringUtils.defaultString;
import java.io.Closeable;
-import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/helper/RedirectResourceTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/helper/RedirectResourceTest.java
index 7c90726..8096f68 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/helper/RedirectResourceTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/helper/RedirectResourceTest.java
@@ -28,7 +28,6 @@ import org.apache.sling.api.resource.ModifiableValueMap;
import org.apache.sling.api.resource.ValueMap;
import org.junit.Test;
-@SuppressWarnings("deprecation")
public class RedirectResourceTest {
@Test public void testRedirectResource() {
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
index 6026738..8d7e362 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
@@ -18,18 +18,12 @@
*/
package org.apache.sling.resourceresolver.impl.helper;
-import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasEntry;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
@@ -61,7 +55,6 @@ import org.apache.sling.resourceresolver.impl.providers.ResourceProviderHandler;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderInfo;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderStorage;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderStorageProvider;
-import org.apache.sling.resourceresolver.impl.providers.ResourceProviderTracker;
import org.apache.sling.resourceresolver.impl.providers.stateful.AuthenticatedResourceProvider;
import org.apache.sling.resourceresolver.impl.providers.stateful.ProviderManager;
import org.apache.sling.resourceresolver.impl.providers.tree.PathTree;
@@ -70,7 +63,6 @@ import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.apache.sling.testing.mock.osgi.MockOsgi;
-import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
@@ -268,7 +260,7 @@ public class ResourceResolverControlTest {
*/
@Test
public void getResource_missing() {
- assertThat(crp.getResource(context, "/nothing", null, null, false), nullValue());
+ assertNull(crp.getResource(context, "/nothing", null, null, false));
}
/**
@@ -276,8 +268,8 @@ public class ResourceResolverControlTest {
*/
@Test
public void getResource_found() {
- assertThat(crp.getResource(context, "/something", null, null, false), not(nullValue()));
- assertThat(crp.getResource(context, "/some/path/object", null, null, false), not(nullValue()));
+ assertNotNull(crp.getResource(context, "/something", null, null, false));
+ assertNotNull(crp.getResource(context, "/some/path/object", null, null, false));
}
@@ -287,8 +279,8 @@ public class ResourceResolverControlTest {
@Test
public void getParent_found() {
Resource parent = crp.getParent(context, ResourceUtil.getParent(somethingResource.getPath()), somethingResource);
- assertThat(parent, notNullValue());
- assertThat("parent.path", parent.getPath(), equalTo("/"));
+ assertNotNull(parent);
+ assertEquals("parent.path", "/", parent.getPath());
}
@@ -299,7 +291,7 @@ public class ResourceResolverControlTest {
@Test
public void getParent_synthetic() {
Resource parent = crp.getParent(context, ResourceUtil.getParent(subProviderResource.getPath()), subProviderResource);
- assertThat(parent, notNullValue());
+ assertNotNull(parent);
assertTrue("parent is a synthetic resource", ResourceUtil.isSyntheticResource(parent));
}
@@ -339,10 +331,10 @@ public class ResourceResolverControlTest {
all.put(child.getPath(), child);
}
- assertThat(all.entrySet(), Matchers.hasSize(3));
- assertThat("Resource at /something", all.get("/something"), not(nullValue()));
- assertThat("Resource at /some", all.get("/some"), not(nullValue()));
- assertThat("Resource at /foo", all.get("/foo"), not(nullValue()));
+ assertEquals(3, all.entrySet().size());
+ assertNotNull("Resource at /something", all.get("/something"));
+ assertNotNull("Resource at /some", all.get("/some"));
+ assertNotNull("Resource at /foo", all.get("/foo"));
}
/**
@@ -360,8 +352,8 @@ public class ResourceResolverControlTest {
all.put(child.getPath(), child);
}
- assertThat(all.entrySet(), Matchers.hasSize(1));
- assertThat("Resource at /some/path", all.get("/some/path"), not(nullValue()));
+ assertEquals(1, all.entrySet().size());
+ assertNotNull("Resource at /some/path", all.get("/some/path"));
assertSame(somePathResource, all.get("/some/path"));
}
@@ -397,8 +389,7 @@ public class ResourceResolverControlTest {
Resource resource = crp.copy(context, "/some/path/object", "/some/path/new");
-
- assertThat(resource, not(nullValue()));
+ assertNotNull(resource);
}
/**
@@ -415,7 +406,7 @@ public class ResourceResolverControlTest {
Resource resource = crp.copy(context, "/some/path/object", "/");
- assertThat(resource, not(nullValue()));
+ assertNotNull(resource);
}
/**
@@ -433,7 +424,7 @@ public class ResourceResolverControlTest {
Resource resource = crp.move(context, "/some/path/object", "/some/path/new");
- assertThat(resource, not(nullValue()));
+ assertNotNull(resource);
}
/**
@@ -449,7 +440,7 @@ public class ResourceResolverControlTest {
Resource resource = crp.move(context, "/some/path/object", "/");
- assertThat(resource, not(nullValue()));
+ assertNotNull(resource);
verify(subProvider).delete(mockContext(), Mockito.eq(subProviderResource));
}
@@ -459,8 +450,11 @@ public class ResourceResolverControlTest {
*/
@Test
public void queryLanguages() throws PersistenceException {
-
- assertThat(crp.getSupportedLanguages(context), arrayContainingInAnyOrder(QL_NOOP, QL_MOCK, QL_ANOTHER_MOCK));
+ final List<String> result = Arrays.asList(crp.getSupportedLanguages(context));
+ assertEquals(3, result.size());
+ assertTrue(result.contains(QL_NOOP));
+ assertTrue(result.contains(QL_MOCK));
+ assertTrue(result.contains(QL_ANOTHER_MOCK));
}
/**
@@ -474,11 +468,11 @@ public class ResourceResolverControlTest {
int count = 0;
while ( queryResources.hasNext() ) {
- assertThat("ValueMap returned from query", queryResources.next(), hasEntry("key", (Object) "value"));
+ assertEquals("ValueMap returned from query", "value", queryResources.next().get("key"));
count++;
}
- assertThat("query result count", count, Matchers.equalTo(1));
+ assertEquals("query result count", 1, count);
}
/**
diff --git a/src/test/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTrackerTest.java b/src/test/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTrackerTest.java
index d0ed944..34fdd65 100644
--- a/src/test/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTrackerTest.java
+++ b/src/test/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderTrackerTest.java
@@ -18,11 +18,8 @@
*/
package org.apache.sling.resourceresolver.impl.providers;
-import static org.hamcrest.Matchers.arrayWithSize;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
@@ -86,11 +83,11 @@ public class ResourceProviderTrackerTest {
// since the OSGi mocks are asynchronous we don't have to wait for the changes to propagate
- assertThat(tracker.getResourceProviderStorage().getAllHandlers().size(), equalTo(2));
+ assertEquals(2, tracker.getResourceProviderStorage().getAllHandlers().size());
fixture.unregisterResourceProvider(rp2Info);
- assertThat(tracker.getResourceProviderStorage().getAllHandlers().size(), equalTo(1));
+ assertEquals(1, tracker.getResourceProviderStorage().getAllHandlers().size());
}
@Test
@@ -99,7 +96,7 @@ public class ResourceProviderTrackerTest {
tracker.deactivate();
- assertThat(tracker.getResourceProviderStorage().getAllHandlers(), hasSize(0));
+ assertTrue(tracker.getResourceProviderStorage().getAllHandlers().isEmpty());
}
@Test
@@ -139,7 +136,7 @@ public class ResourceProviderTrackerTest {
assertFalse(removedCalled.get());
// verify a single provider
- assertThat(tracker.getResourceProviderStorage().getAllHandlers().size(), equalTo(1));
+ assertEquals(1, tracker.getResourceProviderStorage().getAllHandlers().size());
// reset boolean markers
addedCalled.set(false);
@@ -153,7 +150,7 @@ public class ResourceProviderTrackerTest {
assertFalse(addedCalled.get());
// no provider anymore
- assertThat(tracker.getResourceProviderStorage().getAllHandlers().size(), equalTo(0));
+ assertTrue(tracker.getResourceProviderStorage().getAllHandlers().isEmpty());
}
@Test
@@ -193,7 +190,7 @@ public class ResourceProviderTrackerTest {
assertFalse(removedCalled.get());
// verify a single provider
- assertThat(tracker.getResourceProviderStorage().getAllHandlers().size(), equalTo(1));
+ assertEquals(1, tracker.getResourceProviderStorage().getAllHandlers().size());
// reset boolean markers
addedCalled.set(false);
@@ -209,7 +206,7 @@ public class ResourceProviderTrackerTest {
assertTrue(removedCalled.get());
// verify a single provider
- assertThat(tracker.getResourceProviderStorage().getAllHandlers().size(), equalTo(1));
+ assertEquals(1, tracker.getResourceProviderStorage().getAllHandlers().size());
// reset boolean markers
addedCalled.set(false);
@@ -223,7 +220,7 @@ public class ResourceProviderTrackerTest {
assertTrue(removedCalled.get());
// verify a single provider
- assertThat(tracker.getResourceProviderStorage().getAllHandlers().size(), equalTo(1));
+ assertEquals(1, tracker.getResourceProviderStorage().getAllHandlers().size());
// reset boolean markers
addedCalled.set(false);
@@ -237,7 +234,7 @@ public class ResourceProviderTrackerTest {
assertFalse(addedCalled.get());
// verify no provider
- assertThat(tracker.getResourceProviderStorage().getAllHandlers().size(), equalTo(0));
+ assertTrue(tracker.getResourceProviderStorage().getAllHandlers().isEmpty());
}
@Test
@@ -248,8 +245,8 @@ public class ResourceProviderTrackerTest {
tracker.fill(dto);
- assertThat( dto.providers, arrayWithSize(2));
- assertThat( dto.failedProviders, arrayWithSize(1));
+ assertEquals(2, dto.providers.length);
+ assertEquals(1, dto.failedProviders.length);
}
static final class NoDothingObservationReporter implements ObservationReporter {