Unverified Commit eb3eb6c6 authored by Eric Timmons's avatar Eric Timmons
Browse files

Expand (and fix) tests

parent bac6bbd5

test/aic-test-2.lisp

+30 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
(p:define-test simple-multi-package-test

  (let* ((asdf:*central-registry*

           (list* (asdf:system-relative-pathname :asdf-inferred-components "test/aic-test-2/")

                  (asdf:system-relative-pathname :asdf-inferred-components "test/aic-test-x/")

                  asdf:*central-registry*))

         (system (asdf:find-system :aic-test-2))

         (a (asdf:find-component system "a"))
@@ -24,8 +25,36 @@ 


    (flet ((check-deps (component expected)

             (p:is my-set-equal expected (asdf:component-sideway-dependencies component))))

      (check-deps system '("x"))

      (check-deps system '("aic-test-x"))

      (check-deps a nil)

      (check-deps b nil)

      (check-deps c (list a b))

      (check-deps d (list a)))))



(p:define-test simple-multi-package-load-test

  (let* ((asdf:*central-registry*

           (list* (asdf:system-relative-pathname :asdf-inferred-components "test/aic-test-2/")

                  (asdf:system-relative-pathname :asdf-inferred-components "test/aic-test-x/")

                  asdf:*central-registry*))

         (asdf:*system-definition-search-functions* asdf:*system-definition-search-functions*))

    (when (uiop:featurep :clpm-client)

      (uiop:symbol-call :clpm-client :deactivate-asdf-integration))

    (asdf:load-system :aic-test-2)



    (let ((a (uiop:find-package* :aic-test-2/a nil))

          (b (uiop:find-package* :aic-test-2/b nil))

          (c (uiop:find-package* :aic-test-2/c nil))

          (d (uiop:find-package* :aic-test-2/d/d nil))

          (x (uiop:find-package* :aic-test-x nil))

          (cl (uiop:find-package* :cl nil)))

      (p:true a)

      (p:true b)

      (p:true c)

      (p:true d)

      (p:true x)

      (p:true cl)



      (p:is a:set-equal (list cl) (package-use-list a))

      (p:is a:set-equal (list cl x) (package-use-list b))

      (p:is a:set-equal (list a b cl) (package-use-list c))

      (p:is a:set-equal (list cl a) (package-use-list d)))))

test/aic-test-2/b.lisp

+1 −1
Original line number Diff line number Diff line 
(aic:define-package #:aic-test-2/b

    (:use #:cl

          #:x))

          #:aic-test-x))



(in-package #:aic-test-2/b)

test/aic-test-2/d/d.lisp

+2 −2
Original line number Diff line number Diff line 
(aic:define-package #:aic-test-2/d

(aic:define-package #:aic-test-2/d/d

    (:use #:cl

          #:../a))



(in-package #:aic-test-2/d)
 
(in-package #:aic-test-2/d/d)

test/aic-test-x/aic-test-x.asd

0 → 100644
+2 −0
Original line number Diff line number Diff line 
(defsystem #:aic-test-x

  :components ((:file "package")))

test/aic-test-x/package.lisp

0 → 100644
+2 −0
Original line number Diff line number Diff line 
(cl:defpackage #:aic-test-x

  (:use #:cl))