procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move url-future.el ERT test to test/automated/url-future-tests.el.

Browse source 
* lisp/url/url-future.el (url-future-test): Move to test/automated.

* test/automated/url-future-tests.el (url-future-tests): Move from
lisp/url/url-future.el and rename.
This commit is contained in:
Ted Zlatanov 2012-02-13 13:45:36 -05:00
parent c14fcc9571
commit 6c0c7cfc67
4 changed files with 66 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/url/ChangeLog
View file

@ -1,3 +1,7 @@
2012-02-13 Teodor Zlatanov <tzz@lifelogs.com>
* url-future.el (url-future-test): Move to test/automated.
2012-02-10 Lars Ingebrigtsen <larsi@gnus.org>
* url-http.el (url-http-parse-headers): When redirecting, pass on

27
lisp/url/url-future.el
View file

@ -95,32 +95,5 @@
(signal 'error 'url-future-already-done)
(url-future-finish url-future 'cancel)))
(ert-deftest url-future-test ()
(let* (saver
(text "running future")
(good (make-url-future :value (lambda () (format text))
:callback (lambda (f) (set 'saver f))))
(bad (make-url-future :value (lambda () (/ 1 0))
:errorback (lambda (&rest d) (set 'saver d))))
(tocancel (make-url-future :value (lambda () (/ 1 0))
:callback (lambda (f) (set 'saver f))
:errorback (lambda (&rest d)
(set 'saver d)))))
(should (equal good (url-future-call good)))
(should (equal good saver))
(should (equal text (url-future-value good)))
(should (url-future-completed-p good))
(should-error (url-future-call good))
(setq saver nil)
(should (equal bad (url-future-call bad)))
(should-error (url-future-call bad))
(should (equal saver (list bad '(arith-error))))
(should (url-future-errored-p bad))
(setq saver nil)
(should (equal (url-future-cancel tocancel) tocancel))
(should-error (url-future-call tocancel))
(should (null saver))
(should (url-future-cancelled-p tocancel))))
(provide 'url-future)
;;; url-future.el ends here

5
test/ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-13 Teodor Zlatanov <tzz@lifelogs.com>
* automated/url-future-tests.el (url-future-tests): Move from
lisp/url/url-future.el and rename.
2012-01-29 Ulf Jasper <ulf.jasper@web.de>
* automated/icalendar-tests.el (icalendar-import-non-recurring):

57
test/automated/url-future-tests.el Normal file
View file

@ -0,0 +1,57 @@
;;; url-future-tests.el --- Test suite for url-future.
;; Copyright (C) 2011-2012 Free Software Foundation, Inc.
;; Author: Teodor Zlatanov <tzz@lifelogs.com>
;; Keywords: data
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
(require 'ert)
(require 'url-future)
(ert-deftest url-future-tests ()
(let* (saver
(text "running future")
(good (make-url-future :value (lambda () (format text))
:callback (lambda (f) (set 'saver f))))
(bad (make-url-future :value (lambda () (/ 1 0))
:errorback (lambda (&rest d) (set 'saver d))))
(tocancel (make-url-future :value (lambda () (/ 1 0))
:callback (lambda (f) (set 'saver f))
:errorback (lambda (&rest d)
(set 'saver d)))))
(should (equal good (url-future-call good)))
(should (equal good saver))
(should (equal text (url-future-value good)))
(should (url-future-completed-p good))
(should-error (url-future-call good))
(setq saver nil)
(should (equal bad (url-future-call bad)))
(should-error (url-future-call bad))
(should (equal saver (list bad '(arith-error))))
(should (url-future-errored-p bad))
(setq saver nil)
(should (equal (url-future-cancel tocancel) tocancel))
(should-error (url-future-call tocancel))
(should (null saver))
(should (url-future-cancelled-p tocancel))))
(provide 'url-future-tests)
;;; url-future-tests.el ends here