Merge local changes with changes from remote.

ruedigergad · Apr 17, 2016 · 0c0efcd · 0c0efcd
2 parents 3cf4b16 + f1084e0
commit 0c0efcd
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 22 deletions.
diff --git a/project.clj b/project.clj
@@ -10,4 +10,5 @@
   :test2junit-run-ant true
   :aot [clj-assorted-utils.JavaUtils]
   :plugins [[lein-cloverage "1.0.6"]]
+  :profiles  {:repl  {:dependencies  [[jonase/eastwood "0.2.2" :exclusions  [org.clojure/clojure]]]}}
 )
diff --git a/src/clj_assorted_utils/JavaUtils.clj b/src/clj_assorted_utils/JavaUtils.clj
@@ -10,8 +10,10 @@
   ^{:author "Ruediger Gad",
     :doc "Java utility and helper functions"}
   clj-assorted-utils.JavaUtils
-  (:use clj-assorted-utils.java-utils
-        clj-assorted-utils.util)
+  (:require
+    (clj-assorted-utils
+      [java-utils :refer :all]
+      [util :refer :all]))
   (:import (java.util ArrayList HashMap HashSet List Map Set))
   (:gen-class
     :methods [#^{:static true} [readObjectFromClojureString [String] Object]

diff --git a/src/clj_assorted_utils/java_utils.clj b/src/clj_assorted_utils/java_utils.clj
@@ -10,16 +10,17 @@
   ^{:author "Ruediger Gad",
     :doc "Utility and helper functions for Java"}
   clj-assorted-utils.java-utils
-  (:use clj-assorted-utils.util))
+  (:require
+    (clj-assorted-utils [util :refer :all])))
 
 (defn no-eval-read-string
   [input]
   (binding [*read-eval* false] (read-string input)))
 
 (defn read-object-from-clojure-string
-  [input]
   "Tries to read data from a string that contains data expressed in Clojure data structures.
    Note that *read-eval* is set to false for reading the string in order to avoid unintended code execution."
+  [input]
   (let [read-input (no-eval-read-string input)]
     (convert-from-clojure-to-java read-input)))
 

diff --git a/src/clj_assorted_utils/util.clj b/src/clj_assorted_utils/util.clj
@@ -10,14 +10,17 @@
   ^{:author "Ruediger Gad",
     :doc "Utility and helper functions"}
   clj-assorted-utils.util
-  (:use clojure.java.io
-        clojure.walk
-        clojure.xml)
-  (:require (clojure [string :as str]))
-  (:import (java.io BufferedReader BufferedWriter ByteArrayOutputStream IOException ObjectOutputStream)
-           (java.util ArrayList HashMap HashSet List Map)
-           (java.util.concurrent CountDownLatch Executors ThreadFactory TimeUnit)
-           (java.util.zip GZIPOutputStream ZipOutputStream)))
+  (:require
+    (clojure
+      [string :as str]
+      [walk :refer :all]
+      [xml :refer :all])
+    (clojure.java [io :refer :all]))
+  (:import
+    (java.io BufferedReader BufferedWriter ByteArrayOutputStream IOException ObjectOutputStream)
+    (java.util ArrayList HashMap HashSet List Map)
+    (java.util.concurrent CountDownLatch Executors ThreadFactory TimeUnit)
+    (java.util.zip GZIPOutputStream ZipOutputStream)))
 
 
 (defn sleep
@@ -74,8 +77,9 @@
 ;;;
 ;;; Helper functions for handling system properties.
 ;;;
-(defn get-system-property [p]
+(defn get-system-property
   "Get system property p. p is a String naming the property go get."
+  [p]
   (System/getProperty p))
 (def get-arch (partial get-system-property "os.arch"))
 (def get-os (partial get-system-property "os.name"))

diff --git a/test/clj_assorted_utils/test/java_utils.clj b/test/clj_assorted_utils/test/java_utils.clj
@@ -10,10 +10,14 @@
   ^{:author "Ruediger Gad",
     :doc "Unit tests for Java utility and helper functions"}
   clj-assorted-utils.test.java-utils
-  (:use clojure.test
-        clojure.test.junit
-        clj-assorted-utils.JavaUtils
-        clj-assorted-utils.java-utils)
+  (:require
+    (clojure
+      [test :refer :all])
+    (clojure.test
+      [junit :refer :all])
+    (clj-assorted-utils
+      [JavaUtils :refer :all]
+      [java-utils :refer :all]))
   (:import (clj_assorted_utils JavaUtils)
            (java.util ArrayList HashMap HashSet)))
 

diff --git a/test/clj_assorted_utils/test/util.clj b/test/clj_assorted_utils/test/util.clj
@@ -10,10 +10,15 @@
   ^{:author "Ruediger Gad",
     :doc "Unit tests for utility and helper functions"}
   clj-assorted-utils.test.util
-  (:use clojure.test
-        clojure.test.junit
-        clojure.java.io
-        clj-assorted-utils.util)
+  (:require
+    (clojure
+      [test :refer :all])
+    (clojure.test
+      [junit :refer :all])
+    (clojure.java
+      [io :refer :all])
+    (clj-assorted-utils
+      [util :refer :all]))
   (:import (java.util ArrayList HashMap HashSet)))
 
 
@@ -54,7 +59,7 @@
     (sleep 100)
     (is (flag-set? stdout-run))))
 
-(deftest test-exec-with-out-process-output
+(deftest test-exec-with-out-process-output-2
   (let [command (into-array java.lang.String ["/bin/sh" "-c" "ls /etc/passwd 1>&2"])
         stderr-run (prepare-flag)
         stderr-fn (fn [out] (if (= out "/etc/passwd") (set-flag stderr-run)))