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 2017/11/07 09:56:57 UTC
[sling-org-apache-sling-pipes] 13/31: SLING-6032 - Not sling pipe
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.pipes-0.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-pipes.git
commit 42c9c0f72e151e8213ccfc8acc971609fab3ba3f
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 6 11:28:01 2016 +0000
SLING-6032 - Not sling pipe
Submitted-By: Nicolas Peltier
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/sling-pipes@1759409 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/pipes/BasePipe.java | 18 ++++++++++++--
src/main/java/org/apache/sling/pipes/Pipe.java | 16 +++++++++----
.../java/org/apache/sling/pipes/ReferencePipe.java | 28 ++++++++++------------
.../org/apache/sling/pipes/impl/PlumberImpl.java | 18 ++------------
.../org/apache/sling/pipes/AbstractPipeTest.java | 28 ++++++++++++++++++++++
.../org/apache/sling/pipes/ContainerPipeTest.java | 16 ++++---------
.../org/apache/sling/pipes/FilterPipeTest.java | 23 ++++--------------
.../java/org/apache/sling/pipes/JsonPipeTest.java | 8 ++-----
.../java/org/apache/sling/pipes/MovePipeTest.java | 8 ++-----
.../apache/sling/pipes/MultiPropertyPipeTest.java | 15 ++++--------
.../org/apache/sling/pipes/SlingQueryPipeTest.java | 10 +-------
.../java/org/apache/sling/pipes/WritePipeTest.java | 15 ++++--------
12 files changed, 91 insertions(+), 112 deletions(-)
diff --git a/src/main/java/org/apache/sling/pipes/BasePipe.java b/src/main/java/org/apache/sling/pipes/BasePipe.java
index 0e1b6e5..e256daf 100644
--- a/src/main/java/org/apache/sling/pipes/BasePipe.java
+++ b/src/main/java/org/apache/sling/pipes/BasePipe.java
@@ -43,6 +43,7 @@ public class BasePipe implements Pipe {
protected ContainerPipe parent;
protected String distributionAgent;
protected PipeBindings bindings;
+ protected ReferencePipe referrer;
// used by pipes using complex JCR configurations
public static final List<String> IGNORED_PROPERTIES = Arrays.asList(new String[]{"jcr:lastModified", "jcr:primaryType", "jcr:created", "jcr:createdBy"});
@@ -127,11 +128,15 @@ public class BasePipe implements Pipe {
return configuredInput;
}
+ protected Pipe getPreviousPipe(){
+ return referrer == null ? parent.getPreviousPipe(this) : referrer.getPreviousPipe();
+ }
+
@Override
public Resource getInput() {
Resource resource = getConfiguredInput();
if (resource == null && parent != null){
- Pipe previousPipe = parent.getPreviousPipe(this);
+ Pipe previousPipe = getPreviousPipe();
if (previousPipe != null) {
return bindings.getExecutedResource(previousPipe.getName());
}
@@ -166,7 +171,11 @@ public class BasePipe implements Pipe {
* @return
*/
public Iterator<Resource> getOutput(){
- return Collections.singleton(getInput()).iterator();
+ Resource resource = getInput();
+ if (resource != null){
+ return Collections.singleton(resource).iterator();
+ }
+ return EMPTY_ITERATOR;
}
/**
@@ -182,5 +191,10 @@ public class BasePipe implements Pipe {
return distributionAgent;
}
+ @Override
+ public void setReferrer(ReferencePipe pipe) {
+ referrer = pipe;
+ }
+
public static final Iterator<Resource> EMPTY_ITERATOR = Collections.emptyIterator();
}
diff --git a/src/main/java/org/apache/sling/pipes/Pipe.java b/src/main/java/org/apache/sling/pipes/Pipe.java
index d33fe1a..bc97e94 100644
--- a/src/main/java/org/apache/sling/pipes/Pipe.java
+++ b/src/main/java/org/apache/sling/pipes/Pipe.java
@@ -27,24 +27,24 @@ public interface Pipe {
/**
* Name of the pipe
*/
- public static final String PN_NAME = "name";
+ String PN_NAME = "name";
/**
* expression of the pipe, usage depends on the pipe implementation
*/
- public static final String PN_EXPR = "expr";
+ String PN_EXPR = "expr";
/**
* resource's path associated to the path, usage depends on the pipe implementation
*/
- public static final String PN_PATH = "path";
+ String PN_PATH = "path";
/**
* Node name for the pipe's configuration
*/
- public static final String NN_CONF = "conf";
+ String NN_CONF = "conf";
- public static final String PN_DISTRIBUTION_AGENT = "distribution.agent";
+ String PN_DISTRIBUTION_AGENT = "distribution.agent";
/**
* returns true if that pipe will modify content during its execution
@@ -115,4 +115,10 @@ public interface Pipe {
* Get Distribution agent
*/
String getDistributionAgent();
+
+ /**
+ * sets the reference pipe this pipe is referred by
+ * @param pipe
+ */
+ void setReferrer(ReferencePipe pipe);
}
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/pipes/ReferencePipe.java b/src/main/java/org/apache/sling/pipes/ReferencePipe.java
index 8d6b11e..7076bdd 100644
--- a/src/main/java/org/apache/sling/pipes/ReferencePipe.java
+++ b/src/main/java/org/apache/sling/pipes/ReferencePipe.java
@@ -26,23 +26,19 @@ import java.util.Iterator;
public class ReferencePipe extends BasePipe {
public static final String RESOURCE_TYPE = "slingPipes/reference";
- Pipe reference;
+ protected Pipe reference;
public ReferencePipe(Plumber plumber, Resource resource) throws Exception {
super(plumber, resource);
- Resource pipeResource = resolver.getResource(getPath());
+ Resource pipeResource = resolver.getResource(getExpr());
if (pipeResource == null){
- throw new Exception("Reference configuration error: There is no resource at " + getPath());
+ throw new Exception("Reference configuration error: There is no resource at " + getExpr());
}
reference = plumber.getPipe(pipeResource);
if (reference == null){
throw new Exception("Unable to build out pipe out of " + getPath());
}
- }
-
- @Override
- public Iterator<Resource> getOutput() {
- return reference.getOutput();
+ reference.setReferrer(this);
}
@Override
@@ -52,22 +48,22 @@ public class ReferencePipe extends BasePipe {
}
@Override
- public Object getOutputBinding() {
- return reference.getOutputBinding();
+ public void setBindings(PipeBindings bindings) {
+ reference.setBindings(bindings);
}
@Override
- public boolean modifiesContent() {
- return reference.modifiesContent();
+ public Iterator<Resource> getOutput() {
+ return reference.getOutput();
}
@Override
- public Resource getInput() {
- return reference.getInput();
+ public Object getOutputBinding() {
+ return reference.getOutputBinding();
}
@Override
- public Resource getConfiguredInput() {
- return reference.getConfiguredInput();
+ public boolean modifiesContent() {
+ return reference.modifiesContent();
}
}
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/pipes/impl/PlumberImpl.java b/src/main/java/org/apache/sling/pipes/impl/PlumberImpl.java
index 6845197..3b9675b 100644
--- a/src/main/java/org/apache/sling/pipes/impl/PlumberImpl.java
+++ b/src/main/java/org/apache/sling/pipes/impl/PlumberImpl.java
@@ -30,22 +30,7 @@ import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.DistributionResponse;
import org.apache.sling.distribution.Distributor;
import org.apache.sling.distribution.SimpleDistributionRequest;
-import org.apache.sling.pipes.AuthorizablePipe;
-import org.apache.sling.pipes.BasePipe;
-import org.apache.sling.pipes.ContainerPipe;
-import org.apache.sling.pipes.FilterPipe;
-import org.apache.sling.pipes.PathPipe;
-import org.apache.sling.pipes.JsonPipe;
-import org.apache.sling.pipes.MovePipe;
-import org.apache.sling.pipes.MultiPropertyPipe;
-import org.apache.sling.pipes.ParentPipe;
-import org.apache.sling.pipes.Pipe;
-import org.apache.sling.pipes.Plumber;
-import org.apache.sling.pipes.ReferencePipe;
-import org.apache.sling.pipes.RemovePipe;
-import org.apache.sling.pipes.SlingQueryPipe;
-import org.apache.sling.pipes.WritePipe;
-import org.apache.sling.pipes.XPathPipe;
+import org.apache.sling.pipes.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -87,6 +72,7 @@ public class PlumberImpl implements Plumber {
registerPipe(MovePipe.RESOURCE_TYPE, MovePipe.class);
registerPipe(PathPipe.RESOURCE_TYPE, PathPipe.class);
registerPipe(FilterPipe.RESOURCE_TYPE, FilterPipe.class);
+ registerPipe(NotPipe.RESOURCE_TYPE, NotPipe.class);
}
@Override
diff --git a/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java b/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java
index 2a3d9dc..5aab25d 100644
--- a/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sling.pipes;
+import org.apache.sling.api.resource.Resource;
import org.apache.sling.pipes.dummies.DummyNull;
import org.apache.sling.pipes.dummies.DummySearch;
import org.apache.sling.pipes.impl.PlumberImpl;
@@ -24,6 +25,12 @@ import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.Before;
import org.junit.Rule;
+import java.util.Iterator;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* this abstract class for pipes implements a plumber with all registered pipes, plus some test ones, and give some paths,
* it also provides a testing Sling Context, with some content.
@@ -52,4 +59,25 @@ public class AbstractPipeTest {
context.load().json("/fruits.json", PATH_FRUITS);
}
+ protected Pipe getPipe(String path){
+ Resource resource = context.resourceResolver().getResource(path);
+ return plumber.getPipe(resource);
+ }
+
+ protected Iterator<Resource> getOutput(String path){
+ Pipe pipe = getPipe(path);
+ assertNotNull("pipe should be found", pipe);
+ return pipe.getOutput();
+ }
+
+ /**
+ * tests given pipe (pipePath) outputs at least one resource, which path is resourcepath
+ * @param pipePath
+ * @param resourcePath
+ */
+ protected void testOneResource(String pipePath, String resourcePath){
+ Iterator<Resource> it = getOutput(pipePath);
+ assertTrue("pipe should have results", it.hasNext());
+ assertEquals("return result should be the one expected", resourcePath, it.next().getPath());
+ }
}
diff --git a/src/test/java/org/apache/sling/pipes/ContainerPipeTest.java b/src/test/java/org/apache/sling/pipes/ContainerPipeTest.java
index 43c3d9e..6d05881 100644
--- a/src/test/java/org/apache/sling/pipes/ContainerPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/ContainerPipeTest.java
@@ -45,8 +45,7 @@ public class ContainerPipeTest extends AbstractPipeTest {
@Test
public void testDummyTree() throws Exception {
- Resource resource = context.resourceResolver().getResource(PATH_PIPE + "/" + NN_DUMMYTREE);
- ContainerPipe pipe = (ContainerPipe)plumber.getPipe(resource);
+ ContainerPipe pipe = (ContainerPipe)getPipe(PATH_PIPE + "/" + NN_DUMMYTREE);
assertNotNull("A container pipe should be built out from the given configuration", pipe);
Iterator<Resource> resourceIterator = pipe.getOutput();
assertTrue("There should be some results", resourceIterator.hasNext());
@@ -78,8 +77,7 @@ public class ContainerPipeTest extends AbstractPipeTest {
@Test
public void testOtherTree() throws Exception {
- Resource resource = context.resourceResolver().getResource(PATH_PIPE + "/" + NN_OTHERTREE);
- ContainerPipe pipe = (ContainerPipe)plumber.getPipe(resource);
+ ContainerPipe pipe = (ContainerPipe)getPipe(PATH_PIPE + "/" + NN_OTHERTREE);
Iterator<Resource> resourceIterator = pipe.getOutput();
assertTrue("There should be some results", resourceIterator.hasNext());
Resource firstResource = resourceIterator.next();
@@ -98,17 +96,11 @@ public class ContainerPipeTest extends AbstractPipeTest {
@Test
public void testRottenTree() throws Exception {
- Resource resource = context.resourceResolver().getResource(PATH_PIPE + "/" + NN_ROTTENTREE);
- ContainerPipe pipe = (ContainerPipe)plumber.getPipe(resource);
- Iterator<Resource> resourceIterator = pipe.getOutput();
- assertFalse("There shouldn't be any resource", resourceIterator.hasNext());
+ assertFalse("There shouldn't be any resource", getOutput(PATH_PIPE + "/" + NN_ROTTENTREE).hasNext());
}
@Test
public void testOnePipe() throws Exception {
- Resource resource = context.resourceResolver().getResource(PATH_PIPE + "/" + NN_ONEPIPE);
- ContainerPipe pipe = (ContainerPipe)plumber.getPipe(resource);
- Iterator<Resource> resourceIterator = pipe.getOutput();
- assertTrue("There should be children", resourceIterator.hasNext());
+ assertTrue("There should be children", getOutput(PATH_PIPE + "/" + NN_ONEPIPE).hasNext());
}
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/pipes/FilterPipeTest.java b/src/test/java/org/apache/sling/pipes/FilterPipeTest.java
index da4cb00..3a54204 100644
--- a/src/test/java/org/apache/sling/pipes/FilterPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/FilterPipeTest.java
@@ -43,9 +43,7 @@ public class FilterPipeTest extends AbstractPipeTest {
@Test
public void testFilterProperties(){
- Resource resource = context.resourceResolver().getResource(PATH_PIPE + "/" + NN_PROPERTIES);
- ContainerPipe pipe = (ContainerPipe)plumber.getPipe(resource);
- Iterator<Resource> resourceIterator = pipe.getOutput();
+ Iterator<Resource> resourceIterator = getOutput(PATH_PIPE + "/" + NN_PROPERTIES);
assertTrue("output has one resource...", resourceIterator.hasNext());
ValueMap properties = resourceIterator.next().adaptTo(ValueMap.class);
assertFalse("...and only One", resourceIterator.hasNext());
@@ -55,9 +53,7 @@ public class FilterPipeTest extends AbstractPipeTest {
@Test
public void testNoChildrenPasses(){
- Resource resource = context.resourceResolver().getResource(PATH_PIPE + "/" + NN_NOCHILDREN);
- Pipe pipe = plumber.getPipe(resource);
- Iterator<Resource> resourceIterator = pipe.getOutput();
+ Iterator<Resource> resourceIterator = getOutput(PATH_PIPE + "/" + NN_NOCHILDREN);
assertTrue("output has one resource...", resourceIterator.hasNext());
resourceIterator.next().adaptTo(ValueMap.class);
assertFalse("...and only One", resourceIterator.hasNext());
@@ -66,26 +62,17 @@ public class FilterPipeTest extends AbstractPipeTest {
@Test
public void testNoChildrenFails(){
- Resource resource = context.resourceResolver().getResource(PATH_PIPE + "/" + NN_NOCHILDREN_FAILS);
- Pipe pipe = plumber.getPipe(resource);
- Iterator<Resource> resourceIterator = pipe.getOutput();
- assertFalse("output has no resource...", resourceIterator.hasNext());
+ assertFalse("output has no resource...", getOutput(PATH_PIPE + "/" + NN_NOCHILDREN_FAILS).hasNext());
}
@Test
public void testTestPasses() {
- Resource resource = context.resourceResolver().getResource(PATH_PIPE + "/" + NN_TEST);
- Pipe pipe = plumber.getPipe(resource);
- Iterator<Resource> resourceIterator = pipe.getOutput();
- assertTrue("output has one resource...", resourceIterator.hasNext());
+ assertTrue("output has one resource...", getOutput(PATH_PIPE + "/" + NN_TEST).hasNext());
}
@Test
public void testTestFails() {
- Resource resource = context.resourceResolver().getResource(PATH_PIPE + "/" + NN_TEST_FAILS);
- Pipe pipe = plumber.getPipe(resource);
- Iterator<Resource> resourceIterator = pipe.getOutput();
- assertFalse("output has no resource...", resourceIterator.hasNext());
+ assertFalse("output has no resource...", getOutput(PATH_PIPE + "/" + NN_TEST_FAILS).hasNext());
}
@Test
diff --git a/src/test/java/org/apache/sling/pipes/JsonPipeTest.java b/src/test/java/org/apache/sling/pipes/JsonPipeTest.java
index bd3a677..70527a5 100644
--- a/src/test/java/org/apache/sling/pipes/JsonPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/JsonPipeTest.java
@@ -40,9 +40,7 @@ public class JsonPipeTest extends AbstractPipeTest {
@Test
public void testPipedJson() throws Exception{
- Resource resource = context.resourceResolver().getResource(CONF);
- Pipe pipe = plumber.getPipe(resource);
- Iterator<Resource> outputs = pipe.getOutput();
+ Iterator<Resource> outputs = getOutput(CONF);
outputs.next();
Resource result = outputs.next();
context.resourceResolver().commit();
@@ -53,9 +51,7 @@ public class JsonPipeTest extends AbstractPipeTest {
@Test
public void testPipedArray() throws Exception {
- Resource resource = context.resourceResolver().getResource(ARRAY);
- ContainerPipe pipe = (ContainerPipe)plumber.getPipe(resource);
- Iterator<Resource> outputs = pipe.getOutput();
+ Iterator<Resource> outputs = getOutput(ARRAY);
Resource first = outputs.next();
Resource second = outputs.next();
Resource third = outputs.next();
diff --git a/src/test/java/org/apache/sling/pipes/MovePipeTest.java b/src/test/java/org/apache/sling/pipes/MovePipeTest.java
index dcb8e00..42e78cd 100644
--- a/src/test/java/org/apache/sling/pipes/MovePipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/MovePipeTest.java
@@ -44,9 +44,7 @@ public class MovePipeTest extends AbstractPipeTest {
@Ignore //move operation is not supported yet by MockSession
@Test
public void testMoveNode() throws Exception {
- Resource resource = context.resourceResolver().getResource(PATH_PIPE + MOVENODE_PIPE);
- Pipe pipe = plumber.getPipe(resource);
- Iterator<Resource> output = pipe.getOutput();
+ Iterator<Resource> output = getOutput(PATH_PIPE + MOVENODE_PIPE);
Assert.assertTrue(output.hasNext());
output.next();
Session session = context.resourceResolver().adaptTo(Session.class);
@@ -57,9 +55,7 @@ public class MovePipeTest extends AbstractPipeTest {
@Ignore //move operation is not supported yet by MockSession
@Test
public void testMoveProperty() throws Exception {
- Resource resource = context.resourceResolver().getResource(PATH_PIPE + MOVEPROPERTY_PIPE);
- Pipe pipe = plumber.getPipe(resource);
- Iterator<Resource> output = pipe.getOutput();
+ Iterator<Resource> output = getOutput(PATH_PIPE + MOVEPROPERTY_PIPE);
Assert.assertTrue(output.hasNext());
output.next();
Session session = context.resourceResolver().adaptTo(Session.class);
diff --git a/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java b/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java
index 549cde2..3b29cd6 100644
--- a/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java
@@ -39,8 +39,7 @@ public class MultiPropertyPipeTest extends AbstractPipeTest {
@Test
public void testMV() throws Exception{
- Resource conf = context.resourceResolver().getResource(PATH_PIPE + "/working");
- Pipe pipe = plumber.getPipe(conf);
+ Pipe pipe = getPipe(PATH_PIPE + "/working");
Iterator<Resource> outputs = pipe.getOutput();
Resource resource = outputs.next();
assertNotNull(resource);
@@ -56,14 +55,8 @@ public class MultiPropertyPipeTest extends AbstractPipeTest {
@Test
public void testNonWorkingMV() throws Exception{
- Resource conf = context.resourceResolver().getResource(PATH_PIPE + "/typo");
- Pipe pipe = plumber.getPipe(conf);
- assertFalse("There should not be next for a non existing resource", pipe.getOutput().hasNext());
- conf = context.resourceResolver().getResource(PATH_PIPE + "/notProperty");
- pipe = plumber.getPipe(conf);
- assertFalse("There should not be next for a resource that is not a property", pipe.getOutput().hasNext());
- conf = context.resourceResolver().getResource(PATH_PIPE + "/notMultiple");
- pipe = plumber.getPipe(conf);
- assertFalse("There should not be next for a property that is not multiple", pipe.getOutput().hasNext());
+ assertFalse("There should not be next for a non existing resource", getOutput(PATH_PIPE + "/typo").hasNext());
+ assertFalse("There should not be next for a resource that is not a property", getOutput(PATH_PIPE + "/notProperty").hasNext());
+ assertFalse("There should not be next for a property that is not multiple", getOutput(PATH_PIPE + "/notMultiple").hasNext());
}
}
diff --git a/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java b/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java
index 870f83a..54e9d05 100644
--- a/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java
@@ -16,13 +16,9 @@
*/
package org.apache.sling.pipes;
-import org.apache.sling.api.resource.Resource;
import org.junit.Before;
import org.junit.Test;
-import java.util.Iterator;
-
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/**
@@ -39,10 +35,6 @@ public class SlingQueryPipeTest extends AbstractPipeTest {
@Test
public void testChildren() throws Exception {
- Resource resource = context.resourceResolver().getResource(PATH_PIPE + "/" + NN_SIMPLE);
- SlingQueryPipe pipe = (SlingQueryPipe)plumber.getPipe(resource);
- assertNotNull("A Sling query pipe should be built out from the given configuration", pipe);
- Iterator<Resource> it = pipe.getOutput();
- assertTrue("this pipe should have an output", it.hasNext());
+ assertTrue("this pipe should have an output", getOutput(PATH_PIPE + "/" + NN_SIMPLE).hasNext());
}
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/pipes/WritePipeTest.java b/src/test/java/org/apache/sling/pipes/WritePipeTest.java
index 75b4371..d102d65 100644
--- a/src/test/java/org/apache/sling/pipes/WritePipeTest.java
+++ b/src/test/java/org/apache/sling/pipes/WritePipeTest.java
@@ -68,9 +68,7 @@ public class WritePipeTest extends AbstractPipeTest {
@Test
public void testPiped() throws Exception {
- Resource confResource = context.resourceResolver().getResource(PATH_PIPE + "/" + NN_PIPED);
- Pipe pipe = plumber.getPipe(confResource);
- assertNotNull("pipe should be found", pipe);
+ Pipe pipe = getPipe(PATH_PIPE + "/" + NN_PIPED);
assertTrue("this pipe should be marked as content modifier", pipe.modifiesContent());
Iterator<Resource> it = pipe.getOutput();
assertTrue("There should be one result", it.hasNext());
@@ -90,13 +88,9 @@ public class WritePipeTest extends AbstractPipeTest {
@Test
public void testVariablePiped() throws Exception {
- String pipePath = PATH_PIPE + "/" + NN_VARIABLE_PIPED;
- Resource confResource = context.resourceResolver().getResource(pipePath);
- Pipe pipe = plumber.getPipe(confResource);
- assertNotNull("pipe should be found", pipe);
- Iterator<Resource> it = pipe.getOutput();
+ Iterator<Resource> it = getOutput(PATH_PIPE + "/" + NN_VARIABLE_PIPED);
Resource resource = it.next();
- assertEquals("path should be the one configured in first pipe", pipePath + "/conf/fruit/conf/apple", resource.getPath());
+ assertEquals("path should be the one configured in first pipe", PATH_PIPE + "/" + NN_VARIABLE_PIPED + "/conf/fruit/conf/apple", resource.getPath());
context.resourceResolver().commit();
ValueMap properties = resource.adaptTo(ValueMap.class);
assertEquals("Configured value should be written", "apple is a fruit and its color is green", properties.get("jcr:description", ""));
@@ -108,8 +102,7 @@ public class WritePipeTest extends AbstractPipeTest {
@Test
public void testSimpleTree() throws Exception {
- Resource confResource = context.resourceResolver().getResource(PATH_PIPE + "/" + NN_SIMPLETREE);
- Pipe pipe = plumber.getPipe(confResource);
+ Pipe pipe = getPipe(PATH_PIPE + "/" + NN_SIMPLETREE);
assertNotNull("pipe should be found", pipe);
assertTrue("this pipe should be marked as content modifier", pipe.modifiesContent());
pipe.getOutput();
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.