Fix compliler warnings in stream-tests.el

[gnu-emacs-elpa] / packages / stream / tests / stream-tests.el

diff --git a/packages/stream/tests/stream-tests.el b/packages/stream/tests/stream-tests.el
index 0033ed74a394830ab5b4f9773c80bc2ec6ed2718..199720209c890e63501985da67179a1d5a6bea23 100644 (file)
--- a/packages/stream/tests/stream-tests.el
+++ b/packages/stream/tests/stream-tests.el
@@ -26,6 +26,7 @@
 
 (require 'ert)
 (require 'stream)
+(require 'cl-lib)
 
 (defun stream-to-list (stream)
   "Eagerly traverse STREAM and return a list of its elements."
@@ -51,8 +52,8 @@
   (should (= 4 (stream-first (stream-rest (stream-range 3)))))
   (should (= 5 (stream-first (stream-rest (stream-rest (stream-range 3)))))))
 
-(ert-deftest stream-seq-p-test ()
-  (should (seq-p (stream-range))))
+(ert-deftest stream-seqp-test ()
+  (should (seqp (stream-range))))
 
 (ert-deftest stream-seq-elt-test ()
   (should (null (seq-elt (stream-empty) 0)))
@@ -108,18 +109,18 @@
 (ert-deftest stream-seq-take-while-test ()
   (let ((stream (stream '(1 3 2 5))))
     (should (stream-empty-p (seq-take-while #'identity (stream-empty))))
-    (should (streamp (seq-take-while #'oddp stream)))
-    (should (= 1 (stream-first (seq-take-while #'oddp stream))))
-    (should (= 3 (stream-first (stream-rest (seq-take-while #'oddp stream)))))
-    (should (stream-empty-p (stream-rest (stream-rest (seq-take-while #'oddp stream)))))))
+    (should (streamp (seq-take-while #'cl-oddp stream)))
+    (should (= 1 (stream-first (seq-take-while #'cl-oddp stream))))
+    (should (= 3 (stream-first (stream-rest (seq-take-while #'cl-oddp stream)))))
+    (should (stream-empty-p (stream-rest (stream-rest (seq-take-while #'cl-oddp stream)))))))
 
 (ert-deftest stream-seq-drop-while-test ()
   (let ((stream (stream '(1 3 2 5))))
-    (should (streamp (seq-drop-while #'evenp stream)))
+    (should (streamp (seq-drop-while #'cl-evenp stream)))
     (should (stream-empty-p (seq-drop-while #'identity (stream-empty))))
-    (should (= 2 (stream-first (seq-drop-while #'evenp stream))))
-    (should (= 5 (stream-first (stream-rest (seq-drop-while #'evenp stream)))))
-    (should (stream-empty-p (stream-rest (stream-rest (seq-drop-while #'evenp stream)))))))
+    (should (= 2 (stream-first (seq-drop-while #'cl-evenp stream))))
+    (should (= 5 (stream-first (stream-rest (seq-drop-while #'cl-evenp stream)))))
+    (should (stream-empty-p (stream-rest (stream-rest (seq-drop-while #'cl-evenp stream)))))))
 
 (ert-deftest stream-seq-map-test ()
   (should (stream-empty-p (seq-map #'- (stream-empty))))
@@ -135,11 +136,11 @@
     (should (equal result '(4 3 2 1 0)))))
 
 (ert-deftest stream-seq-filter-test ()
-  (should (stream-empty-p (seq-filter #'oddp (stream-empty))))
-  (should (stream-empty-p (seq-filter #'oddp (stream-range 0 4 2))))
-  (should (= 1 (stream-first (seq-filter #'oddp (stream-range 0 4)))))
-  (should (= 3 (stream-first (stream-rest (seq-filter #'oddp (stream-range 0 4))))))
-  (should (stream-empty-p (stream-rest (stream-rest (seq-filter #'oddp (stream-range 0 4)))))))
+  (should (stream-empty-p (seq-filter #'cl-oddp (stream-empty))))
+  (should (stream-empty-p (seq-filter #'cl-oddp (stream-range 0 4 2))))
+  (should (= 1 (stream-first (seq-filter #'cl-oddp (stream-range 0 4)))))
+  (should (= 3 (stream-first (stream-rest (seq-filter #'cl-oddp (stream-range 0 4))))))
+  (should (stream-empty-p (stream-rest (stream-rest (seq-filter #'cl-oddp (stream-range 0 4)))))))
 
 (ert-deftest stream-seq-copy-test ()
   (should (streamp (seq-copy (stream-range))))