From 891a7f98baf2fcf5e29912976b5ab10bf866530e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imre=20K=C3=B3sz=C3=B3?= Date: Sat, 30 Jul 2022 17:08:02 +0200 Subject: [PATCH 1/2] Fix xforms-test shadowing clojure.core vars Get rid of the following warnings: WARNING: reductions already refers to: #'clojure.core/reductions in namespace: net.cgrand.xforms-test, being replaced by: #'net.cgrand.xforms-test/reductions WARNING: partition already refers to: #'clojure.core/partition in namespace: net.cgrand.xforms-test, being replaced by: #'net.cgrand.xforms-test/partition --- test/net/cgrand/xforms_test.cljc | 1 + 1 file changed, 1 insertion(+) diff --git a/test/net/cgrand/xforms_test.cljc b/test/net/cgrand/xforms_test.cljc index d3b0466..e1bc748 100644 --- a/test/net/cgrand/xforms_test.cljc +++ b/test/net/cgrand/xforms_test.cljc @@ -1,4 +1,5 @@ (ns net.cgrand.xforms-test + (:refer-clojure :exclude [partition reductions]) (:require [clojure.test :refer [is deftest testing]] [net.cgrand.xforms :as x])) From 86d9ef14f114f68dd5315586095cf3be124ea787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Imre=20K=C3=B3sz=C3=B3?= Date: Sun, 31 Jul 2022 15:13:33 +0200 Subject: [PATCH 2/2] Fix some reflection warnings seen in tests --- src/net/cgrand/xforms.cljc | 2 +- test/net/cgrand/xforms_test.cljc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/net/cgrand/xforms.cljc b/src/net/cgrand/xforms.cljc index 3740693..6647dd1 100644 --- a/src/net/cgrand/xforms.cljc +++ b/src/net/cgrand/xforms.cljc @@ -556,7 +556,7 @@ "Iterator transducing context, returns an iterator on the transformed data. Equivalent to (.iterator (eduction xform (iterator-seq src-iterator))) except there's is no buffering on values (as in iterator-seq), This buffering may cause problems when mutable objects are returned by the src-iterator." - [xform ^java.util.Iterator src-iterator] + ^java.util.Iterator [xform ^java.util.Iterator src-iterator] (let [NULL (Object.) dq (java.util.ArrayDeque. 32) rf (xform (fn ([acc] acc) ([acc x] (.push dq (if (some? x) x NULL)) acc))) diff --git a/test/net/cgrand/xforms_test.cljc b/test/net/cgrand/xforms_test.cljc index e1bc748..fb6cbb4 100644 --- a/test/net/cgrand/xforms_test.cljc +++ b/test/net/cgrand/xforms_test.cljc @@ -1,6 +1,6 @@ (ns net.cgrand.xforms-test (:refer-clojure :exclude [partition reductions]) - (:require [clojure.test :refer [is deftest testing]] + (:require [clojure.test :refer [are is deftest testing]] [net.cgrand.xforms :as x])) (defn trial @@ -97,9 +97,9 @@ #?(:clj (deftest iterator - (is (true? (.hasNext (x/iterator x/count (.iterator (range 5)))))) - (is (is (= [5] (iterator-seq (x/iterator x/count (.iterator (range 5))))))) - (is (= [[0 1] [1 2] [2 3] [3 4] [4]] (iterator-seq (x/iterator (x/partition 2 1 nil) (.iterator (range 5))))))) + (is (true? (.hasNext (x/iterator x/count (.iterator ^java.lang.Iterable (range 5)))))) + (is (is (= [5] (iterator-seq (x/iterator x/count (.iterator ^java.lang.Iterable (range 5))))))) + (is (= [[0 1] [1 2] [2 3] [3 4] [4]] (iterator-seq (x/iterator (x/partition 2 1 nil) (.iterator ^java.lang.Iterable (range 5))))))) (deftest window-by-time (is (= (into