Cleanup prove tests

Remove use of test package, favoring use of CL-USER.
parent 23f46a68
...@@ -3,20 +3,18 @@ ...@@ -3,20 +3,18 @@
(defsystem abcl-asdf-tests (defsystem abcl-asdf-tests
:author "Mark Evenson" :author "Mark Evenson"
:long-description "<urn:abcl.org/release/1.6.0/contrib/abcl-asdf/test#>" :long-description "<urn:abcl.org/release/1.6.0/contrib/abcl-asdf/test#>"
:version "2.0.0" :version "2.1.0"
:defsystem-depends-on (prove-asdf) :defsystem-depends-on (prove-asdf)
:depends-on (abcl-asdf ;; our dependencies :depends-on (abcl-asdf
;; Actual testing framework prove)
prove :components ((:module tests
log4j) :pathname "t/"
:components ((:module package :pathname "t/" :components ((:test-file "log4j")
:components ((:file "package"))) (:test-file "resolve")
(:module tests :pathname "t/" :serial t (:test-file "resolve-multiple-maven-dependencies")
:depends-on (package) (:test-file "maven"))))
:components ((:test-file "log4j")
(:test-file "resolve")
(:test-file "resolve-multiple-maven-dependencies")
(:test-file "maven"))))
:perform (asdf:test-op (op c) :perform (asdf:test-op (op c)
(uiop:symbol-call :prove-asdf 'run-test-system c))) (uiop:symbol-call :prove-asdf 'run-test-system c)))
(in-package :abcl-asdf/test) (in-package :cl-user)
(prove:diag (prove:diag
"Output a message to the Console. "Output a message to the Console.
Note: for users of SLIME, this will appear in the associated *inferior-lisp* buffer.") Note: for users of SLIME, this will appear in the associated *inferior-lisp* buffer.")
(prove:plan 1) (prove:plan 2)
(require :log4j) (progn
(#"configure" 'log4j.BasicConfigurator) (when (find "log4j" (asdf:already-loaded-systems) :test 'equal)
(#"info" (#"getRootLogger" 'log4j.Logger) "Kilroy wuz here.") (prove:diag "Log4j was already loaded. Explicitly clearing it from ASDF.")
(pass "no error occured while logging") (asdf:clear-system :log4j))
(prove:ok (asdf:load-system :log4j)
"Testing loading the log4j system…")
(#"configure" 'log4j.BasicConfigurator)
(#"info" (#"getRootLogger" 'log4j.Logger) "Kilroy wuz here.")
(prove:pass "No error occured while testing logging to *standard-output*"))
(prove:finalize) (prove:finalize)
......
(in-package :abcl-asdf/test) (in-package :cl-user)
(plan 5) (prove:plan 5)
(diag "Testing local bootable Maven version.") (prove:diag "Testing local bootable Maven version.")
(multiple-value-bind (good version) (multiple-value-bind (good version)
(ensure-mvn-version) (abcl-asdf:ensure-mvn-version)
(ok good) (prove:ok good)
(is-type version 'list) (prove:is-type version 'list)
(ok (every #'fixnump version))) (prove:ok (every #'fixnump version)))
(is-type (abcl-asdf:resolve-dependencies "log4j" "log4j") 'string) (prove:is-type (abcl-asdf:resolve-dependencies "log4j" "log4j") 'string)
(is-type (abcl-asdf:resolve "org.abcl/abcl") 'string) (prove:is-type (abcl-asdf:resolve "org.abcl/abcl") 'string)
(finalize) (prove:finalize)
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
(unless (ignore-errors (asdf:find-system :test-mvn-module)) (unless (ignore-errors (asdf:find-system :test-mvn-module))
(asdf-add-test-mvn-module)) (asdf-add-test-mvn-module))
(prove:plan 1) (prove:plan 3)
(prove:ok (asdf:load-system :test-mvn-module) (prove:ok (asdf:load-system :test-mvn-module)
"Testing loading of ASDF:MVN-MODULE definition…") "Testing loading of ASDF:MVN-MODULE definition…")
(prove:ok (asdf:load-system :soot-only-repositories) (prove:ok (asdf:load-system :soot-only-repositories)
......
(defpackage abcl-asdf/test
(:nicknames #:abcl-asdf-test)
(:use cl abcl-asdf prove))
(in-package :abcl-asdf/test) (in-package :cl-user)
(prove:plan 1) (prove:plan 1)
......
(in-package :cl-user) (in-package :cl-user)
(prove:plan 5)
(let ((set (list 2 3 5 7 11))) (let ((set (list 2 3 5 7 11)))
(prove:plan 2)
(prove:is-type (jss:to-hashset set) (prove:is-type (jss:to-hashset set)
'java:java-object 'java:java-object
"Checking whether JSS:TO-HASHSET produces a Java object…") "Checking whether JSS:TO-HASHSET produces a Java object…")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment