Changeset 3422
- Timestamp:
- 07/10/08 16:31:04 (6 months ago)
- Files:
-
- trunk/projects/bos/test/fixtures.lisp (modified) (2 diffs)
- trunk/projects/bos/test/web/sat-tree.lisp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/projects/bos/test/fixtures.lisp
r3280 r3422 19 19 (for id-var in id-vars) 20 20 (for store-object-var in store-object-vars) 21 (collect `(,id-var (store-object-id ,store-object-var))))) 21 (collect `(,id-var (when (and ,store-object-var 22 (not (object-destroyed-p ,store-object-var))) 23 (store-object-id ,store-object-var)))))) 22 24 (%reopen-store :snapshot ,snapshot) 23 25 (setf ,@(iter … … 25 27 (for store-object-var in store-object-vars) 26 28 (collect store-object-var) 27 (collect `( find-store-object ,id-var)))))))29 (collect `(when ,id-var (find-store-object ,id-var)))))))) 28 30 29 31 (defmacro %with-store-reopenings ((&key snapshot bypass) 30 32 (&rest store-object-vars) &body body) 31 `(progn 32 ,@(if bypass 33 body 34 (iter 35 (for form in body) 36 (unless (first-time-p) 37 (collect `(reopen-store (:snapshot ,snapshot) ,@store-object-vars))) 38 (collect form))))) 33 `(let ((snapshot ,snapshot) 34 (bypass ,bypass)) 35 (if bypass 36 (progn ,@body) 37 (progn 38 ,@(iter 39 (for form in body) 40 (unless (first-time-p) 41 (collect `(reopen-store (:snapshot ,snapshot) ,@store-object-vars))) 42 (collect form)))))) 39 43 40 44 (defmacro with-store-reopenings ((&rest store-object-vars) &body body) trunk/projects/bos/test/web/sat-tree.lisp
r3421 r3422 2 2 (in-suite :bos.test.web) 3 3 4 ( test delete-sat-layer-and-snapshot5 ( with-fixture initial-bos-store ()6 ( let ((geo-box (bos.web::rectangle-geo-box (bos.web::make-rectangle2 '(10 10 100 100)))))7 ( cl-gd:with-image (image 1000 1000)4 (store-test delete-sat-layer-and-snapshot 5 (let ((geo-box (bos.web::rectangle-geo-box (bos.web::make-rectangle2 '(10 10 100 100))))) 6 (cl-gd:with-image (image 1000 1000) 7 (with-store-reopenings () 8 8 (bos.web::make-sat-layer image geo-box :test 0) 9 9 (delete-object (first (class-instances 'bos.web::sat-layer))) 10 (finishes (snapshot)))))) 11 12 ;; (store-test delete-sat-layer-and-snapshot.2 13 ;; (let ((geo-box (bos.web::rectangle-geo-box (bos.web::make-rectangle2 '(10 10 100 100))))) 14 ;; (cl-gd:with-image (image 1000 1000) 15 ;; (with-store-reopenings () 16 ;; (bos.web::make-sat-layer image geo-box :test 0) 17 ;; (delete-object (first (class-instances 'bos.web::sat-layer))) 18 ;; (pass))))) 19 10 (pass)))))
