test

assira/pom.xml

@@ -33,8 +33,6 @@
                                 <include>net/ranides/assira/awt/ImageLoader*</include>
                                 <include>net/ranides/assira/awt/AWTInvoker*</include>
                                 
-                                <include>net/ranides/assira/collection/ACollectionQuery*</include>
-                                <include>net/ranides/assira/collection/CollectionQuery*</include>
                                 <include>net/ranides/assira/collection/arrays/NativeArrayUtils</include>
                                 <include>net/ranides/assira/collection/arrays/ArrayUtils</include>
                                 <include>net/ranides/assira/collection/iterators/ForwardIterator*</include>
@@ -42,6 +40,7 @@
                                 <include>net/ranides/assira/collection/iterators/IntIteratorUtils*</include>
                                 <include>net/ranides/assira/collection/lists/ListUtils</include>
                                 <include>net/ranides/assira/collection/sets/Bitmask*</include>
+                                <include>net/ranides/assira/collection/query/**</include>
                                 
                                 <include>net/ranides/assira/lexer/**</include>
                                 

assira/src/test/java/net/ranides/assira/collection/CollectionQueryTest.java

@@ -4,7 +4,7 @@
  * @license WTFPL
  * @url http://ranides.net/projects/assira
  */
-package net.ranides.assira.collection;
+package net.ranides.assira.collection.query;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -16,7 +16,7 @@ import static net.ranides.assira.junit.NewAssert.*;
  *
  * @author Ranides Atterwim <ranides@gmail.com>
  */
-public class CollectionQueryTest {
+public class CQueryTest {
     
     private static final List<Character> CHARS = Arrays.asList('a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z');
     
@@ -35,11 +35,11 @@ public class CollectionQueryTest {
         
         List<Integer> src = new ArrayList<>();
         
-        CollectionQuery<String> query = CollectionQuery.fromCollection(src)
+        CQuery<String> query = CQueryBuilder.fromCollection(src)
             .filter(v -> v%2 == 0)
             .filter(v -> v>3)
             .limit(3)
-            .unfold(i -> CollectionQuery.fromCollection(CHARS).limit(i/2).map(c->i+"."+c));
+            .unfold(i -> CQueryBuilder.fromCollection(CHARS).limit(i/2).map(c->i+"."+c));
         
         src.addAll(Arrays.asList(0,1,2,3,4,5,6,7,8,9,10));