From db95d370d84ddd7800a93b93c0c2a55516fabd79 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Sun, 31 May 2020 00:20:00 -0700 Subject: [PATCH] Linter cleanup --- test/next/jdbc/middleware_test.clj | 14 +++++--------- test/next/jdbc/test_fixtures.clj | 4 +--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/test/next/jdbc/middleware_test.clj b/test/next/jdbc/middleware_test.clj index 2f88cd6..5c39c41 100644 --- a/test/next/jdbc/middleware_test.clj +++ b/test/next/jdbc/middleware_test.clj @@ -1,17 +1,13 @@ ;; copyright (c) 2019-2020 Sean Corfield, all rights reserved (ns next.jdbc.middleware-test - (:require [clojure.test :refer [deftest is testing use-fixtures]] + (:require [clojure.test :refer [deftest is use-fixtures]] [next.jdbc :as jdbc] - [next.jdbc.connection :as c] [next.jdbc.middleware :as mw] [next.jdbc.test-fixtures :refer [with-test-db db ds - default-options - derby? postgres?]] - [next.jdbc.prepare :as prep] + default-options]] [next.jdbc.result-set :as rs] - [next.jdbc.specs :as specs]) - (:import (java.sql ResultSet ResultSetMetaData))) + [next.jdbc.specs :as specs])) (set! *warn-on-reflection* true) @@ -60,7 +56,7 @@ (deftest timing-test (let [timing (atom {:calls 0 :total 0.0}) - start-fn (fn [sql-p opts] + start-fn (fn [_ opts] (swap! (:timing opts) update :calls inc) (assoc opts :start (System/nanoTime))) exec-fn (fn [_ opts] @@ -76,4 +72,4 @@ :sql-params-fn start-fn :execute-fn exec-fn}) sql-p) - (println (db) (:calls @timing) "calls took" (long (:total @timing)) "nanoseconds"))) + (println (:dbtype (db)) (:calls @timing) "calls took" (long (:total @timing)) "nanoseconds"))) diff --git a/test/next/jdbc/test_fixtures.clj b/test/next/jdbc/test_fixtures.clj index 932def9..7701dad 100644 --- a/test/next/jdbc/test_fixtures.clj +++ b/test/next/jdbc/test_fixtures.clj @@ -4,10 +4,8 @@ "Multi-database testing fixtures." (:require [clojure.string :as str] [next.jdbc :as jdbc] - [next.jdbc.prepare :as prep] [next.jdbc.sql :as sql]) - (:import (com.opentable.db.postgres.embedded EmbeddedPostgres) - (javax.sql DataSource))) + (:import (com.opentable.db.postgres.embedded EmbeddedPostgres))) (set! *warn-on-reflection* true)