2 files changed, 23 insertions, 0 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 338a825f51e..940ed0b0b91 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-20  Daniel Colascione  <dancol@dancol.org>
+
+        * automated/cl-lib.el (cl-lib-struct-accessors,cl-the): New tests.
+
 2014-04-19  Michael Albinus  <michael.albinus@gmx.de>
 
         * automated/tramp-tests.el (tramp--test-check-files): Extend test.
diff --git a/test/automated/cl-lib.el b/test/automated/cl-lib.el
index f7f4314e1cb..a0df07e54ea 100644
--- a/test/automated/cl-lib.el
+++ b/test/automated/cl-lib.el
@@ -201,4 +201,23 @@
                     :b :a :a 42)
            '(42 :a))))
 
+(ert-deftest cl-lib-struct-accessors ()
+  (cl-defstruct mystruct (abc :readonly t) def)
+  (let ((x (make-mystruct :abc 1 :def 2)))
+    (should (eql (cl-struct-slot-value 'mystruct 'abc x) 1))
+    (should (eql (cl-struct-slot-value 'mystruct 'def x) 2))
+    (cl-struct-set-slot-value 'mystruct 'def x -1)
+    (should (eql (cl-struct-slot-value 'mystruct 'def x) -1))
+    (should (eql (cl-struct-slot-offset 'mystruct 'abc) 1))
+    (should-error (cl-struct-slot-offset 'mystruct 'marypoppins))
+    (should (equal (cl-struct-slot-info 'mystruct)
+                   '((cl-tag-slot) (abc :readonly t) (def))))))
+
+(ert-deftest cl-the ()
+  (should (eql (the integer 42) 42))
+  (should-error (the integer "abc"))
+  (let ((sideffect 0))
+    (should (= (the integer (incf sideffect)) 1))
+    (should (= sideffect 1))))
+
 ;;; cl-lib.el ends here