CLJ-1856 Switch from reporting test failures based on stack depth to removing leading unwanted stack frames based on class name. Deprecated but did not remove old function.

Signed-off-by: Stuart Halloway <[email protected]>

Author: puredanger

src/clj/clojure/test.clj

@@ -233,7 +233,8 @@
 "}
   clojure.test
   (:require [clojure.template :as temp]
-            [clojure.stacktrace :as stack]))
+            [clojure.stacktrace :as stack]
+            [clojure.string :as str]))
 
 ;; Nothing is marked "private" here, so you can rebind things to plug
 ;; in your own testing or reporting frameworks.
@@ -331,14 +332,22 @@
      :added "1.1"}
   report :type)
 
-(defn- file-and-line 
+(defn- file-and-line
+  {:deprecated "1.8"}
   [^Throwable exception depth]
   (let [stacktrace (.getStackTrace exception)]
     (if (< depth (count stacktrace))
       (let [^StackTraceElement s (nth stacktrace depth)]
         {:file (.getFileName s) :line (.getLineNumber s)})
       {:file nil :line nil})))
 
+(defn- stacktrace-file-and-line
+  [stacktrace]
+  (if (seq stacktrace)
+    (let [^StackTraceElement s (first stacktrace)]
+      {:file (.getFileName s) :line (.getLineNumber s)})
+    {:file nil :line nil}))
+
 (defn do-report
   "Add file and line information to a test result and call report.
    If you are writing a custom assert-expr method, call this function
@@ -348,8 +357,12 @@
   (report
    (case
     (:type m)
-    :fail (merge (file-and-line (new java.lang.Throwable) 1) m)
-    :error (merge (file-and-line (:actual m) 0) m) 
+    :fail (merge (stacktrace-file-and-line (drop-while
+                                             #(let [cl-name (.getClassName ^StackTraceElement %)]
+                                                (or (str/starts-with? cl-name "java.lang.")
+                                                    (str/starts-with? cl-name "clojure.test$")))
+                                             (.getStackTrace (Thread/currentThread)))) m)
+    :error (merge (stacktrace-file-and-line (.getStackTrace ^Throwable (:actual m))) m)
     m)))
 
 (defmethod report :default [m]

test/clojure/test_clojure/test.clj

@@ -78,6 +78,7 @@
                                 [])
         t (doto (Exception.) (.setStackTrace empty-stack))]
     (is (map? (#'clojure.test/file-and-line t 0)) "Should pass")
+    (is (map? (#'clojure.test/stacktrace-file-and-line empty-stack)) "Should pass")
     (is (string? (with-out-str (stack/print-stack-trace t))) "Should pass")))
 
 (deftest #^{:has-meta true} can-add-metadata-to-tests