Convert url-domsuf.el tests to ert

* lisp/url/url-domsuf.el: Move commented out tests from here...
* test/lisp/url/url-domsuf-tests.el: ...to this new file.

diff --git a/lisp/url/url-domsuf.el b/lisp/url/url-domsuf.el
index fa57815e20412e783737448cbb1d079e3b78812d..b0c68f7af44c537104940f2fdb79d805b854a89a 100644 (file)
--- a/lisp/url/url-domsuf.el
+++ b/lisp/url/url-domsuf.el
@@ -87,17 +87,6 @@
        (setq allowedp nil))))
     allowedp))
 
-;; Tests:
-
-;; TODO convert to a proper test.
-;; (url-domsuf-cookie-allowed-p "com") => nil
-;; (url-domsuf-cookie-allowed-p "foo.bar.bd") => t
-;; (url-domsuf-cookie-allowed-p "bar.bd") => nil
-;; (url-domsuf-cookie-allowed-p "co.uk") => nil
-;; (url-domsuf-cookie-allowed-p "foo.bar.hokkaido.jo") => t
-;; (url-domsuf-cookie-allowed-p "bar.yokohama.jp") => nil
-;; (url-domsuf-cookie-allowed-p "city.yokohama.jp") => t
-
 (provide 'url-domsuf)
 
 ;;; url-domsuf.el ends here

diff --git a/test/lisp/url/url-domsuf-tests.el b/test/lisp/url/url-domsuf-tests.el
new file mode 100644 (file)
index 0000000..a4fffb0
--- /dev/null
+++ b/test/lisp/url/url-domsuf-tests.el
@@ -0,0 +1,51 @@
+;;; url-domsuf-tests.el --- Tests for url-domsuf.el  -*- lexical-binding:t -*-
+
+;; Copyright (C) 2020 Free Software Foundation, Inc.
+
+;; 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 <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'url-domsuf)
+(require 'ert)
+
+(defun url-domsuf-tests--run ()
+  (should-not (url-domsuf-cookie-allowed-p "com"))
+  (should (url-domsuf-cookie-allowed-p "foo.bar.bd"))
+  (should-not (url-domsuf-cookie-allowed-p "bar.bd"))
+  (should-not (url-domsuf-cookie-allowed-p "co.uk"))
+  (should (url-domsuf-cookie-allowed-p "foo.bar.hokkaido.jo"))
+  (should-not (url-domsuf-cookie-allowed-p "bar.yokohama.jp"))
+  (should (url-domsuf-cookie-allowed-p "city.yokohama.jp")))
+
+(ert-deftest url-domsuf-test-cookie-allowed-p ()
+  "Run the domsuf tests without need for parsing a file."
+  (let ((url-domsuf-domains '(("com")
+                              ("bar.bd")
+                              ("co.uk")
+                              ("bar.yokohama.jp"))))
+    (url-domsuf-tests--run)))
+
+(ert-deftest url-domsuf-test-cookie-allowed-p/and-parse ()
+  "Run the domsuf tests, but also parse the file."
+  :tags '(:expensive-test)
+  (url-domsuf-tests--run))
+
+(provide 'url-domsuf-tests)
+
+;;; url-domsuf-tests.el ends here