You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2018/11/20 14:20:14 UTC
[sling-org-apache-sling-capabilities] branch master updated:
SLING-8120 - refactor tests
This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-capabilities.git
The following commit(s) were added to refs/heads/master by this push:
new 3c644c5 SLING-8120 - refactor tests
3c644c5 is described below
commit 3c644c5040a1d828ef1040eb6c446a69a1ab23b1
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Nov 20 15:19:55 2018 +0100
SLING-8120 - refactor tests
---
.../internal/JSONCapabilitiesWriterTest.java | 35 +++++++++-------------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/src/test/java/org/apache/sling/capabilities/internal/JSONCapabilitiesWriterTest.java b/src/test/java/org/apache/sling/capabilities/internal/JSONCapabilitiesWriterTest.java
index 2cd2dfe..02799dd 100644
--- a/src/test/java/org/apache/sling/capabilities/internal/JSONCapabilitiesWriterTest.java
+++ b/src/test/java/org/apache/sling/capabilities/internal/JSONCapabilitiesWriterTest.java
@@ -41,6 +41,15 @@ public class JSONCapabilitiesWriterTest {
private static ResourceResolver resolver;
private static final String RESOLVER_STRING = "resolver-" + UUID.randomUUID();
+ private JsonObject getJson(ResourceResolver resolver, List<CapabilitiesSource> sources, RegexFilter namespaceFilter) throws IOException {
+ final StringWriter w = new StringWriter();
+ new JSONCapabilitiesWriter().writeJson(resolver, w, sources, namespaceFilter);
+ final JsonReader r = Json.createReader(new StringReader(w.toString()));
+ final JsonObject rootJson = r.readObject();
+ assertEquals("Expecting 1 root key", 1, rootJson.keySet().size());
+ return rootJson.getJsonObject(JSONCapabilitiesWriter.CAPS_KEY).getJsonObject("data");
+ }
+
@BeforeClass
public static void setupMocks() {
resolver = Mockito.mock(ResourceResolver.class);
@@ -51,13 +60,7 @@ public class JSONCapabilitiesWriterTest {
public void testResolverIsUsed() throws IOException {
final List<CapabilitiesSource> sources = new ArrayList<>();
sources.add(new MockSource("A", 2));
-
- final StringWriter w = new StringWriter();
- new JSONCapabilitiesWriter().writeJson(resolver, w, sources, namespaceFilter);
- final JsonReader r = Json.createReader(new StringReader(w.toString()));
- final JsonObject rootJson = r.readObject();
- final JsonObject json = rootJson.getJsonObject(JSONCapabilitiesWriter.CAPS_KEY).getJsonObject("data");
-
+ final JsonObject json = getJson(resolver, sources, namespaceFilter);
assertEquals(RESOLVER_STRING, json.getJsonObject("A").getString(ResourceResolver.class.getSimpleName()));
}
@@ -67,17 +70,12 @@ public class JSONCapabilitiesWriterTest {
sources.add(new MockSource("A", 2));
sources.add(new MockSource("B", 1));
- final StringWriter w = new StringWriter();
- new JSONCapabilitiesWriter().writeJson(resolver, w, sources, namespaceFilter);
+ final JsonObject json = getJson(resolver, sources, namespaceFilter);
- final JsonReader r = Json.createReader(new StringReader(w.toString()));
- final JsonObject rootJson = r.readObject();
- final JsonObject json = rootJson.getJsonObject(JSONCapabilitiesWriter.CAPS_KEY).getJsonObject("data");
assertEquals("VALUE_0_A", json.getJsonObject("A").getString("KEY_0_A"));
assertEquals("VALUE_1_A", json.getJsonObject("A").getString("KEY_1_A"));
assertEquals("VALUE_0_B", json.getJsonObject("B").getString("KEY_0_B"));
- assertEquals("Expecting 1 root key", 1, rootJson.keySet().size());
assertEquals("Expecting 3 keys at A", 3, json.getJsonObject("A").keySet().size());
assertEquals("Expecting 2 key at B", 2, json.getJsonObject("B").keySet().size());
}
@@ -88,13 +86,9 @@ public class JSONCapabilitiesWriterTest {
sources.add(new MockSource("A", 1));
sources.add(new MockSource("EXCEPTION", 2));
sources.add(new MockSource("B", 1));
+
+ final JsonObject json = getJson(resolver, sources, namespaceFilter);
- final StringWriter w = new StringWriter();
- new JSONCapabilitiesWriter().writeJson(resolver, w, sources, namespaceFilter);
-
- final JsonReader r = Json.createReader(new StringReader(w.toString()));
- final JsonObject rootJson = r.readObject();
- final JsonObject json = rootJson.getJsonObject(JSONCapabilitiesWriter.CAPS_KEY).getJsonObject("data");
assertEquals("VALUE_0_A", json.getJsonObject("A").getString("KEY_0_A"));
assertEquals("java.lang.IllegalArgumentException:Simulating a problem", json.getJsonObject("EXCEPTION").getString("_EXCEPTION_"));
assertEquals("VALUE_0_B", json.getJsonObject("B").getString("KEY_0_B"));
@@ -109,7 +103,6 @@ public class JSONCapabilitiesWriterTest {
sources.add(new MockSource("another", 2));
sources.add(new MockSource("duplicate", 1));
- final StringWriter w = new StringWriter();
- new JSONCapabilitiesWriter().writeJson(resolver, w, sources, namespaceFilter);
+ getJson(resolver, sources, namespaceFilter);
}
}
\ No newline at end of file