2 files changed, 17 insertions, 2 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index bcc619a7f97..53e2c49c9d7 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,16 @@
+2014-12-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * automated/eieio-test-methodinvoke.el (eieio-test-method-store):
+        Adjust to new semantics of eieio--scoped-class.
+        (eieio-test-match): Improve error feedback.
+
+2014-12-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * automated/eieio-tests.el: Remove dummy object names.
+
+        * automated/eieio-test-persist.el (persistent-with-objs-slot-subs):
+        The type FOO-child is the same as FOO.
+
 2014-12-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * automated/eieio-test-methodinvoke.el (eieio-test-method-store):
diff --git a/test/automated/eieio-test-methodinvoke.el b/test/automated/eieio-test-methodinvoke.el
index 3f86d8fcc99..f99ee8d1f46 100644
--- a/test/automated/eieio-test-methodinvoke.el
+++ b/test/automated/eieio-test-methodinvoke.el
@@ -61,14 +61,16 @@
   "Store current invocation class symbol in the invocation order list."
   (let* ((keysym (aref [ :STATIC :BEFORE :PRIMARY :AFTER ]
                        (or eieio-generic-call-key 0)))
-         (c (list keysym (eieio--scoped-class))))
+         ;; FIXME: Don't depend on `eieio--scoped-class'!
+         (c (list keysym (eieio--class-symbol (eieio--scoped-class)))))
     (push c eieio-test-method-order-list)))
 
 (defun eieio-test-match (rightanswer)
   "Do a test match."
   (if (equal rightanswer eieio-test-method-order-list)
       t
-    (error "eieio-test-methodinvoke.el: Test Failed!")))
+    (error "eieio-test-methodinvoke.el: Test Failed: %S != %S"
+           rightanswer eieio-test-method-order-list)))
 
 (defvar eieio-test-call-next-method-arguments nil
   "List of passed to methods during execution of `call-next-method'.")