summaryrefslogtreecommitdiff
path: root/test/clojure/test_clojure/java/shell.clj
diff options
context:
space:
mode:
Diffstat (limited to 'test/clojure/test_clojure/java/shell.clj')
-rw-r--r--test/clojure/test_clojure/java/shell.clj20
1 files changed, 11 insertions, 9 deletions
diff --git a/test/clojure/test_clojure/java/shell.clj b/test/clojure/test_clojure/java/shell.clj
index 777698e2..964e68c2 100644
--- a/test/clojure/test_clojure/java/shell.clj
+++ b/test/clojure/test_clojure/java/shell.clj
@@ -11,12 +11,14 @@
[clojure.java.shell :as sh])
(:import (java.io File)))
+(def platform-enc (.name (java.nio.charset.Charset/defaultCharset)))
+
(deftest test-parse-args
(are [x y] (= x y)
- [[] {:out "UTF-8" :dir nil :env nil}] (#'sh/parse-args [])
- [["ls"] {:out "UTF-8" :dir nil :env nil}] (#'sh/parse-args ["ls"])
- [["ls" "-l"] {:out "UTF-8" :dir nil :env nil}] (#'sh/parse-args ["ls" "-l"])
- [["ls"] {:out "ISO-8859-1" :dir nil :env nil}] (#'sh/parse-args ["ls" :out "ISO-8859-1"])))
+ [[] {:inenc platform-enc :outenc platform-enc :dir nil :env nil}] (#'sh/parse-args [])
+ [["ls"] {:inenc platform-enc :outenc platform-enc :dir nil :env nil}] (#'sh/parse-args ["ls"])
+ [["ls" "-l"] {:inenc platform-enc :outenc platform-enc :dir nil :env nil}] (#'sh/parse-args ["ls" "-l"])
+ [["ls"] {:inenc platform-enc :outenc "ISO-8859-1" :dir nil :env nil}] (#'sh/parse-args ["ls" :outenc "ISO-8859-1"])))
(deftest test-with-sh-dir
(are [x y] (= x y)
@@ -28,10 +30,10 @@
nil *sh-env*
{:KEY "VAL"} (with-sh-env {:KEY "VAL"} *sh-env*)))
-(deftest test-as-env-string
+(deftest test-as-env-strings
(are [x y] (= x y)
- nil (#'sh/as-env-string nil)
- ["FOO=BAR"] (seq (#'sh/as-env-string {"FOO" "BAR"}))
- ["FOO_SYMBOL=BAR"] (seq (#'sh/as-env-string {'FOO_SYMBOL "BAR"}))
- ["FOO_KEYWORD=BAR"] (seq (#'sh/as-env-string {:FOO_KEYWORD "BAR"}))))
+ nil (#'sh/as-env-strings nil)
+ ["FOO=BAR"] (seq (#'sh/as-env-strings {"FOO" "BAR"}))
+ ["FOO_SYMBOL=BAR"] (seq (#'sh/as-env-strings {'FOO_SYMBOL "BAR"}))
+ ["FOO_KEYWORD=BAR"] (seq (#'sh/as-env-strings {:FOO_KEYWORD "BAR"}))))