[elephant-cvs] CVS elephant/tests

[ieslick]

Update of /project/elephant/cvsroot/elephant/tests
In directory clnet:/tmp/cvs-serv23936/tests

Modified Files:
	testconditions.lisp 
Log Message:
Fixed test bug; cleaned up get-instances-by-xxx fns to use new map operators

--- /project/elephant/cvsroot/elephant/tests/testconditions.lisp	2007/04/28 02:31:31	1.3
+++ /project/elephant/cvsroot/elephant/tests/testconditions.lisp	2007/04/28 03:07:39	1.4
@@ -20,7 +20,7 @@
 	(format t "~%Second store spec missing: ignoring")
 	(values t t t t))
       (let (*store-controller*
-	    (sc1 (open-store *test-spec-primary* :recover t :deadlock-detect nil))
+	    (sc1 *store-controller*)
 	    (sc2 (open-store *test-spec-secondary* :recover t :deadlock-detect nil)))
 	(unwind-protect
 	     (let ((inst1 (make-instance 'pfoo :slot1 100 :sc sc1))
@@ -32,13 +32,14 @@
 		  (add-to-root 'inst1 inst1 :sc sc2))
 		(signals-specific-condition (cross-reference-error)
 		  (add-to-root 'inst2 inst2 :sc sc1))))
-	  (close-store sc1)
 	  (close-store sc2))))
   t t t t)
 
 (deftest unindexed-class-condition
     (let* ((sc (open-store *test-spec-primary* :recover t :deadlock-detect nil))
 	   (inst (make-instance 'pfoo :slot1 1 :sc sc)))
-      (signals-specific-condition (persistent-class-not-indexed)
-	(find-class-index 'pfoo :sc sc)))
+      (unwind-protect
+	   (signals-specific-condition (persistent-class-not-indexed)
+	     (find-class-index 'pfoo :sc sc))
+	(close-store sc)))
   t)
\ No newline at end of file