Merge pull request #157 from valerauko/fix-tests-reflection

Fix tests and reflection warnings

modules/reitit-interceptors/src/reitit/http/interceptors/exception.clj

@@ -66,9 +66,9 @@
    :headers {"Content-Type" "text/plain"}
    :body (str "Malformed " (-> e ex-data :format pr-str) " request.")})
 
-(defn wrap-log-to-console [handler e {:keys [uri request-method] :as req}]
+(defn wrap-log-to-console [handler ^Throwable e {:keys [uri request-method] :as req}]
   (print! *out* (Instant/now) request-method (pr-str uri) "=>" (.getMessage e))
-  (.printStackTrace e *out*)
+  (.printStackTrace e ^PrintWriter *out*)
   (handler e req))
 
 ;;

modules/reitit-middleware/src/reitit/ring/middleware/exception.clj

@@ -86,9 +86,9 @@
    :headers {"Content-Type" "text/plain"}
    :body (str "Malformed " (-> e ex-data :format pr-str) " request.")})
 
-(defn wrap-log-to-console [handler e {:keys [uri request-method] :as req}]
+(defn wrap-log-to-console [handler ^Throwable e {:keys [uri request-method] :as req}]
   (print! *out* (Instant/now) request-method (pr-str uri) "=>" (.getMessage e))
-  (.printStackTrace e *out*)
+  (.printStackTrace e ^PrintWriter *out*)
   (handler e req))
 
 ;;

test/cljc/reitit/ring_spec_test.cljc

@@ -99,9 +99,7 @@
                   :coercion reitit.coercion.spec/coercion}
            :validate rrs/validate-spec!})))
 
-  (is (thrown-with-msg?
+  (is (r/router?
-        ExceptionInfo
-        #"Invalid route data"
         (ring/router
           ["/api"
            ["/plus/:e"

test/cljc/reitit/spec_test.cljc

@@ -116,9 +116,9 @@
                       :header {:d string?}
                       :path {:e string?}}}))
 
-  (is (not (s/valid?
+  (is (s/valid?
-             ::rs/parameters
+        ::rs/parameters
-             {:parameters {:header {"d" string?}}})))
+        {:parameters {:header {"d" string?}}}))
 
   (is (s/valid?
         ::rs/responses