#46

assira.core/src/test/java/net/ranides/assira/collection/query/CQueryFunctionTest.java

@@ -45,19 +45,19 @@ public class CQueryFunctionTest {
         CQuery<Text> s2 = CQuery.from().values("1", "2", "5", "8").map(TextValue::new);
         CQuery<TextValue> s3 = CQuery.from().values("1", "2", "5", "8").map(TextValue::new);
 
-        List<Integer> expect = Arrays.asList(5, 5, 4, 3, 1);
+        List<Integer> expect = Arrays.asList(1, 2, 5, 8);
 
-        assertEquals(expect, s1.apply(f1));
-//        assertEquals(expect, s1.apply(f2)); // compilation error expected
-//        assertEquals(expect, s1.apply(f3)); // compilation error expected
+        assertEquals(expect, s1.apply(f1).list());
+//        assertEquals(expect, s1.apply(f2).list()); // compilation error expected
+//        assertEquals(expect, s1.apply(f3).list()); // compilation error expected
 
-        assertEquals(expect, s2.apply(f1));
-        assertEquals(expect, s2.apply(f2));
-//        assertEquals(expect, s2.apply(f3)); // compilation error expected
+        assertEquals(expect, s2.apply(f1).list());
+        assertEquals(expect, s2.apply(f2).list());
+//        assertEquals(expect, s2.apply(f3).list()); // compilation error expected
 
-        assertEquals(expect, s3.apply(f1));
-        assertEquals(expect, s3.apply(f2));
-        assertEquals(expect, s3.apply(f3));
+        assertEquals(expect, s3.apply(f1).list());
+        assertEquals(expect, s3.apply(f2).list());
+        assertEquals(expect, s3.apply(f3).list());
     }
 
     private interface Text extends CharSequence {
@@ -83,6 +83,11 @@ public class CQueryFunctionTest {
         public TextValue subSequence(int start, int end) {
             return new TextValue(text.subSequence(start, end));
         }
+
+        @Override
+        public String toString() {
+            return text.toString();
+        }
     }
 
 }