svn commit: r1595909 - in /jena/trunk/jena-arq/src: main/java/org/apache/jena/atlas/iterator/FilterStack.java test/java/org/apache/jena/atlas/iterator/TestIter.java

[andy]

Author: andy
Date: Mon May 19 14:06:11 2014
New Revision: 1595909

URL: http://svn.apache.org/r1595909
Log:
JENA-698

Modified:
    
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterStack.java
    
jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java

Modified: 
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterStack.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterStack.java?rev=1595909&r1=1595908&r2=1595909&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterStack.java
 (original)
+++ 
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterStack.java
 Mon May 19 14:06:11 2014
@@ -58,7 +58,7 @@ public abstract class FilterStack<T> imp
     {
         if ( other != null && ! other.accept(item) )
             return false ;
-        return  ! acceptAdditional(item) ;
+        return acceptAdditional(item) ;
     }
 
     

Modified: 
jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java?rev=1595909&r1=1595908&r2=1595909&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java 
(original)
+++ 
jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java 
Mon May 19 14:06:11 2014
@@ -27,9 +27,6 @@ import java.util.Arrays ;
 import java.util.Iterator ;
 import java.util.List ;
 
-import org.apache.jena.atlas.iterator.Filter ;
-import org.apache.jena.atlas.iterator.Iter ;
-import org.apache.jena.atlas.iterator.Transform ;
 import org.junit.Test ;
 
 public class TestIter
@@ -498,5 +495,45 @@ public class TestIter
         Iterator<String> iter = Iter.distinctAdjacent(x) ;
         test(iter, "a", "b", "a") ;
     }
+    
+    private static class AlwaysAcceptFilter implements Filter<Object> {
+        @Override
+        public boolean accept(Object o) {
+            return true;
+        }
+    }
+
+    private static class NeverAcceptFilter implements Filter<Object> {
+        @Override
+        public boolean accept(Object o) {
+            return false;
+        }
+    }
+
+    
+    private static class AlwaysAcceptFilterStack extends FilterStack<Object> {
+        public AlwaysAcceptFilterStack(Filter<Object> f) {
+            super(f);
+        }
+
+        @Override
+        public boolean acceptAdditional(Object o) {
+            return true;
+        }
+    }
+
+    @Test
+    public void testFilterStack_01() {
+        Filter<Object> filter = new AlwaysAcceptFilter();
+        FilterStack<Object> filterStack = new AlwaysAcceptFilterStack(filter);
+        assertTrue(filterStack.accept(new Object()));
+    }
+    
+    @Test
+    public void testFilterStack_02() {
+        Filter<Object> filter = new NeverAcceptFilter();
+        FilterStack<Object> filterStack = new AlwaysAcceptFilterStack(filter);
+        assertFalse(filterStack.accept(new Object()));
+    }
 
 }