3 files changed, 31 insertions, 7 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 53e2c49c9d7..8e3b83efbb0 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,16 @@
+2015-01-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * automated/eieio-tests.el (eieio-test-04-static-method)
+        (eieio-test-05-static-method-2): Use oref-default to access
+        class slots.
+        (eieio-test-23-inheritance-check): Don't assume that
+        eieio-class-parents returns class names, or that a class can only have
+        a single name.
+
+        * automated/eieio-test-persist.el (eieio--attribute-to-initarg):
+        Move from eieio-core.el.  Rename from eieio-attribute-to-initarg.
+        Change arg to be a class object.  Update all callers.
+
 2014-12-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * automated/eieio-test-methodinvoke.el (eieio-test-method-store):
diff --git a/test/automated/eieio-test-persist.el b/test/automated/eieio-test-persist.el
index 00de3cf0d7c..5ea7cf25740 100644
--- a/test/automated/eieio-test-persist.el
+++ b/test/automated/eieio-test-persist.el
@@ -32,6 +32,14 @@
 (require 'eieio-base)
 (require 'ert)
 
+(defun eieio--attribute-to-initarg (class attribute)
+  "In CLASS, convert the ATTRIBUTE into the corresponding init argument tag.
+This is usually a symbol that starts with `:'."
+  (let ((tuple (rassoc attribute (eieio--class-initarg-tuples class))))
+    (if tuple
+        (car tuple)
+      nil)))
+
 (defun persist-test-save-and-compare (original)
   "Compare the object ORIGINAL against the one read fromdisk."
 
@@ -53,7 +61,8 @@
       (let* ((oneslot (car slot-names))
              (origvalue (eieio-oref original oneslot))
              (fromdiskvalue (eieio-oref fromdisk oneslot))
-             (initarg-p (eieio-attribute-to-initarg class oneslot))
+             (initarg-p (eieio--attribute-to-initarg
+                         (eieio--class-v class) oneslot))
              )
 
         (if initarg-p
diff --git a/test/automated/eieio-tests.el b/test/automated/eieio-tests.el
index 91ddfc4fcf3..f3088bacf32 100644
--- a/test/automated/eieio-tests.el
+++ b/test/automated/eieio-tests.el
@@ -1,6 +1,6 @@
 ;;; eieio-tests.el -- eieio tests routines
 
-;; Copyright (C) 1999-2003, 2005-2010, 2012-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2003, 2005-2010, 2012-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
@@ -199,9 +199,9 @@ Argument C is the class bound to this static method."
 (ert-deftest eieio-test-04-static-method ()
   ;; Call static method on a class and see if it worked
   (static-method-class-method static-method-class 'class)
-  (should (eq (oref static-method-class some-slot) 'class))
+  (should (eq (oref-default static-method-class some-slot) 'class))
   (static-method-class-method (static-method-class) 'object)
-  (should (eq (oref static-method-class some-slot) 'object)))
+  (should (eq (oref-default static-method-class some-slot) 'object)))
 
 (ert-deftest eieio-test-05-static-method-2 ()
   (defclass static-method-class-2 (static-method-class)
@@ -215,9 +215,9 @@ Argument C is the class bound to this static method."
     (oset-default c some-slot (intern (concat "moose-" (symbol-name value)))))
 
   (static-method-class-method static-method-class-2 'class)
-  (should (eq (oref static-method-class-2 some-slot) 'moose-class))
+  (should (eq (oref-default static-method-class-2 some-slot) 'moose-class))
   (static-method-class-method (static-method-class-2) 'object)
-  (should (eq (oref static-method-class-2 some-slot) 'moose-object)))
+  (should (eq (oref-default static-method-class-2 some-slot) 'moose-object)))
 
 
 ;;; Perform method testing
@@ -536,7 +536,9 @@ METHOD is the method that was attempting to be called."
   (should (object-of-class-p eitest-ab class-b))
   (should (object-of-class-p eitest-ab class-ab))
   (should (eq (eieio-class-parents class-a) nil))
-  (should (equal (eieio-class-parents class-ab) '(class-a class-b)))
+  ;; FIXME: eieio-class-parents now returns class objects!
+  (should (equal (mapcar #'eieio-class-object (eieio-class-parents class-ab))
+                 (mapcar #'eieio-class-object '(class-a class-b))))
   (should (same-class-p eitest-a class-a))
   (should (class-a-p eitest-a))
   (should (not (class-a-p eitest-ab)))