Changeset 247 for branches/new-datamodel

Timestamp:

03/22/10 18:49:05 (15 years ago)

Author:

lgiessmann

Message:

new-datamodel: added some unit-test for "make-construct" --> "VersionedConstructC" and unknown class; fixed a problem in "make-construct" that appears when creating "VersionedConstructC"s

Location:

branches/new-datamodel/src

Files:

• model/datamodel.lisp (modified) (3 diffs)
• unit_tests/datamodel_test.lisp (modified) (3 diffs)

branches/new-datamodel/src/model/datamodel.lisp ¶

@@ -2693 +2693 @@
    specific keyword arguments for their purpose."
   (declare (symbol class-symbol))
+  (when (and (VersionedConstructC-p class-symbol)
+             (not (getf args :start-revision)))
+    (error "From make-construct(): start-revision must be set"))
   (let ((construct
          (cond
@@ -2708 +2711 @@
             (apply #'make-association args))
            ((VersionedConstructC-p class-symbol)
-            (apply #'make-instance (rec-remf args :start-revision)))
+            (apply #'make-instance class-symbol
+                   (rec-remf args :start-revision)))
            (t
             (apply #'make-instance class-symbol args))))
@@ -2719 +2723 @@
                          :start-revision start-revision))
     (when (typep construct 'VersionedConstructC)
-      (unless start-revision
-        (error "From make-construct(): start-revision must be set"))
       (add-to-version-history construct :start-revision start-revision))
     (if (typep construct 'ReifiableConstructC)

branches/new-datamodel/src/unit_tests/datamodel_test.lisp ¶

@@ -60 +60 @@
            :test-equivalent-TopicMapC
            :test-class-p
-           :test-find-item-by-revision))
+           :test-find-item-by-revision
+           :test-make-Unknown
+           :test-make-VersionedConstructC))
 
 
@@ -1875 +1877 @@
 
 
+(test test-make-Unknown ()
+  "Tests the function make-construct corresponding to an unknown class."
+  (defclass Unknown ()
+    ((value :initarg :value
+            :accessor value)))
+  (let ((construct (make-construct 'Unknown :value "value")))
+    (is-true construct)
+    (string= (value construct) "value")))
+
+
+(test test-make-VersionedConstructC ()
+  "Tests the function make-construct corresponding to VersionedConstructC."
+  (with-fixture with-empty-db (*db-dir*)
+    (let ((psi-1 (make-instance 'PersistentIdC :uri "psi-1"))
+          (top-1 (make-instance 'TopicC))
+          (rev-0 0)
+          (rev-1 100)
+          (rev-2 200))
+      (let ((vc (make-construct 'VersionedConstructC
+                                :start-revision rev-2))
+            (psi-assoc (make-construct 'd::PersistentIdAssociationC
+                                       :start-revision rev-1
+                                       :identifier psi-1
+                                       :parent-construct top-1)))
+        (signals error (make-construct 'd::PersistentIdAssociationC
+                                       :start-revision rev-1
+                                       :identifier psi-1))
+        (signals error (make-construct 'VersionedConstructC))
+        (is (= (length (d::versions vc)) 1))
+        (is-true (find-if #'(lambda(vi)
+                              (and (= (d::start-revision vi) rev-2)
+                                   (= (d::end-revision vi) rev-0)))
+                          (d::versions vc)))
+        (is (= (length (d::versions psi-assoc)) 1))
+        (is-true (find-if #'(lambda(vi)
+                              (and (= (d::start-revision vi) rev-1)
+                                   (= (d::end-revision vi) rev-0)))
+                          (d::versions psi-assoc)))))))
+
+
 
 
@@ -1919 +1961 @@
   (it.bese.fiveam:run! 'test-class-p)
   (it.bese.fiveam:run! 'test-find-item-by-revision)
+  (it.bese.fiveam:run! 'test-make-Unknown)
+  (it.bese.fiveam:run! 'test-make-VersionedConstructC)
   )