[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105945: Move test/newsticker-testsui
From: |
Ulf Jasper |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105945: Move test/newsticker-testsuite.el to automated/newsticker-tests.el |
Date: |
Tue, 27 Sep 2011 21:17:33 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105945 [merge]
committer: Ulf Jasper <address@hidden>
branch nick: trunk
timestamp: Tue 2011-09-27 21:17:33 +0200
message:
Move test/newsticker-testsuite.el to automated/newsticker-tests.el
2011-09-27 Ulf Jasper <address@hidden>
* automated/newsticker-tests.el: Move newsticker-testsuite.el
to automated/newsticker-tests.el. Convert to ERT.
renamed:
test/newsticker-testsuite.el => test/automated/newsticker-tests.el
modified:
test/ChangeLog
test/automated/newsticker-tests.el
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2011-07-26 15:36:04 +0000
+++ b/test/ChangeLog 2011-09-27 18:52:00 +0000
@@ -1,3 +1,8 @@
+2011-09-27 Ulf Jasper <address@hidden>
+
+ * automated/newsticker-tests.el: Move newsticker-testsuite.el
+ to automated/newsticker-tests.el. Convert to ERT.
+
2011-07-26 Ulf Jasper <address@hidden>
* automated/icalendar-tests.el (icalendar-tests--compare-strings):
=== renamed file 'test/newsticker-testsuite.el' =>
'test/automated/newsticker-tests.el'
--- a/test/newsticker-testsuite.el 2011-01-25 04:08:28 +0000
+++ b/test/automated/newsticker-tests.el 2011-09-27 18:52:00 +0000
@@ -3,12 +3,7 @@
;; Copyright (C) 2003-2011 Free Software Foundation, Inc.
;; Author: Ulf Jasper <address@hidden>
-;; Filename: newsticker-testsuite.el
-;; URL: http://www.nongnu.org/newsticker
;; Keywords: News, RSS, Atom
-;; Time-stamp: "14. Juni 2008, 12:09:39 (ulf)"
-
-;; ======================================================================
;; This file is part of GNU Emacs.
@@ -25,42 +20,26 @@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
-;; ======================================================================
-
;;; Commentary:
;;; Code:
-(require 'cl) ; assert
-
-;; ======================================================================
-;; Entry point
-;; ======================================================================
-(defun newsticker--testsuite ()
- "Unit test for newsticker.
-Subtests signal errors if something goes wrong."
- (interactive)
- (newsticker--test--guid)
- (newsticker--test--cache-contains)
- (newsticker--test--decode-iso8601-date)
- (newsticker--test--decode-rfc822-date)
- (newsticker--test--group-manage-orphan-feeds)
- (message "All tests passed successfully."))
+(require 'ert)
+(require 'newsticker)
;; ======================================================================
;; Tests for newsticker-backend
;; ======================================================================
-(defun newsticker--test--guid ()
- "Test `newsticker-guid-*'.
+(ert-deftest newsticker--guid ()
+ "Test for `newsticker--guid-*'.
Signals an error if something goes wrong."
- (assert (string= "blah" (newsticker--guid-to-string "blah")))
- (assert (string= "myguid" (newsticker--guid '("title1" "description1" "link1"
+ (should (string= "blah" (newsticker--guid-to-string "blah")))
+ (should (string= "myguid" (newsticker--guid '("title1" "description1" "link1"
nil 'new 42 nil nil
((guid () "myguid")))))))
-(defun newsticker--test--cache-contains ()
- "Test `newsticker--test--cache-contains'.
-Signals an error if something goes wrong."
+(ert-deftest newsticker--cache-contains ()
+ "Test for `newsticker--cache-contains'."
(let ((newsticker--cache '((feed1
("title1" "description1" "link1" nil 'new 42
nil nil ((guid () "myguid")))))))
@@ -68,78 +47,68 @@
(assoc 'guid (newsticker--extra '("title1" "description1"
"link1" nil 'new 42 nil nil
((guid "myguid"))))))
- (assert (newsticker--cache-contains newsticker--cache 'feed1 "WRONGTITLE"
+ (should (newsticker--cache-contains newsticker--cache 'feed1 "WRONGTITLE"
"description1" "link1" 'new "myguid"))
- (assert (not (newsticker--cache-contains newsticker--cache 'feed1 "title1"
+ (should (not (newsticker--cache-contains newsticker--cache 'feed1 "title1"
"description1" "link1" 'new
"WRONG GUID")))
- (assert (newsticker--cache-contains newsticker--cache 'feed1 "title1"
+ (should (newsticker--cache-contains newsticker--cache 'feed1 "title1"
"description1" "link1" 'new "myguid")))
(let ((newsticker--cache '((feed1
("title1" "description1" "link1" nil 'new 42
nil nil ((guid () "myguid1")))
("title1" "description1" "link1" nil 'new 42
nil nil ((guid () "myguid2")))))))
- (assert (not (newsticker--cache-contains newsticker--cache 'feed1 "title1"
+ (should (not (newsticker--cache-contains newsticker--cache 'feed1 "title1"
"description1" "link1" 'new
"myguid")))
- (assert (string= "myguid1"
+ (should (string= "myguid1"
(newsticker--guid (newsticker--cache-contains
newsticker--cache 'feed1 "title1"
"description1" "link1" 'new
"myguid1"))))
- (assert (string= "myguid2"
+ (should (string= "myguid2"
(newsticker--guid (newsticker--cache-contains
newsticker--cache 'feed1 "title1"
"description1" "link1" 'new
"myguid2"))))))
-(defun newsticker--do-test--decode-iso8601-date (input expected)
+(defun newsticker-tests--decode-iso8601-date (input expected)
"Actually test `newsticker--decode-iso8601-date'.
-Signals an error if iso8601-encoded INPUT does not match EXPECTED."
+Apply to INPUT and compare with EXPECTED."
(let ((result (format-time-string "%Y-%m-%dT%H:%M:%S"
(newsticker--decode-iso8601-date input)
t)))
- (assert (string= result expected)
- nil "Error decoding '%s': found '%s' but expected '%s'."
- input result expected)))
+ (should (string= result expected))))
-(defun newsticker--test--decode-iso8601-date ()
+(ert-deftest newsticker--decode-iso8601-date ()
"Test `newsticker--decode-iso8601-date'."
- (newsticker--decode-iso8601-date "2004-09-17T05:09:49+00:00")
- (newsticker--decode-iso8601-date "2004-09-17T05:09+00:00")
- (newsticker--decode-iso8601-date "2004-09-17T05:09:49")
- (newsticker--decode-iso8601-date "2004-09-17T05:09")
- (newsticker--decode-iso8601-date "2004-09-17")
- (newsticker--decode-iso8601-date "2004-09")
- (newsticker--do-test--decode-iso8601-date "2004"
- "2004-01-01T00:00:00")
- (newsticker--do-test--decode-iso8601-date "2004-09"
- "2004-09-01T00:00:00")
- (newsticker--do-test--decode-iso8601-date "2004-09-17"
- "2004-09-17T00:00:00")
- (newsticker--do-test--decode-iso8601-date "2004-09-17T05:09"
- "2004-09-17T05:09:00")
- (newsticker--do-test--decode-iso8601-date "2004-09-17T05:09:49"
- "2004-09-17T05:09:49")
- (newsticker--do-test--decode-iso8601-date "2004-09-17T05:09:49.123"
- "2004-09-17T05:09:49")
- (newsticker--do-test--decode-iso8601-date "2004-09-17T05:09+01:00"
- "2004-09-17T04:09:00")
- (newsticker--do-test--decode-iso8601-date "2004-09-17T05:09-02:00"
- "2004-09-17T07:09:00"))
+ (newsticker-tests--decode-iso8601-date "2004"
+ "2004-01-01T00:00:00")
+ (newsticker-tests--decode-iso8601-date "2004-09"
+ "2004-09-01T00:00:00")
+ (newsticker-tests--decode-iso8601-date "2004-09-17"
+ "2004-09-17T00:00:00")
+ (newsticker-tests--decode-iso8601-date "2004-09-17T05:09"
+ "2004-09-17T05:09:00")
+ (newsticker-tests--decode-iso8601-date "2004-09-17T05:09:49"
+ "2004-09-17T05:09:49")
+ (newsticker-tests--decode-iso8601-date "2004-09-17T05:09:49.123"
+ "2004-09-17T05:09:49")
+ (newsticker-tests--decode-iso8601-date "2004-09-17T05:09+01:00"
+ "2004-09-17T04:09:00")
+ (newsticker-tests--decode-iso8601-date "2004-09-17T05:09-02:00"
+ "2004-09-17T07:09:00"))
(defun newsticker--do-test--decode-rfc822-date (input expected)
"Actually test `newsticker--decode-rfc822-date'.
-Signals an error if rfc822-encoded INPUT does not match EXPECTED."
+Apply to INPUT and compare with EXPECTED."
(let ((result (format-time-string "%Y-%m-%dT%H:%M:%S"
(newsticker--decode-rfc822-date input)
t)))
- (assert (string= result expected)
- nil "Error decoding '%s': found '%s' but expected '%s'."
- input result expected)))
+ (should (string= result expected))))
-(defun newsticker--test--decode-rfc822-date ()
+(ert-deftest newsticker--decode-rfc822-date ()
"Test `newsticker--decode-rfc822-date'."
(newsticker--do-test--decode-rfc822-date "Mon, 10 Mar 2008 19:27:52 +0100"
"2008-03-10T18:27:52")
@@ -164,16 +133,16 @@
;; ======================================================================
;; Tests for newsticker-treeview
;; ======================================================================
-(defun newsticker--test--group-manage-orphan-feeds ()
+(ert-deftest newsticker--group-manage-orphan-feeds ()
"Test `newsticker--group-manage-orphan-feeds'.
Signals an error if something goes wrong."
(let ((newsticker-groups '("Feeds"))
(newsticker-url-list-defaults nil)
(newsticker-url-list '(("feed1") ("feed2") ("feed3"))))
(newsticker--group-manage-orphan-feeds)
- (assert (equal '("Feeds" "feed3" "feed2" "feed1")
+ (should (equal '("Feeds" "feed3" "feed2" "feed1")
newsticker-groups))))
-(provide 'newsticker-testsuite)
+(provide 'newsticker-tests)
-;;; newsticker-testsuite.el ends here
+;;; newsticker-tests.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105945: Move test/newsticker-testsuite.el to automated/newsticker-tests.el,
Ulf Jasper <=