[isidorus-cvs] r324 - branches/new-datamodel/src/unit_tests

[Lukas Giessmann]

Author: lgiessmann
Date: Sun Oct 10 04:40:18 2010
New Revision: 324

Log:
new-datamodel: fixed a bug in the datamodel-unit-test for "get-item-by-psi"

Modified:
   branches/new-datamodel/src/unit_tests/datamodel_test.lisp

Modified: branches/new-datamodel/src/unit_tests/datamodel_test.lisp
==============================================================================
--- branches/new-datamodel/src/unit_tests/datamodel_test.lisp	(original)
+++ branches/new-datamodel/src/unit_tests/datamodel_test.lisp	Sun Oct 10 04:40:18 2010
@@ -598,27 +598,29 @@
 	(setf d:*TM-REVISION* rev-1)
 	(is-false (get-item-by-id "any-psi-id"))
 	(signals object-not-found-error
-	 (get-item-by-locator "any-psi-id" :error-if-nil t :revision rev-0))
+	 (get-item-by-psi "any-psi-id" :error-if-nil t :revision rev-0))
 	(signals object-not-found-error
-	  (get-item-by-locator "any-psi-id" :error-if-nil t :revision rev-0))
-	(is-false (get-item-by-locator "any-psi-id"))
+	  (get-item-by-psi "any-psi-id" :error-if-nil t :revision rev-0))
+	(is-false (get-item-by-psi "any-psi-id"))
 	(add-psi top-1 psi-3-1 :revision rev-1)
 	(add-psi top-1 psi-3-2 :revision rev-1)
+	(is-false (get-item-by-locator "psi-3" :revision rev-1))
+	(is-false (get-item-by-item-identifier "psi-3" :revision rev-1))
 	(signals duplicate-identifier-error
-	  (get-item-by-locator "psi-3" :revision rev-1))
+	  (get-item-by-psi "psi-3" :revision rev-1))
 	(add-psi top-2 psi-1)
 	(add-psi top-2 psi-2 :revision rev-2)
-	(is (eql top-2 (get-item-by-locator "psi-1" :revision rev-0)))
-	(is (eql top-2 (get-item-by-locator "psi-2" :revision rev-0)))
-	(is (eql top-2 (get-item-by-locator "psi-1" :revision 500)))
-	(is-false (get-item-by-locator "psi-2" :revision rev-1))
+	(is (eql top-2 (get-item-by-psi "psi-1" :revision rev-0)))
+	(is (eql top-2 (get-item-by-psi "psi-2" :revision rev-0)))
+	(is (eql top-2 (get-item-by-psi "psi-1" :revision 500)))
+	(is-false (get-item-by-psi "psi-2" :revision rev-1))
 	(delete-psi top-2 psi-1 :revision rev-2)
-	(is-false (get-item-by-locator "psi-1" :revision rev-0))
-	(is (eql top-2 (get-item-by-locator "psi-1" :revision rev-1)))
+	(is-false (get-item-by-psi "psi-1" :revision rev-0))
+	(is (eql top-2 (get-item-by-psi "psi-1" :revision rev-1)))
 	(add-psi top-3 psi-1 :revision rev-2)
-	(is (eql top-2 (get-item-by-locator "psi-1" :revision rev-1)))
+	(is (eql top-2 (get-item-by-psi "psi-1" :revision rev-1)))
 	(d::add-to-version-history top-3 :start-revision rev-2)
-	(is (eql top-3 (get-item-by-locator "psi-1" :revision rev-0))))))
+	(is (eql top-3 (get-item-by-psi "psi-1" :revision rev-0))))))
 
 
 (test test-ReifiableConstructC ()