From: Glenn Morris <rgm@gnu.org>
Date: Sat, 4 Jul 2015 00:25:51 +0000 (-0700)
Subject: Update eieio tests for recent eieio-core change.
X-Git-Tag: emacs-25.0.90~1571
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fc4151f285ffb6939ada39d342b885eb5f23543d;p=emacs.git
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.
---
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 `:'."
(let* ((file (oref original file))
(class (eieio-object-class original))
(fromdisk (eieio-persistent-read file class))
- (cv (eieio--class-v class))
+ (cv (cl--find-class class))
(slots (eieio--class-slots cv))
)
(unless (object-of-class-p fromdisk class)
@@ -62,7 +62,7 @@ This is usually a symbol that starts with `:'."
(origvalue (eieio-oref original oneslot))
(fromdiskvalue (eieio-oref fromdisk oneslot))
(initarg-p (eieio--attribute-to-initarg
- (eieio--class-v class) oneslot))
+ (cl--find-class class) oneslot))
)
(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.")
(should (eq (oref-default 'slotattr-class-ok initform) 'no-init)))
(ert-deftest eieio-test-32-slot-attribute-override-2 ()
- (let* ((cv (eieio--class-v 'slotattr-ok))
+ (let* ((cv (cl--find-class 'slotattr-ok))
(slots (eieio--class-slots cv))
(args (eieio--class-initarg-tuples cv)))
;; :initarg should override for subclass