diff options
| author | Glenn Morris | 2018-03-21 14:13:53 -0400 |
|---|---|---|
| committer | Glenn Morris | 2018-03-21 14:13:53 -0400 |
| commit | 56487467569713f8cee2285855bdcc26bfe9b517 (patch) | |
| tree | 810c9d531a3fbbf4b75ee399b7b86dae92bd57ce /test | |
| parent | 319fbc9fce85d1d61f00612ec26b517d1737e6c7 (diff) | |
| download | emacs-56487467569713f8cee2285855bdcc26bfe9b517.tar.gz emacs-56487467569713f8cee2285855bdcc26bfe9b517.zip | |
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.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el | 4 | ||||
| -rw-r--r-- | test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el | 19 | ||||
| -rw-r--r-- | test/lisp/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 @@ | |||
| 326 | ) | 326 | ) |
| 327 | 327 | ||
| 328 | (ert-deftest eieio-test-method-order-list-9 () | 328 | (ert-deftest eieio-test-method-order-list-9 () |
| 329 | (should (eitest-Jd "test"))) | 329 | (should (eitest-Jd))) |
| 330 | 330 | ||
| 331 | ;;; call-next-method with replacement arguments across a simple class hierarchy. | 331 | ;;; call-next-method with replacement arguments across a simple class hierarchy. |
| 332 | ;; | 332 | ;; |
| @@ -372,7 +372,7 @@ | |||
| 372 | 372 | ||
| 373 | (ert-deftest eieio-test-method-order-list-10 () | 373 | (ert-deftest eieio-test-method-order-list-10 () |
| 374 | (let ((eieio-test-call-next-method-arguments nil)) | 374 | (let ((eieio-test-call-next-method-arguments nil)) |
| 375 | (CNM-M (CNM-2 "") '(INIT)) | 375 | (CNM-M (CNM-2) '(INIT)) |
| 376 | (should (equal (eieio-test-arguments-for 'CNM-0) | 376 | (should (equal (eieio-test-arguments-for 'CNM-0) |
| 377 | '(CNM-1-1 CNM-2 INIT))) | 377 | '(CNM-1-1 CNM-2 INIT))) |
| 378 | (should (equal (eieio-test-arguments-for 'CNM-1-1) | 378 | (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 `:'." | |||
| 90 | 90 | ||
| 91 | (ert-deftest eieio-test-persist-simple-1 () | 91 | (ert-deftest eieio-test-persist-simple-1 () |
| 92 | (let ((persist-simple-1 | 92 | (let ((persist-simple-1 |
| 93 | (persist-simple "simple 1" :slot1 'goose :slot2 "testing" | 93 | (persist-simple :slot1 'goose :slot2 "testing" |
| 94 | :file (concat default-directory "test-ps1.pt")))) | 94 | :file (concat default-directory "test-ps1.pt")))) |
| 95 | (should persist-simple-1) | 95 | (should persist-simple-1) |
| 96 | 96 | ||
| @@ -124,7 +124,7 @@ Assume SLOTVALUE is a symbol of some sort." | |||
| 124 | 124 | ||
| 125 | (ert-deftest eieio-test-persist-printer () | 125 | (ert-deftest eieio-test-persist-printer () |
| 126 | (let ((persist-:printer-1 | 126 | (let ((persist-:printer-1 |
| 127 | (persist-:printer "persist" :slot1 'goose :slot2 "testing" | 127 | (persist-:printer :slot1 'goose :slot2 "testing" |
| 128 | :file (concat default-directory "test-ps2.pt")))) | 128 | :file (concat default-directory "test-ps2.pt")))) |
| 129 | (should persist-:printer-1) | 129 | (should persist-:printer-1) |
| 130 | (persist-test-save-and-compare persist-:printer-1) | 130 | (persist-test-save-and-compare persist-:printer-1) |
| @@ -161,8 +161,7 @@ persistent class.") | |||
| 161 | (ert-deftest eieio-test-non-persistent-as-slot () | 161 | (ert-deftest eieio-test-non-persistent-as-slot () |
| 162 | (let ((persist-wos | 162 | (let ((persist-wos |
| 163 | (persistent-with-objs-slot | 163 | (persistent-with-objs-slot |
| 164 | "persist wos 1" | 164 | :pnp (persist-not-persistent :slot1 3) |
| 165 | :pnp (persist-not-persistent "pnp 1" :slot1 3) | ||
| 166 | :file (concat default-directory "test-ps3.pt")))) | 165 | :file (concat default-directory "test-ps3.pt")))) |
| 167 | 166 | ||
| 168 | (persist-test-save-and-compare persist-wos) | 167 | (persist-test-save-and-compare persist-wos) |
| @@ -188,8 +187,7 @@ persistent class.") | |||
| 188 | (ert-deftest eieio-test-non-persistent-as-slot-child () | 187 | (ert-deftest eieio-test-non-persistent-as-slot-child () |
| 189 | (let ((persist-woss | 188 | (let ((persist-woss |
| 190 | (persistent-with-objs-slot-subs | 189 | (persistent-with-objs-slot-subs |
| 191 | "persist woss 1" | 190 | :pnp (persist-not-persistent-subclass :slot1 3) |
| 192 | :pnp (persist-not-persistent-subclass "pnps 1" :slot1 3) | ||
| 193 | :file (concat default-directory "test-ps4.pt")))) | 191 | :file (concat default-directory "test-ps4.pt")))) |
| 194 | 192 | ||
| 195 | (persist-test-save-and-compare persist-woss) | 193 | (persist-test-save-and-compare persist-woss) |
| @@ -209,7 +207,7 @@ persistent class.") | |||
| 209 | 207 | ||
| 210 | (ert-deftest eieio-test-multiple-class-slot () | 208 | (ert-deftest eieio-test-multiple-class-slot () |
| 211 | (let ((persist | 209 | (let ((persist |
| 212 | (persistent-multiclass-slot "random string" | 210 | (persistent-multiclass-slot |
| 213 | :slot1 (persistent-random-class) | 211 | :slot1 (persistent-random-class) |
| 214 | :slot2 (persist-not-persistent) | 212 | :slot2 (persist-not-persistent) |
| 215 | :file (concat default-directory "test-ps5.pt")))) | 213 | :file (concat default-directory "test-ps5.pt")))) |
| @@ -229,10 +227,9 @@ persistent class.") | |||
| 229 | (ert-deftest eieio-test-slot-with-list-of-objects () | 227 | (ert-deftest eieio-test-slot-with-list-of-objects () |
| 230 | (let ((persist-wols | 228 | (let ((persist-wols |
| 231 | (persistent-with-objs-list-slot | 229 | (persistent-with-objs-list-slot |
| 232 | "persist wols 1" | 230 | :pnp (list (persist-not-persistent :slot1 3) |
| 233 | :pnp (list (persist-not-persistent "pnp 1" :slot1 3) | 231 | (persist-not-persistent :slot1 4) |
| 234 | (persist-not-persistent "pnp 2" :slot1 4) | 232 | (persist-not-persistent :slot1 5)) |
| 235 | (persist-not-persistent "pnp 3" :slot1 5)) | ||
| 236 | :file (concat default-directory "test-ps5.pt")))) | 233 | :file (concat default-directory "test-ps5.pt")))) |
| 237 | 234 | ||
| 238 | (persist-test-save-and-compare persist-wols) | 235 | (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'." | |||
| 689 | (defvar eitest-II2 nil) | 689 | (defvar eitest-II2 nil) |
| 690 | (defvar eitest-II3 nil) | 690 | (defvar eitest-II3 nil) |
| 691 | (ert-deftest eieio-test-29-instance-inheritor () | 691 | (ert-deftest eieio-test-29-instance-inheritor () |
| 692 | (setq eitest-II1 (II "II Test.")) | 692 | (setq eitest-II1 (II)) |
| 693 | (oset eitest-II1 slot2 'cat) | 693 | (oset eitest-II1 slot2 'cat) |
| 694 | (setq eitest-II2 (clone eitest-II1 "eitest-II2 Test.")) | 694 | (setq eitest-II2 (clone eitest-II1 "eitest-II2 Test.")) |
| 695 | (oset eitest-II2 slot1 'moose) | 695 | (oset eitest-II2 slot1 'moose) |