Skip to content

Commit

Permalink
switch to Eos for testing
Browse files Browse the repository at this point in the history
(and finally manage to run the tests on ACL, which exposed
a case-sensitivity bug)
  • Loading branch information
marijnh committed Mar 30, 2011
1 parent 68f6cf0 commit e4f0f8b
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions cl-postgres.asd
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
(:file "public" :depends-on ("protocol"))))))

(defsystem :cl-postgres-tests
:depends-on (:cl-postgres :fiveam :simple-date)
:depends-on (:cl-postgres :eos :simple-date)
:components
((:module :cl-postgres
:components ((:file "tests")))))

(defmethod perform ((op asdf:test-op) (system (eql (find-system :cl-postgres))))
(asdf:oos 'asdf:load-op :cl-postgres-tests)
(funcall (intern (string :prompt-connection) (string :cl-postgres-tests)))
(funcall (intern (string :run!) (string :it.bese.FiveAM)) :cl-postgres))
(funcall (intern (string :run!) (string :Eos)) :cl-postgres))

(defmethod perform :after ((op asdf:load-op) (system (eql (find-system :cl-postgres))))
(let ((simple-date (asdf:find-system :simple-date nil)))
Expand Down
4 changes: 2 additions & 2 deletions cl-postgres/tests.lisp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(defpackage :cl-postgres-tests
(:use :common-lisp :fiveam :simple-date :cl-postgres :cl-postgres-error)
(:use :common-lisp :Eos :simple-date :cl-postgres :cl-postgres-error)
(:export #:prompt-connection))

(in-package :cl-postgres-tests)
Expand All @@ -20,7 +20,7 @@

;; Adjust the above to some db/user/pass/host/[port] combination that
;; refers to a valid postgresql database, then after loading the file,
;; run the tests with (fiveam:run! :cl-postgres)
;; run the tests with (Eos:run! :cl-postgres)

(def-suite :cl-postgres)
(in-suite :cl-postgres)
Expand Down
4 changes: 2 additions & 2 deletions postmodern.asd
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
("query" #+postmodern-use-mop "table"))))))

(defsystem :postmodern-tests
:depends-on (:postmodern :fiveam :simple-date :simple-date-postgres-glue)
:depends-on (:postmodern :eos :simple-date :simple-date-postgres-glue)
:components
((:module :postmodern
:components ((:file "tests")))))
Expand All @@ -39,4 +39,4 @@
(asdf:oos 'asdf:load-op :postmodern-tests)
(funcall (intern (string :prompt-connection) (string :cl-postgres-tests))
(eval (intern (string :*test-connection*) (string :postmodern-tests))))
(funcall (intern (string :run!) (string :it.bese.FiveAM)) :postmodern))
(funcall (intern (string :run!) (string :Eos)) :postmodern))
4 changes: 2 additions & 2 deletions postmodern/tests.lisp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(defpackage :postmodern-tests
(:use :common-lisp :fiveam :postmodern :simple-date))
(:use :common-lisp :Eos :postmodern :simple-date))

(in-package :postmodern-tests)

Expand All @@ -8,7 +8,7 @@
;; Adjust the above to some db/user/pass/host combination that refers
;; to a valid postgresql database in which no table named test_data
;; currently exists. Then after loading the file, run the tests with
;; (fiveam:run! :postmodern)
;; (Eos:run! :postmodern)

(def-suite :postmodern)
(in-suite :postmodern)
Expand Down
4 changes: 3 additions & 1 deletion s-sql/s-sql.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,9 @@ escape-p is :auto and the name contains reserved words."
"Convert a string to something that might have been its original
lisp name \(does not work if this name contained non-alphanumeric
characters other than #\-)"
(intern (map 'string (lambda (x) (if (eq x #\_) #\- x)) (string-upcase str)) (find-package :keyword)))
(intern (map 'string (lambda (x) (if (eq x #\_) #\- x))
(if (eq (readtable-case *readtable*) :upcase) (string-upcase str) str))
(find-package :keyword)))

;; Writing out SQL type identifiers.

Expand Down
4 changes: 2 additions & 2 deletions simple-date.asd
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
((:file "cl-postgres-glue")))))

(defsystem :simple-date-tests
:depends-on (:fiveam :simple-date)
:depends-on (:eos :simple-date)
:components
((:module :simple-date
:components ((:file "tests")))))

(defmethod perform ((op asdf:test-op) (system (eql (find-system :simple-date))))
(asdf:oos 'asdf:load-op :simple-date-tests)
(funcall (intern (string :run!) (string :it.bese.FiveAM)) :simple-date))
(funcall (intern (string :run!) (string :Eos)) :simple-date))

(defmethod perform :after ((op asdf:load-op) (system (eql (find-system :simple-date))))
(let ((cl-postgres (asdf:find-system :cl-postgres nil)))
Expand Down
4 changes: 2 additions & 2 deletions simple-date/tests.lisp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
(defpackage :simple-date-tests
(:use :common-lisp :fiveam :simple-date))
(:use :common-lisp :Eos :simple-date))

(in-package :simple-date-tests)

;; After loading the file, run the tests with (fiveam:run! :simple-date)
;; After loading the file, run the tests with (Eos:run! :simple-date)

(def-suite :simple-date)
(in-suite :simple-date)
Expand Down

0 comments on commit e4f0f8b

Please sign in to comment.