From 6c0c7cfc6755342c15e0230747d7f0c697c899d9 Mon Sep 17 00:00:00 2001 From: Ted Zlatanov Date: Mon, 13 Feb 2012 13:45:36 -0500 Subject: Move url-future.el ERT test to test/automated/url-future-tests.el. * 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. --- lisp/url/ChangeLog | 4 +++ lisp/url/url-future.el | 27 ------------------ test/ChangeLog | 5 ++++ test/automated/url-future-tests.el | 57 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 27 deletions(-) create mode 100644 test/automated/url-future-tests.el diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 4f49adcd93..0340c954ae 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,7 @@ +2012-02-13 Teodor Zlatanov + + * url-future.el (url-future-test): Move to test/automated. + 2012-02-10 Lars Ingebrigtsen * url-http.el (url-http-parse-headers): When redirecting, pass on diff --git a/lisp/url/url-future.el b/lisp/url/url-future.el index 2798f936f2..f35399469c 100644 --- a/lisp/url/url-future.el +++ b/lisp/url/url-future.el @@ -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 diff --git a/test/ChangeLog b/test/ChangeLog index 56b7ece59e..f44b09102d 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2012-02-13 Teodor Zlatanov + + * automated/url-future-tests.el (url-future-tests): Move from + lisp/url/url-future.el and rename. + 2012-01-29 Ulf Jasper * automated/icalendar-tests.el (icalendar-import-non-recurring): diff --git a/test/automated/url-future-tests.el b/test/automated/url-future-tests.el new file mode 100644 index 0000000000..d499da6dbe --- /dev/null +++ b/test/automated/url-future-tests.el @@ -0,0 +1,57 @@ +;;; url-future-tests.el --- Test suite for url-future. + +;; Copyright (C) 2011-2012 Free Software Foundation, Inc. + +;; Author: Teodor Zlatanov +;; 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 . + +;;; 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 -- cgit v1.2.3