[isidorus-cvs] r305 - in branches/new-datamodel/src: model unit_tests

[Lukas Giessmann]

Author: lgiessmann
Date: Thu Jun 24 12:40:10 2010
New Revision: 305

Log:
new-datamodel: fixed a bug in the datamodel's test

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

Modified: branches/new-datamodel/src/model/changes.lisp
==============================================================================
--- branches/new-datamodel/src/model/changes.lisp	(original)
+++ branches/new-datamodel/src/model/changes.lisp	Thu Jun 24 12:40:10 2010
@@ -11,12 +11,11 @@
 
 (defun get-all-revisions ()
   "Returns an ordered set of the start dates of all revisions in the engine"
-                                        ;TODO: this is a very inefficient implementation... it would equally
-                                        ;be possible to have a separate object that stored all such
-                                        ;revisions and only make the search from the latest version that's
-                                        ;stored their
-  (let
-      ((revision-set))
+  ;TODO: this is a very inefficient implementation... it would equally
+  ;be possible to have a separate object that stored all such
+  ;revisions and only make the search from the latest version that's
+  ;stored their
+  (let ((revision-set))
     (dolist (vi (elephant:get-instances-by-class 'VersionInfoC))
       (pushnew (start-revision vi) revision-set))
     (sort revision-set #'<)))

Modified: branches/new-datamodel/src/model/datamodel.lisp
==============================================================================
--- branches/new-datamodel/src/model/datamodel.lisp	(original)
+++ branches/new-datamodel/src/model/datamodel.lisp	Thu Jun 24 12:40:10 2010
@@ -2067,7 +2067,10 @@
 			  (identified-construct (first possible-top-ids)
 						:revision revision))
 		 (unless (= (length possible-top-ids) 1)
-		   (error (make-duplicate-identifier-condition (format nil "(length possible-items ~a) for id ~a and xtm-id ~a > 1" possible-top-ids topic-id xtm-id) topic-id)))
+		   (error (make-duplicate-identifier-condition
+			   (format nil "(length possible-items ~a) for id ~a and xtm-id ~a > 1"
+				   possible-top-ids topic-id xtm-id)
+			   topic-id)))
 		 (identified-construct (first possible-top-ids)
 				       :revision revision)
  	 	 ;no revision need not to be chaecked, since the revision

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	Thu Jun 24 12:40:10 2010
@@ -483,11 +483,11 @@
 		 (get-item-by-id
 		  (concatenate 'string "t" (write-to-string
 					    (elephant::oid top-3)))
-		  :revision rev-0)))
+		  :revision rev-0 :xtm-id nil)))
 	(is-false (get-item-by-id
 		   (concatenate 'string "t" (write-to-string
 					     (elephant::oid top-3)))
-		   :revision rev-1)))))
+		   :revision rev-1 :xtm-id nil)))))
 
 
 (test test-get-item-by-item-identifier ()