fix tests and test-all task

Author: lukaszkorecki

Makefile

@@ -6,17 +6,17 @@ SNAPSHOT ?= false
 LIB = mokujin mokujin-logback
 
 clean:
-	$(foreach lib,$(LIB),clj -T:build clean :lib $(lib);)
+	$(foreach lib,$(LIB),clojure -T:build clean :lib $(lib);)
 
 jar:
-	$(foreach lib,$(LIB),clj -T:build jar :lib $(lib) :snapshot $(SNAPSHOT);)
+	$(foreach lib,$(LIB),clojure -T:build jar :lib $(lib) :snapshot $(SNAPSHOT);)
 
 
 install:
-	$(foreach lib,$(LIB),clj -T:build install :lib $(lib) :snapshot $(SNAPSHOT);)
+	$(foreach lib,$(LIB),clojure -T:build install :lib $(lib) :snapshot $(SNAPSHOT);)
 
 publish: clean jar
-	$(foreach lib,$(LIB),clj -T:build publish :lib $(lib) :snapshot $(SNAPSHOT);)
+	$(foreach lib,$(LIB),clojure -T:build publish :lib $(lib) :snapshot $(SNAPSHOT);)
 
 # Dev/test tasks
 
@@ -28,16 +28,16 @@ test-all: test-core test-logback test-ex-logback test-ex-log4j2
 	@echo "all done"
 
 test-core:
-	cd mokujin && clj -M:dev:test:run-tests
+	cd mokujin && clojure -M:dev:test:run-tests
 
 test-logback:
-	cd mokujin-logback & clj -M:dev:test:run-tests
+	cd mokujin-logback && clojure -M:dev:test:run-tests
 
 test-ex-logback:
-	cd examples/logback && clj -M:run
+	cd examples/logback && clojure -M:run
 
 test-ex-log4j2:
-	cd examples/log4j2 && clj -M:run
+	cd examples/log4j2 && clojure -M:run
 
 benchmark:
 	cd bench && clj -M:benchmark

mokujin/test/mokujin/log_test.clj

@@ -4,8 +4,7 @@
    kaocha.plugin.capture-output
    [clojure.string :as str]
    [clojure.test :refer [deftest is testing]]
-   [matcher-combinators.test]
-   [matcher-combinators.core :refer [match?]]
+   [matcher-combinators.test :refer [match?]]
    [mokujin.log :as log])
   (:import
    (org.slf4j MDC)))
@@ -91,10 +90,10 @@
 (deftest nested-contexts
   (log/with-context {:level-zero "0"}
     (run-in-thread
-     (fn nested' []
-       (log/with-context {:level-one "yes"}
-         (log/with-context {:level-two "yes"}
-           (log/info "ahem" {:level-three "yes"}))))))
+      (fn nested' []
+        (log/with-context {:level-one "yes"}
+          (log/with-context {:level-two "yes"}
+            (log/info "ahem" {:level-three "yes"}))))))
 
   (let [captured-logs (parse-captured-logs)]
     (testing "contexts can be nested, but only work within current thread"
@@ -139,7 +138,7 @@
                        (log/error "five"))
                      (log/with-context {:foo :bar}
                        (try
-                         (throw (ex-info "this is exception" {}))
+                         (throw (ex-info "this is exception" {:with "data"}))
                          (catch Exception e
                            (log/error e "six" {:fail true})))))
                    (log/info "seven")))
@@ -156,16 +155,15 @@
                    {:nested "again" :foo "bar"}
                    {:fail "true" :nested "again" :foo "bar"}
                    {}]
-                  captured-logs #_(map #(dissoc % :message :level :stack_trace)
-                                       captured-logs))))
+                  captured-logs)))
     (testing "stack trace is included"
       (is (match? [{:fail "true"
                     :nested "again"
                     :foo "bar"
                     :level "ERROR"
                     :message "six"
                     :stack_trace {:count 5
-                                  :message "clojure.lang.ExceptionInfo: this is exception"}}]
+                                  :message "clojure.lang.ExceptionInfo: this is exception {:with \"data\"}"}}]
                   (filter :stack_trace captured-logs))))))
 
 (deftest verify-nested-mdc