Refactor test imports

test/riemann/core_test.clj

@@ -1,16 +1,14 @@
 (ns riemann.core-test
-  (:require riemann.transport.tcp
-            riemann.streams
-            [riemann.logging :as logging])
-  (:use riemann.client
-        riemann.common
-        [riemann.index :only [index]]
-        riemann.time.controlled
-        riemann.core
-        clojure.test
-        [clojure.algo.generic.functor :only [fmap]]
-        [riemann.service :only [Service ServiceEquiv]]
-        [riemann.time :only [unix-time]]))
+  (:require [riemann.client :refer :all]
+            [riemann.common :refer [event]]
+            [riemann.core :refer :all]
+            [riemann.index :refer [index]]
+            [riemann.logging :as logging]
+            [riemann.time :refer [unix-time]]
+            [riemann.time.controlled :refer :all]
+            [riemann.service :refer [Service ServiceEquiv]]
+            [clojure.algo.generic.functor :refer [fmap]]
+            [clojure.test :refer :all]))
 
 (logging/init)
 (use-fixtures :each reset-time!)

test/riemann/datadog_test.clj

@@ -1,8 +1,8 @@
 (ns riemann.datadog-test
-  (:use riemann.datadog
-        [riemann.time :only [unix-time]]
-        clojure.test)
-  (:require [riemann.logging :as logging]))
+  (:require [riemann.datadog :refer :all]
+            [riemann.logging :as logging]
+            [riemann.time :refer [unix-time]]
+            [clojure.test :refer :all]))
 
 (def datadog-key (or (System/getenv "DATADOG_API_KEY")
                      (do (println "export DATADOG_API_KEY=\"...\" to run these tests.")

test/riemann/deps_test.clj

@@ -1,13 +1,9 @@
 (ns riemann.deps-test
-  (:require [riemann.index  :as index]
-            [riemann.core   :refer [wrap-index]]
-            [riemann.common :refer [event]]
+  (:require [riemann.common :refer [event]]
+            [riemann.core   :refer :all ]
             [riemann.deps   :refer :all]
-            [clojure.test   :refer :all])
-  (:use riemann.deps
-        riemann.core
-        [riemann.common :only [event]]
-        clojure.test))
+            [riemann.index  :as index]
+            [clojure.test   :refer :all]))
 
 (defn context [events]
   (let [i (wrap-index (index/nbhm-index))]

test/riemann/druid_test.clj

@@ -1,9 +1,9 @@
 (ns riemann.druid-test
-  (:require [clj-http.client :as client]
-            [clojure.test :refer :all]
-            [riemann.druid :as druid]
+  (:require [riemann.druid :as druid]
             [riemann.logging :as logging]
-            [riemann.test-utils :refer [with-mock]]))
+            [riemann.test-utils :refer [with-mock]]
+            [clj-http.client :as client]
+            [clojure.test :refer :all]))
 
 (logging/init)
 

test/riemann/elasticsearch_test.clj

@@ -1,10 +1,10 @@
 (ns riemann.elasticsearch-test
-  (:use riemann.elasticsearch
-        clojure.test)
-  (:require [clj-http.client :as http]
-            [cheshire.core :as json]
+  (:require [riemann.elasticsearch :refer :all]
+            [riemann.logging :as logging]
             [riemann.test-utils :refer [with-mock]]
-            [riemann.logging :as logging]))
+            [cheshire.core :as json]
+            [clj-http.client :as http]
+            [clojure.test :refer :all]))
 
 (logging/init)
 

test/riemann/email_test.clj

@@ -1,19 +1,19 @@
 (ns riemann.email-test
-  (:use [riemann.time :only [unix-time]]
-        riemann.email
-        [riemann.logging :only [suppress]]
-        clojure.test))
+  (:require [riemann.email :refer :all]
+            [riemann.logging :refer [suppress]]
+            [riemann.time :refer [unix-time]]
+            [clojure.test :refer :all]))
 
 (riemann.logging/init)
 
 (deftest override-formatting-test
          (let [a (promise)]
            (with-redefs [postal.core/send-message #(deliver a [%1 %2])]
              (email-event {} {:body (fn [events]
-                                      (apply str "body " 
+                                      (apply str "body "
                                              (map :service events)))
-                              :subject (fn [events] 
-                                         (apply str "subject " 
+                              :subject (fn [events]
+                                         (apply str "subject "
                                                 (map :service events)))}
                           {:service "foo"}))
            (is (= @a [{} {:subject "subject foo"

test/riemann/expiration_test.clj

@@ -1,8 +1,8 @@
 (ns riemann.expiration-test
-  (:require [clojure.test :refer :all]
-            [riemann.expiration :refer :all]
+  (:require [riemann.expiration :refer :all]
+            [riemann.time :refer [unix-time]]
             [riemann.time.controlled :refer :all]
-            [riemann.time :refer [unix-time]]))
+            [clojure.test :refer :all]))
 
 (use-fixtures :once control-time!)
 (use-fixtures :each reset-time!)

test/riemann/folds_test.clj

@@ -1,10 +1,10 @@
 (ns riemann.folds-test
   (:refer-clojure :exclude [count])
-  (:use [riemann.common :only [event]]
-        riemann.folds
-        riemann.time
-        riemann.time.controlled
-        clojure.test))
+  (:require [riemann.common :refer [event]]
+            [riemann.folds :refer :all]
+            [riemann.time :refer :all]
+            [riemann.time.controlled :refer :all]
+            [clojure.test :refer :all]))
 
 (use-fixtures :once control-time!)
 (use-fixtures :each reset-time!)

test/riemann/graphite_test.clj

@@ -1,15 +1,15 @@
 (ns riemann.graphite-test
-  (:use riemann.graphite
-        [riemann.time :only [unix-time]]
-        [riemann.common :only [event]]
-        clojure.tools.logging
-        clojure.test)
-  (:require [riemann.logging :as logging]
+  (:require [riemann.common :refer [event]]
             [riemann.client :as client]
-            [riemann.index :as index]
             [riemann.core :refer [transition! core stop! wrap-index]]
+            [riemann.graphite :refer :all]
+            [riemann.index :as index]
+            [riemann.logging :as logging]
+            [riemann.time :refer [unix-time]]
             [riemann.transport.tcp :refer [tcp-server]]
-            [riemann.transport.graphite :refer [graphite-server]]))
+            [riemann.transport.graphite :refer [graphite-server]]
+            [clojure.test :refer :all]
+            [clojure.tools.logging :refer :all]))
 
 (logging/init)
 

test/riemann/hipchat_test.clj

@@ -1,7 +1,7 @@
 (ns riemann.hipchat-test
-  (:use riemann.hipchat
-        clojure.test)
-  (:require [riemann.logging :as logging]))
+  (:require [riemann.hipchat :refer :all]
+            [riemann.logging :as logging]
+            [clojure.test :refer :all]))
 
 (def server (System/getenv "HIPCHAT_SERVER"))
 (def api-key (System/getenv "HIPCHAT_API_KEY"))

test/riemann/index_test.clj

@@ -1,13 +1,13 @@
 (ns riemann.index-test
   (:refer-clojure :exclude [update])
-  (:use riemann.index
-        riemann.core
-        riemann.query
-        [riemann.instrumentation :only [events]]
-        [riemann.common :only [event]]
-        [riemann.time :only [unix-time]]
-        clojure.test)
-  (:require [riemann.service :as service]))
+  (:require [riemann.common :refer [event]]
+            [riemann.core :refer :all]
+            [riemann.index :refer :all]
+            [riemann.instrumentation :refer [events]]
+            [riemann.query :refer :all]
+            [riemann.service :as service]
+            [riemann.time :refer [unix-time]]
+            [clojure.test :refer :all]))
 
 (deftest missing-time-throws
   (riemann.logging/suppress

test/riemann/influxdb_test.clj

@@ -1,14 +1,12 @@
 (ns riemann.influxdb-test
-  (:require
-   [clojure.test :refer :all]
-   [riemann.influxdb :as influxdb]
-   [riemann.logging :as logging]
-   [riemann.test-utils :refer [with-mock]]
-   [riemann.time :refer [unix-time]])
-  (:import
-   (java.util.concurrent TimeUnit)
-   (org.influxdb InfluxDBFactory InfluxDB$ConsistencyLevel)
-   (org.influxdb.dto BatchPoints Point)))
+  (:require [riemann.influxdb :as influxdb]
+            [riemann.logging :as logging]
+            [riemann.test-utils :refer [with-mock]]
+            [riemann.time :refer [unix-time]]
+            [clojure.test :refer :all])
+  (:import (java.util.concurrent TimeUnit)
+           (org.influxdb InfluxDBFactory InfluxDB$ConsistencyLevel)
+           (org.influxdb.dto BatchPoints Point)))
 
 (logging/init)
 

test/riemann/instrumentation_test.clj

@@ -1,9 +1,9 @@
 (ns riemann.instrumentation-test
-  (:require [riemann.logging :as logging])
-  (:use clojure.test
-        riemann.instrumentation
-        riemann.time.controlled
-        [riemann.time :only [unix-time]]))
+  (:require [riemann.instrumentation :refer :all]
+            [riemann.logging :as logging]
+            [riemann.time :refer [unix-time]]
+            [riemann.time.controlled :refer :all]
+            [clojure.test :refer :all]))
 
 (logging/init)
 (use-fixtures :each reset-time!)
@@ -15,7 +15,7 @@
                                [0 3/5 1.0])]
            (dotimes [i 100]
              (measure-latency r (Thread/sleep 1)))
-           
+
            (advance! 5)
            (let [es (events r)]
              ; Should have merged from the original event

test/riemann/kafka_test.clj

@@ -1,11 +1,11 @@
 (ns riemann.kafka-test
-  (:use riemann.kafka
-        [riemann.time :only [unix-time]]
-        [riemann.common :only [event]]
-        clojure.test)
-  (:require [kinsky.client :as client]
+  (:require [riemann.common :refer [event]]
+            [riemann.core :as core]
+            [riemann.kafka :refer :all]
             [riemann.logging :as logging]
-            [riemann.core :as core]))
+            [riemann.time :refer [unix-time]]
+            [clojure.test :refer :all]
+            [kinsky.client :as client]))
 
 (logging/init)
 

test/riemann/kairosdb_test.clj

@@ -1,8 +1,8 @@
 (ns riemann.kairosdb-test
-  (:use riemann.kairosdb
-        [riemann.time :only [unix-time]]
-        clojure.test)
-  (:require [riemann.logging :as logging]))
+  (:require [riemann.kairosdb :refer :all]
+            [riemann.logging :as logging]
+            [riemann.time :refer [unix-time]]
+            [clojure.test :refer :all]))
 
 (logging/init)
 

test/riemann/keenio_test.clj

@@ -1,10 +1,10 @@
 (ns riemann.keenio-test
-  (:require [clj-http.client :as client]
+  (:require [riemann.keenio :as k]
+            [riemann.time :refer [unix-time]]
+            [riemann.test-utils :refer [with-mock]]
             [cheshire.core :as json]
             [clojure.test :refer :all]
-            [riemann.keenio :as k]
-            [riemann.time :refer [unix-time]]
-            [riemann.test-utils :refer [with-mock]]))
+            [clj-http.client :as client]))
 
 (deftest keenio-test
   (with-mock [calls client/post]

test/riemann/librato_test.clj

@@ -1,10 +1,10 @@
 (ns riemann.librato-test
-  (:use riemann.librato
-        [riemann.time :only [unix-time]]
-        clj-librato.metrics
-        clojure.math.numeric-tower
-        clojure.test)
-  (:require [riemann.logging :as logging]))
+  (:require [riemann.librato :refer :all]
+            [riemann.logging :as logging]
+            [riemann.time :refer [unix-time]]
+            [clj-librato.metrics :refer :all]
+            [clojure.math.numeric-tower :refer :all]
+            [clojure.test :refer :all]))
 
 (def user   (System/getenv "LIBRATO_METRICS_USER"))
 (def api-key (System/getenv "LIBRATO_METRICS_API_KEY"))

test/riemann/logentries_test.clj

@@ -1,13 +1,12 @@
 (ns riemann.logentries-test
-  (:import
-   (java.net Socket
-             ServerSocket)
-   (java.io BufferedReader
-            InputStreamReader))
-  (:use [riemann.logentries :only [logentries event-to-le-format]]
-        riemann.time
-        clojure.test)
-  (:require [riemann.logging :as logging]))
+  (:require [riemann.logentries :refer [logentries event-to-le-format]]
+            [riemann.logging :as logging]
+            [riemann.time :refer :all]
+            [clojure.test :refer :all])
+  (:import (java.net Socket
+                     ServerSocket)
+           (java.io BufferedReader
+                    InputStreamReader)))
 
 (logging/init)
 

test/riemann/logging_test.clj

@@ -1,8 +1,7 @@
 (ns riemann.logging-test
-  (:use riemann.logging
-        clojure.test)
   (:require [riemann.logging :as logging]
-            [clojure.java.io :as io])
+            [clojure.java.io :as io]
+            [clojure.test :refer :all])
   (:import (ch.qos.logback.classic Logger Level)
            (ch.qos.logback.core Appender ConsoleAppender)
            (java.util Iterator)))
@@ -39,4 +38,4 @@
   (test-logging_init_default_level_info)
   (test-logging_init_default_level_debug)
   (test-logging_init_default_appender)
-  (test-logging_init_file))
+  (test-logging_init_file))

test/riemann/mailgun_test.clj

@@ -1,6 +1,6 @@
 (ns riemann.mailgun-test
-  (:require [riemann.mailgun :as mailgun]
-            [riemann.common :refer [body]]
+  (:require [riemann.common :refer [body]]
+            [riemann.mailgun :as mailgun]
             [clj-http.client :as client]
             [clojure.test :refer [deftest testing is are]]))
 

test/riemann/msteams_test.clj

@@ -1,10 +1,10 @@
 (ns riemann.msteams-test
-  (:use riemann.msteams
-        clojure.test)
-  (:require [clj-http.client :as http]
+  (:require [riemann.test-utils :refer [with-mock]]
+            [riemann.logging :as logging]
+            [riemann.msteams :refer :all]
             [cheshire.core :as json]
-            [riemann.test-utils :refer [with-mock]]
-            [riemann.logging :as logging]))
+            [clj-http.client :as http]
+            [clojure.test :refer :all]))
 
 (logging/init)
 

test/riemann/nagios_test.clj

@@ -1,8 +1,8 @@
 (ns riemann.nagios-test
-  (:use riemann.nagios
-        cljr-nsca.core
-        clojure.test)
-  (:require [riemann.logging :as logging]))
+  (:require [riemann.logging :as logging]
+            [riemann.nagios :refer :all]
+            [cljr-nsca.core :refer :all]
+            [clojure.test :refer :all]))
 
 (logging/init)
 

test/riemann/netuitive_test.clj

@@ -1,6 +1,6 @@
 (ns riemann.netuitive-test
-  (:use riemann.netuitive
-        clojure.test))
+  (:require [riemann.netuitive :refer :all]
+            [clojure.test :refer :all]))
 
 (def test-event {:host "riemann.local" :service "netuitive test" :state "ok" :description "Successful test" :metric 2 :time (/ (System/currentTimeMillis) 1000) :tags ["riemann" "netuitive"]})
 (def other-event {:host "riemann.local" :service "netuitive other" :state "ok" :description "Successful test" :metric 5 :time (/ (System/currentTimeMillis) 1000) :tags ["other"]})