3 files changed, 13 insertions, 5 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index bb480280970..ca10ddaca68 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * automated/eieio-tests.el (eieio-test-23-inheritance-check): Don't use
+        <foo>-child-p.
+
+        * automated/eieio-test-methodinvoke.el (eieio-test-method-store):
+        Update reference to eieio--generic-call-key.
+
 2015-01-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * automated/eieio-tests.el: Use cl-lib.  Don't use <class> as a variable.
diff --git a/test/automated/eieio-test-methodinvoke.el b/test/automated/eieio-test-methodinvoke.el
index 7790c13327f..99e115a5b92 100644
--- a/test/automated/eieio-test-methodinvoke.el
+++ b/test/automated/eieio-test-methodinvoke.el
@@ -1,6 +1,6 @@
 ;;; eieio-testsinvoke.el -- eieio tests for method invocation
 
-;; Copyright (C) 2005, 2008, 2010, 2013-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2008, 2010, 2013-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 
@@ -60,7 +60,7 @@
 (defun eieio-test-method-store ()
   "Store current invocation class symbol in the invocation order list."
   (let* ((keysym (aref [ :STATIC :BEFORE :PRIMARY :AFTER ]
-                       (or eieio-generic-call-key 0)))
+                       (or eieio--generic-call-key 0)))
          ;; FIXME: Don't depend on `eieio--scoped-class'!
          (c (list keysym (eieio--class-symbol (eieio--scoped-class)))))
     (push c eieio-test-method-order-list)))
diff --git a/test/automated/eieio-tests.el b/test/automated/eieio-tests.el
index 13f4a5728ed..ac8aeb56a8a 100644
--- a/test/automated/eieio-tests.el
+++ b/test/automated/eieio-tests.el
@@ -542,10 +542,10 @@ METHOD is the method that was attempting to be called."
   (should (same-class-p eitest-a 'class-a))
   (should (class-a-p eitest-a))
   (should (not (class-a-p eitest-ab)))
-  (should (class-a-child-p eitest-a))
-  (should (class-a-child-p eitest-ab))
+  (should (cl-typep eitest-a 'class-a))
+  (should (cl-typep eitest-ab 'class-a))
   (should (not (class-a-p "foo")))
-  (should (not (class-a-child-p "foo"))))
+  (should (not (cl-typep "foo" 'class-a))))
 
 (ert-deftest eieio-test-24-object-predicates ()
   (let ((listooa (list (class-ab) (class-a)))