[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 81ae9c8 1/5: Load mm-util as needed for url-file
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] emacs-26 81ae9c8 1/5: Load mm-util as needed for url-file and url-data (Bug#30258) |
Date: |
Fri, 26 Jan 2018 21:01:49 -0500 (EST) |
branch: emacs-26
commit 81ae9c8c058d17d276a4443f6938aa3b57a40ca4
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Load mm-util as needed for url-file and url-data (Bug#30258)
* lisp/url/url-file.el (url-file):
* lisp/url/url-misc.el (url-data): Require `mm-util' before calling
`mm-disable-multibyte'.
* test/lisp/url/url-file-resources/file.txt:
* test/lisp/url/url-file-tests.el:
* test/lisp/url/url-misc-tests.el: New tests.
---
lisp/url/url-file.el | 1 +
lisp/url/url-misc.el | 1 +
test/lisp/url/url-file-resources/file.txt | 1 +
test/lisp/url/url-file-tests.el | 50 +++++++++++++++++++++++++++++++
test/lisp/url/url-misc-tests.el | 41 +++++++++++++++++++++++++
5 files changed, 94 insertions(+)
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index f6446c0..4fac406 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -188,6 +188,7 @@ to them."
(url-find-file-dired filename)
(with-current-buffer
(setq buffer (generate-new-buffer " *url-file*"))
+ (require 'mm-util)
(mm-disable-multibyte)
(setq url-current-object url)
(insert "Content-type: " (or content-type "application/octet-stream")
"\n")
diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index 9a13732..e794786 100644
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -99,6 +99,7 @@
(eq ?\; (aref mediatype 0)))
(setq mediatype (concat "text/plain" mediatype))))
(set-buffer (generate-new-buffer " *url-data*"))
+ (require 'mm-util)
(mm-disable-multibyte)
(insert (format "Content-Length: %d\n" (length data))
"Content-Type: " mediatype "\n"
diff --git a/test/lisp/url/url-file-resources/file.txt
b/test/lisp/url/url-file-resources/file.txt
new file mode 100644
index 0000000..b0b4e38e
--- /dev/null
+++ b/test/lisp/url/url-file-resources/file.txt
@@ -0,0 +1 @@
+Some file data
diff --git a/test/lisp/url/url-file-tests.el b/test/lisp/url/url-file-tests.el
new file mode 100644
index 0000000..969bca7
--- /dev/null
+++ b/test/lisp/url/url-file-tests.el
@@ -0,0 +1,50 @@
+;;; url-file-tests.el --- Test suite for url-file. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2018 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-file)
+(require 'ert)
+
+(defconst url-file-tests-data-directory
+ (expand-file-name "lisp/url/url-file-resources"
+ (or (getenv "EMACS_TEST_DIRECTORY")
+ (expand-file-name "../../.."
+ (or load-file-name
+ buffer-file-name))))
+ "Directory for url-file test files.")
+
+(ert-deftest url-file ()
+ "Test reading file via file:// URL."
+ (let ((file (expand-file-name "file.txt" url-file-tests-data-directory)))
+ (should (equal
+ (with-current-buffer
+ (url-file (url-generic-parse-url (concat "file://" file))
+ #'ignore nil)
+ (prog1 (buffer-substring (point) (point-max))
+ (kill-buffer)))
+ (with-temp-buffer
+ (insert-file-contents-literally file)
+ (buffer-string))))))
+
+(provide 'url-file-tests)
+
+;;; url-file-tests.el ends here
diff --git a/test/lisp/url/url-misc-tests.el b/test/lisp/url/url-misc-tests.el
new file mode 100644
index 0000000..fec2609
--- /dev/null
+++ b/test/lisp/url/url-misc-tests.el
@@ -0,0 +1,41 @@
+;;; url-misc-tests.el --- Test suite for url-misc. -*- lexical-binding: t -*-
+
+;; Copyright (C) 2018 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-misc)
+(require 'ert)
+
+(ert-deftest url-misc-data ()
+ "Test reading data: URL."
+ (should (equal
+ (with-current-buffer
+ (url-data (url-generic-parse-url "data:;,some%20text"))
+ (goto-char (point-min))
+ (forward-paragraph)
+ (forward-line)
+ (prog1 (buffer-substring (point) (point-max))
+ (kill-buffer)))
+ "some text")))
+
+(provide 'url-misc-tests)
+
+;;; url-misc-tests.el ends here