diff --git a/project.clj b/project.clj index a018a0d..7a91e80 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject circleci/circleci.test "0.4.2" +(defproject circleci/circleci.test "0.4.2-SNAPSHOT" :description "clojure.test compatible test-runner" :url "https://github.com/circleci/circleci.test" :license {:name "Eclipse Public License" diff --git a/src/circleci/test/report/junit.clj b/src/circleci/test/report/junit.clj index 95582ea..121cafe 100644 --- a/src/circleci/test/report/junit.clj +++ b/src/circleci/test/report/junit.clj @@ -2,6 +2,8 @@ "Junit reporter for circleci.test" (:require [clojure.data.xml :as xml] [clojure.java.io :as io] + [clojure.string :as string] + [clojure.test :as test] [circleci.test.report :as report]) (:import clojure.data.xml.Element)) @@ -71,7 +73,17 @@ (defn- failure-xml [m] (xml/sexp-as-element [:failure {:type "assertion failure" - :message (format "expected: %s. actual: %s" (:expected m) (:actual m))} ""])) + :message + (string/join \newline + (filter + some? + [(format "FAIL in %s" (report/testing-vars-str m)) + (when (seq test/*testing-contexts*) + (report/testing-contexts-str)) + (when-let [message (:message m)] + message) + (format "expected: %s" (pr-str (:expected m))) + (format " actual: %s" (pr-str (:actual m)))]))}])) (defn- error-xml [m]