diff options
| author | Rich Hickey <richhickey@gmail.com> | 2010-08-22 14:12:05 -0400 |
|---|---|---|
| committer | Rich Hickey <richhickey@gmail.com> | 2010-08-22 14:12:05 -0400 |
| commit | c6fddcabebd1dec50ea535d7576615da57fc0112 (patch) | |
| tree | e197a4af918f6b6150337fcdea0c2805c190f350 /test/clojure/test_clojure/java/shell.clj | |
| parent | 07f05862c2362f6b51e7c92ccd9476c45c9dff6e (diff) | |
| parent | 77be185a6ca00a338a6647462e14206bad0e9802 (diff) | |
Merged branch 'master' into equivmerge
Conflicts were:
src/clj/clojure/core.clj
src/jvm/clojure/lang/Compiler.java
src/jvm/clojure/lang/Util.java
test/clojure/test_clojure/protocols.clj
Diffstat (limited to 'test/clojure/test_clojure/java/shell.clj')
| -rw-r--r-- | test/clojure/test_clojure/java/shell.clj | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/test/clojure/test_clojure/java/shell.clj b/test/clojure/test_clojure/java/shell.clj index 777698e2..56e3ff04 100644 --- a/test/clojure/test_clojure/java/shell.clj +++ b/test/clojure/test_clojure/java/shell.clj @@ -11,12 +11,16 @@ [clojure.java.shell :as sh]) (:import (java.io File))) +(def platform-enc (.name (java.nio.charset.Charset/defaultCharset))) +(def default-enc "UTF-8") + (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"]))) + [[] {:in-enc default-enc :out-enc default-enc :dir nil :env nil}] (#'sh/parse-args []) + [["ls"] {:in-enc default-enc :out-enc default-enc :dir nil :env nil}] (#'sh/parse-args ["ls"]) + [["ls" "-l"] {:in-enc default-enc :out-enc default-enc :dir nil :env nil}] (#'sh/parse-args ["ls" "-l"]) + [["ls"] {:in-enc default-enc :out-enc "ISO-8859-1" :dir nil :env nil}] (#'sh/parse-args ["ls" :out-enc "ISO-8859-1"]) + [[] {:in-enc platform-enc :out-enc platform-enc :dir nil :env nil}] (#'sh/parse-args [:in-enc platform-enc :out-enc platform-enc]))) (deftest test-with-sh-dir (are [x y] (= x y) @@ -28,10 +32,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"})))) |