From 9bef1c652862b8d8dfd8afee1e7fc62a1bc85304 Mon Sep 17 00:00:00 2001 From: Nathan Marz Date: Tue, 30 Jun 2015 18:08:49 -0400 Subject: [PATCH] tests working in clojurescript but no runner yet --- test/com/rpl/specter/core_test.cljc | 12 +++++++----- test/com/rpl/specter/test_helpers.clj | 6 +----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/test/com/rpl/specter/core_test.cljc b/test/com/rpl/specter/core_test.cljc index 2a5d110..6589d1c 100644 --- a/test/com/rpl/specter/core_test.cljc +++ b/test/com/rpl/specter/core_test.cljc @@ -2,7 +2,7 @@ #?(:cljs (:require-macros [cljs.test :refer [is deftest]] [cljs.test.check.cljs-test :refer [defspec]] - [com.rpl.specter.test-helpers :refer [for-all+]])) + [com.rpl.specter.cljs-test-helpers :refer [for-all+]])) (:use #?(:clj [clojure.test :only [deftest is]]) #?(:clj [clojure.test.check.clojure-test :only [defspec]]) @@ -10,8 +10,9 @@ [com.rpl.specter.protocols :only [comp-paths*]]) (:require #?@(:clj [[clojure.test.check.generators :as gen] [clojure.test.check.properties :as prop]] - :cljs [[cljs.test.check.generators :as gen] - [cljs.test.check.properties :as prop]] + :cljs [[cljs.test.check :as tc] + [cljs.test.check.generators :as gen] + [cljs.test.check.properties :as prop :include-macros true]] ) [com.rpl.specter :as s])) @@ -20,6 +21,7 @@ ;; test keypath ;; test comp-structure-paths + (defn limit-size [n {gen :gen}] (gen/->Generator (fn [rnd _size] @@ -60,7 +62,7 @@ )) (deftest select-one-test - (is (thrown? Exception (s/select-one [s/ALL even?] [1 2 3 4]))) + (is (thrown? #?(:clj Exception :cljs js/Error) (s/select-one [s/ALL even?] [1 2 3 4]))) (is (= 1 (s/select-one [s/ALL odd?] [2 4 1 6]))) ) @@ -391,5 +393,5 @@ (deftest nil-select-one-test (is (= nil (s/select-one! s/ALL [nil]))) - (is (thrown? Exception (s/select-one! s/ALL []))) + (is (thrown? #?(:clj Exception :cljs js/Error) (s/select-one! s/ALL []))) ) diff --git a/test/com/rpl/specter/test_helpers.clj b/test/com/rpl/specter/test_helpers.clj index 3a52d27..e256026 100644 --- a/test/com/rpl/specter/test_helpers.clj +++ b/test/com/rpl/specter/test_helpers.clj @@ -1,11 +1,7 @@ (ns com.rpl.specter.test-helpers - (:use [clojure.test] - [clojure.test.check.clojure-test]) (:require [clojure.test.check [generators :as gen] - [properties :as prop]] - [clojure.test.check :as qc] - [clojure.pprint :as pp])) + [properties :as prop]])) ;; it seems like gen/bind and gen/return are a monad (hence the names)