aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorGlenn Morris2015-07-03 17:25:51 -0700
committerGlenn Morris2015-07-03 17:25:51 -0700
commitfc4151f285ffb6939ada39d342b885eb5f23543d (patch)
treef1433830959b07e7f1995d4cb8251347128a7093 /test
parente3c4cd0074344fe92e7df3e59d1bbdca969252a2 (diff)
downloademacs-fc4151f285ffb6939ada39d342b885eb5f23543d.tar.gz
emacs-fc4151f285ffb6939ada39d342b885eb5f23543d.zip
Update eieio tests for recent eieio-core change.
* test/automated/eieio-test-persist.el (persist-test-save-and-compare): * test/automated/eieio-tests.el (eieio-test-32-slot-attribute-override-2): Replace the deleted eieio--class-v with cl--find-class.
Diffstat (limited to 'test')
-rw-r--r--test/automated/eieio-test-persist.el4
-rw-r--r--test/automated/eieio-tests.el2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/automated/eieio-test-persist.el b/test/automated/eieio-test-persist.el
index 6710ead2e77..9b21b730385 100644
--- a/test/automated/eieio-test-persist.el
+++ b/test/automated/eieio-test-persist.el
@@ -48,7 +48,7 @@ This is usually a symbol that starts with `:'."
48 (let* ((file (oref original file)) 48 (let* ((file (oref original file))
49 (class (eieio-object-class original)) 49 (class (eieio-object-class original))
50 (fromdisk (eieio-persistent-read file class)) 50 (fromdisk (eieio-persistent-read file class))
51 (cv (eieio--class-v class)) 51 (cv (cl--find-class class))
52 (slots (eieio--class-slots cv)) 52 (slots (eieio--class-slots cv))
53 ) 53 )
54 (unless (object-of-class-p fromdisk class) 54 (unless (object-of-class-p fromdisk class)
@@ -62,7 +62,7 @@ This is usually a symbol that starts with `:'."
62 (origvalue (eieio-oref original oneslot)) 62 (origvalue (eieio-oref original oneslot))
63 (fromdiskvalue (eieio-oref fromdisk oneslot)) 63 (fromdiskvalue (eieio-oref fromdisk oneslot))
64 (initarg-p (eieio--attribute-to-initarg 64 (initarg-p (eieio--attribute-to-initarg
65 (eieio--class-v class) oneslot)) 65 (cl--find-class class) oneslot))
66 ) 66 )
67 67
68 (if initarg-p 68 (if initarg-p
diff --git a/test/automated/eieio-tests.el b/test/automated/eieio-tests.el
index 01131d886dd..5709a1bfeb2 100644
--- a/test/automated/eieio-tests.el
+++ b/test/automated/eieio-tests.el
@@ -803,7 +803,7 @@ Subclasses to override slot attributes.")
803 (should (eq (oref-default 'slotattr-class-ok initform) 'no-init))) 803 (should (eq (oref-default 'slotattr-class-ok initform) 'no-init)))
804 804
805(ert-deftest eieio-test-32-slot-attribute-override-2 () 805(ert-deftest eieio-test-32-slot-attribute-override-2 ()
806 (let* ((cv (eieio--class-v 'slotattr-ok)) 806 (let* ((cv (cl--find-class 'slotattr-ok))
807 (slots (eieio--class-slots cv)) 807 (slots (eieio--class-slots cv))
808 (args (eieio--class-initarg-tuples cv))) 808 (args (eieio--class-initarg-tuples cv)))
809 ;; :initarg should override for subclass 809 ;; :initarg should override for subclass