Move netrc tests to auth-source-tests.el

diff --git a/test/lisp/auth-source-resources/authinfo b/test/lisp/auth-source-resources/authinfo
new file mode 100644 (file)
index 0000000..88aa171
--- /dev/null
+++ b/test/lisp/auth-source-resources/authinfo
@@ -0,0 +1,2 @@
+machine imap.example.org login jrh@example.org password "*foobar*"
+machine ftp.example.org login jrh password "*baz*"

diff --git a/test/lisp/auth-source-resources/netrc-folding b/test/lisp/auth-source-resources/netrc-folding
new file mode 100644 (file)
index 0000000..85e5e32
--- /dev/null
+++ b/test/lisp/auth-source-resources/netrc-folding
@@ -0,0 +1,6 @@
+# Foo
+machine XM login XL password XP
+
+machine YM
+  login YL
+  password YP

diff --git a/test/lisp/auth-source-tests.el b/test/lisp/auth-source-tests.el
index 41f8b6d8c9dad6e0f33953435209a514a206f322..a76e4fb0d2e787f32957c5709048f39eff728ab7 100644 (file)
--- a/test/lisp/auth-source-tests.el
+++ b/test/lisp/auth-source-tests.el
@@ -27,7 +27,7 @@
 ;;; Code:
 
 (require 'ert)
-(eval-when-compile (require 'ert-x))
+(require 'ert-x)
 (require 'cl-lib)
 (require 'auth-source)
 (require 'secrets)
@@ -410,5 +410,29 @@ machine c1 port c2 user c3 password c4\n"
       ;; this is actually the same as `auth-source-search'.
       (should (equal found expected)))))
 
+(ert-deftest test-netrc-credentials ()
+  (let ((data (auth-source-netrc-parse-all (ert-resource-file "authinfo"))))
+    (should data)
+    (let ((imap (seq-find (lambda (elem)
+                            (equal (cdr (assoc "machine" elem))
+                                   "imap.example.org"))
+                          data)))
+      (should (equal (cdr (assoc "login" imap)) "jrh@example.org"))
+      (should (equal (cdr (assoc "password" imap)) "*foobar*")))
+    (let ((imap (seq-find (lambda (elem)
+                            (equal (cdr (assoc "machine" elem))
+                                   "ftp.example.org"))
+                          data)))
+      (should (equal (cdr (assoc "login" imap)) "jrh"))
+      (should (equal (cdr (assoc "password" imap)) "*baz*")))))
+
+(ert-deftest test-netrc-credentials-2 ()
+  (let ((data (auth-source-netrc-parse-all
+               (ert-resource-file "netrc-folding"))))
+    (should
+     (equal data
+            '((("machine" . "XM") ("login" . "XL") ("password" . "XP"))
+              (("machine" . "YM") ("login" . "YL") ("password" . "YP")))))))
+
 (provide 'auth-source-tests)
 ;;; auth-source-tests.el ends here

diff --git a/test/lisp/net/netrc-resources/authinfo b/test/lisp/net/netrc-resources/authinfo
deleted file mode 100644 (file)
index 88aa171..0000000
--- a/test/lisp/net/netrc-resources/authinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-machine imap.example.org login jrh@example.org password "*foobar*"
-machine ftp.example.org login jrh password "*baz*"

diff --git a/test/lisp/net/netrc-resources/netrc-folding b/test/lisp/net/netrc-resources/netrc-folding
deleted file mode 100644 (file)
index 85e5e32..0000000
--- a/test/lisp/net/netrc-resources/netrc-folding
+++ /dev/null
@@ -1,6 +0,0 @@
-# Foo
-machine XM login XL password XP
-
-machine YM
-  login YL
-  password YP

diff --git a/test/lisp/net/netrc-resources/services b/test/lisp/net/netrc-resources/services
deleted file mode 100644 (file)
index fd8a034..0000000
--- a/test/lisp/net/netrc-resources/services
+++ /dev/null
@@ -1,6 +0,0 @@
-tcpmux         1/tcp                           # TCP port service multiplexer
-smtp           25/tcp          mail
-http           80/tcp          www             # WorldWideWeb HTTP
-kerberos       88/tcp          kerberos5 krb5 kerberos-sec     # Kerberos v5
-kerberos       88/udp          kerberos5 krb5 kerberos-sec     # Kerberos v5
-rtmp           1/ddp                   # Routing Table Maintenance Protocol

diff --git a/test/lisp/net/netrc-tests.el b/test/lisp/net/netrc-tests.el
deleted file mode 100644 (file)
index 8e83f40..0000000
--- a/test/lisp/net/netrc-tests.el
+++ /dev/null
@@ -1,60 +0,0 @@
-;;; netrc-tests.el --- Tests for netrc.el  -*- lexical-binding:t -*-
-
-;; Copyright (C) 2020-2022 Free Software Foundation, Inc.
-
-;; Author: Stefan Kangas <stefankangas@gmail.com>
-
-;; 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/>.
-
-;;; Code:
-
-(require 'ert)
-(require 'ert-x)
-(require 'netrc)
-
-(ert-deftest test-netrc-parse-services ()
-  (let ((netrc-services-file (ert-resource-file "services")))
-    (should (equal (netrc-parse-services)
-                   '(("tcpmux" 1 tcp)
-                     ("smtp" 25 tcp)
-                     ("http" 80 tcp)
-                     ("kerberos" 88 tcp)
-                     ("kerberos" 88 udp)
-                     ("rtmp" 1 ddp))))))
-
-(ert-deftest test-netrc-find-service-name ()
-  (let ((netrc-services-file (ert-resource-file "services")))
-    (should (equal (netrc-find-service-name 25) "smtp"))
-    (should (equal (netrc-find-service-name 88 'udp) "kerberos"))
-    (should-not (netrc-find-service-name 12345))))
-
-(ert-deftest test-netrc-credentials ()
-  (let ((netrc-file (ert-resource-file "authinfo")))
-    (should (equal (netrc-credentials "imap.example.org")
-                   '("jrh@example.org" "*foobar*")))
-    (should (equal (netrc-credentials "ftp.example.org")
-                   '("jrh" "*baz*")))))
-
-(ert-deftest test-netrc-credentials-2 ()
-  (let ((netrc-file (ert-resource-file "netrc-folding")))
-    (should
-     (equal (netrc-parse netrc-file)
-            '((("machine" . "XM") ("login" . "XL") ("password" . "XP"))
-              (("machine" . "YM")) (("login" . "YL")) (("password" . "YP")))))))
-
-(provide 'netrc-tests)
-
-;;; netrc-tests.el ends here