From 8d80db12309167b10ea1189684cb49dbcd0c49ce Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Wed, 21 Mar 2018 14:13:53 -0400
Subject: [PATCH] Quieten eieio-test compilation

* test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el:
* test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el:
* test/lisp/emacs-lisp/eieio-tests/eieio-tests.el:
Remove obsolete name args where not being explicitly tested.
---
 .../eieio-tests/eieio-test-methodinvoke.el    |  4 ++--
 .../eieio-tests/eieio-test-persist.el         | 19 ++++++++-----------
 .../emacs-lisp/eieio-tests/eieio-tests.el     |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
index c6da9e15fa3..52014aea01e 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
@@ -326,7 +326,7 @@
   )
 
 (ert-deftest eieio-test-method-order-list-9 ()
-  (should (eitest-Jd "test")))
+  (should (eitest-Jd)))
 
 ;;; call-next-method with replacement arguments across a simple class hierarchy.
 ;;
@@ -372,7 +372,7 @@
 
 (ert-deftest eieio-test-method-order-list-10 ()
   (let ((eieio-test-call-next-method-arguments nil))
-    (CNM-M (CNM-2 "") '(INIT))
+    (CNM-M (CNM-2) '(INIT))
     (should (equal (eieio-test-arguments-for 'CNM-0)
 		   '(CNM-1-1 CNM-2 INIT)))
     (should (equal (eieio-test-arguments-for 'CNM-1-1)
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
index a3ab3834899..b485972078d 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
@@ -90,7 +90,7 @@ This is usually a symbol that starts with `:'."
 
 (ert-deftest eieio-test-persist-simple-1 ()
   (let ((persist-simple-1
-	 (persist-simple "simple 1" :slot1 'goose :slot2 "testing"
+	 (persist-simple :slot1 'goose :slot2 "testing"
 			 :file (concat default-directory "test-ps1.pt"))))
     (should persist-simple-1)
 
@@ -124,7 +124,7 @@ Assume SLOTVALUE is a symbol of some sort."
 
 (ert-deftest eieio-test-persist-printer ()
   (let ((persist-:printer-1
-	 (persist-:printer "persist" :slot1 'goose :slot2 "testing"
+	 (persist-:printer :slot1 'goose :slot2 "testing"
 			   :file (concat default-directory "test-ps2.pt"))))
     (should persist-:printer-1)
     (persist-test-save-and-compare persist-:printer-1)
@@ -161,8 +161,7 @@ persistent class.")
 (ert-deftest eieio-test-non-persistent-as-slot ()
   (let ((persist-wos
 	 (persistent-with-objs-slot
-	  "persist wos 1"
-	  :pnp (persist-not-persistent "pnp 1" :slot1 3)
+	  :pnp (persist-not-persistent :slot1 3)
 	  :file (concat default-directory "test-ps3.pt"))))
 
     (persist-test-save-and-compare persist-wos)
@@ -188,8 +187,7 @@ persistent class.")
 (ert-deftest eieio-test-non-persistent-as-slot-child ()
   (let ((persist-woss
 	 (persistent-with-objs-slot-subs
-	  "persist woss 1"
-	  :pnp (persist-not-persistent-subclass "pnps 1" :slot1 3)
+	  :pnp (persist-not-persistent-subclass :slot1 3)
 	  :file (concat default-directory "test-ps4.pt"))))
 
     (persist-test-save-and-compare persist-woss)
@@ -209,7 +207,7 @@ persistent class.")
 
 (ert-deftest eieio-test-multiple-class-slot ()
   (let ((persist
-         (persistent-multiclass-slot "random string"
+         (persistent-multiclass-slot
           :slot1 (persistent-random-class)
           :slot2 (persist-not-persistent)
           :file (concat default-directory "test-ps5.pt"))))
@@ -229,10 +227,9 @@ persistent class.")
 (ert-deftest eieio-test-slot-with-list-of-objects ()
   (let ((persist-wols
 	 (persistent-with-objs-list-slot
-	  "persist wols 1"
-	  :pnp (list (persist-not-persistent "pnp 1" :slot1 3)
-		     (persist-not-persistent "pnp 2" :slot1 4)
-		     (persist-not-persistent "pnp 3" :slot1 5))
+	  :pnp (list (persist-not-persistent :slot1 3)
+		     (persist-not-persistent :slot1 4)
+		     (persist-not-persistent :slot1 5))
 	  :file (concat default-directory "test-ps5.pt"))))
 
     (persist-test-save-and-compare persist-wols)
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
index 5ba094c0072..74c76609b87 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
@@ -689,7 +689,7 @@ Do not override for `prot-2'."
 (defvar eitest-II2 nil)
 (defvar eitest-II3 nil)
 (ert-deftest eieio-test-29-instance-inheritor ()
-  (setq eitest-II1 (II "II Test."))
+  (setq eitest-II1 (II))
   (oset eitest-II1 slot2 'cat)
   (setq eitest-II2 (clone eitest-II1 "eitest-II2 Test."))
   (oset eitest-II2 slot1 'moose)
-- 
2.39.2