Author: rombert Date: Tue Sep 6 11:28:01 2016 New Revision: 1759409 URL: http://svn.apache.org/viewvc?rev=1759409&view=rev Log: SLING-6032 - Not sling pipe
Submitted-By: Nicolas Peltier Modified: sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/Pipe.java sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/ReferencePipe.java sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/impl/PlumberImpl.java sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/ContainerPipeTest.java sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/FilterPipeTest.java sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/JsonPipeTest.java sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MovePipeTest.java sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java Modified: sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java?rev=1759409&r1=1759408&r2=1759409&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/BasePipe.java Tue Sep 6 11:28:01 2016 @@ -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(); } Modified: sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/Pipe.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/Pipe.java?rev=1759409&r1=1759408&r2=1759409&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/Pipe.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/Pipe.java Tue Sep 6 11:28:01 2016 @@ -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 Modified: sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/ReferencePipe.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/ReferencePipe.java?rev=1759409&r1=1759408&r2=1759409&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/ReferencePipe.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/ReferencePipe.java Tue Sep 6 11:28:01 2016 @@ -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 BaseP } @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 Modified: sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/impl/PlumberImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/impl/PlumberImpl.java?rev=1759409&r1=1759408&r2=1759409&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/impl/PlumberImpl.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/main/java/org/apache/sling/pipes/impl/PlumberImpl.java Tue Sep 6 11:28:01 2016 @@ -30,22 +30,7 @@ import org.apache.sling.distribution.Dis 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 Plum 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 Modified: sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java?rev=1759409&r1=1759408&r2=1759409&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/AbstractPipeTest.java Tue Sep 6 11:28:01 2016 @@ -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.sli 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()); + } } Modified: sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/ContainerPipeTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/ContainerPipeTest.java?rev=1759409&r1=1759408&r2=1759409&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/ContainerPipeTest.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/ContainerPipeTest.java Tue Sep 6 11:28:01 2016 @@ -45,8 +45,7 @@ public class ContainerPipeTest extends A @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 A @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 A @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 Modified: sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/FilterPipeTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/FilterPipeTest.java?rev=1759409&r1=1759408&r2=1759409&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/FilterPipeTest.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/FilterPipeTest.java Tue Sep 6 11:28:01 2016 @@ -43,9 +43,7 @@ public class FilterPipeTest extends Abst @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 Abst @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 Abst @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 Modified: sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/JsonPipeTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/JsonPipeTest.java?rev=1759409&r1=1759408&r2=1759409&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/JsonPipeTest.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/JsonPipeTest.java Tue Sep 6 11:28:01 2016 @@ -40,9 +40,7 @@ public class JsonPipeTest extends Abstra @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 Abstra @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(); Modified: sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MovePipeTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MovePipeTest.java?rev=1759409&r1=1759408&r2=1759409&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MovePipeTest.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MovePipeTest.java Tue Sep 6 11:28:01 2016 @@ -44,9 +44,7 @@ public class MovePipeTest extends Abstra @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 Abstra @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); Modified: sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java?rev=1759409&r1=1759408&r2=1759409&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/MultiPropertyPipeTest.java Tue Sep 6 11:28:01 2016 @@ -39,8 +39,7 @@ public class MultiPropertyPipeTest exten @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 exten @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()); } } Modified: sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java?rev=1759409&r1=1759408&r2=1759409&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/SlingQueryPipeTest.java Tue Sep 6 11:28:01 2016 @@ -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 @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 Modified: sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java?rev=1759409&r1=1759408&r2=1759409&view=diff ============================================================================== --- sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java (original) +++ sling/trunk/contrib/extensions/sling-pipes/src/test/java/org/apache/sling/pipes/WritePipeTest.java Tue Sep 6 11:28:01 2016 @@ -68,9 +68,7 @@ public class WritePipeTest extends Abstr @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 Abstr @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 Abstr @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();