From: Eli Zaretskii Date: Tue, 5 Jan 2016 18:21:03 +0000 (+0200) Subject: Fix fallout from merging emacs-25 branch in test/ X-Git-Tag: emacs-26.0.90~2821^2~10 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6a311d2072b8a4ea530d9a541e661a8ad11bb1d7;p=emacs.git Fix fallout from merging emacs-25 branch in test/ * .gitignore: Update for the new place of biditest.txt. * test/automated/: Directory removed. All files moved to their proper places. * test/etags/: Directory removed. All files moved to their proper places. * test/automated/url-parse-tests.el: File removed; it was an exact copy of the same file in test/lisp/url/. * test/automated/url-expand-tests.el: Moved to test/lisp/url/. --- diff --git a/.gitignore b/.gitignore index a8f0e9a2486..94c4ba8e4bb 100644 --- a/.gitignore +++ b/.gitignore @@ -152,7 +152,7 @@ src/*.map # Tests. test/indent/*.new -test/biditest.txt +test/manual/biditest.txt test/manual/etags/srclist test/manual/etags/regexfile test/manual/etags/ETAGS diff --git a/test/automated/data/package/macro-problem-package-1.0/macro-aux.el b/test/automated/data/package/macro-problem-package-1.0/macro-aux.el deleted file mode 100644 index f43232224af..00000000000 --- a/test/automated/data/package/macro-problem-package-1.0/macro-aux.el +++ /dev/null @@ -1,12 +0,0 @@ -;;; macro-aux.el --- laksd -*- lexical-binding: t; -*- - -;; Author: Artur Malabarba - -;;; Code: - -(defun macro-aux-1 ( &rest forms) - "Description" - `(progn ,@forms)) - -(provide 'macro-aux) -;;; macro-aux.el ends here diff --git a/test/automated/data/package/macro-problem-package-1.0/macro-problem.el b/test/automated/data/package/macro-problem-package-1.0/macro-problem.el deleted file mode 100644 index 0533b1bd9c4..00000000000 --- a/test/automated/data/package/macro-problem-package-1.0/macro-problem.el +++ /dev/null @@ -1,21 +0,0 @@ -;;; macro-problem.el --- laksd -*- lexical-binding: t; -*- - -;; Author: Artur Malabarba -;; Keywords: tools -;; Version: 1.0 - -;;; Code: - -(require 'macro-aux) - -(defmacro macro-problem-1 ( &rest forms) - "Description" - `(progn ,@forms)) - -(defun macro-problem-func () - "" - (macro-problem-1 'a 'b) - (macro-aux-1 'a 'b)) - -(provide 'macro-problem) -;;; macro-problem.el ends here diff --git a/test/automated/data/package/macro-problem-package-2.0/macro-aux.el b/test/automated/data/package/macro-problem-package-2.0/macro-aux.el deleted file mode 100644 index 6a55a40e3b4..00000000000 --- a/test/automated/data/package/macro-problem-package-2.0/macro-aux.el +++ /dev/null @@ -1,16 +0,0 @@ -;;; macro-aux.el --- laksd -*- lexical-binding: t; -*- - -;; Author: Artur Malabarba - -;;; Code: - -(defmacro macro-aux-1 ( &rest forms) - "Description" - `(progn ,@forms)) - -(defmacro macro-aux-3 ( &rest _) - "Description" - 90) - -(provide 'macro-aux) -;;; macro-aux.el ends here diff --git a/test/automated/data/package/macro-problem-package-2.0/macro-problem.el b/test/automated/data/package/macro-problem-package-2.0/macro-problem.el deleted file mode 100644 index cad4ed93f19..00000000000 --- a/test/automated/data/package/macro-problem-package-2.0/macro-problem.el +++ /dev/null @@ -1,30 +0,0 @@ -;;; macro-problem.el --- laksd -*- lexical-binding: t; -*- - -;; Author: Artur Malabarba -;; Keywords: tools -;; Version: 2.0 - -;;; Code: - -(require 'macro-aux) - -(defmacro macro-problem-1 ( &rest forms) - "Description" - `(progn ,(cadr (car forms)))) - - -(defun macro-problem-func () - "" - (list (macro-problem-1 '1 'b) - (macro-aux-1 'a 'b))) - -(defmacro macro-problem-3 (&rest _) - "Description" - 10) - -(defun macro-problem-10-and-90 () - "" - (list (macro-problem-3 haha) (macro-aux-3 hehe))) - -(provide 'macro-problem) -;;; macro-problem.el ends here diff --git a/test/automated/url-expand-tests.el b/test/automated/url-expand-tests.el deleted file mode 100644 index 2bd28687f8d..00000000000 --- a/test/automated/url-expand-tests.el +++ /dev/null @@ -1,105 +0,0 @@ -;;; url-expand-tests.el --- Test suite for relative URI/URL resolution. - -;; Copyright (C) 2012-2015 Free Software Foundation, Inc. - -;; Author: Alain Schneble -;; Version: 1.0 - -;; 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 . - -;;; Commentary: - -;; Test cases covering URI reference resolution as described in RFC3986, -;; section 5. Reference Resolution and especially the relative resolution -;; rules specified in section 5.2. Relative Resolution. - -;; Each test calls `url-expand-file-name', typically with a relative -;; reference URI and a base URI as string and compares the result (Actual) -;; against a manually specified URI (Expected) - -;;; Code: - -(require 'url-expand) -(require 'ert) - -(ert-deftest url-expand-file-name/relative-resolution-normal-examples () - "RFC 3986, Section 5.4 Reference Resolution Examples / Section 5.4.1. Normal Examples" - (should (equal (url-expand-file-name "g:h" "http://a/b/c/d;p?q") "g:h")) - (should (equal (url-expand-file-name "g" "http://a/b/c/d;p?q") "http://a/b/c/g")) - (should (equal (url-expand-file-name "./g" "http://a/b/c/d;p?q") "http://a/b/c/g")) - (should (equal (url-expand-file-name "g/" "http://a/b/c/d;p?q") "http://a/b/c/g/")) - (should (equal (url-expand-file-name "/g" "http://a/b/c/d;p?q") "http://a/g")) - (should (equal (url-expand-file-name "//g" "http://a/b/c/d;p?q") "http://g")) - (should (equal (url-expand-file-name "?y" "http://a/b/c/d;p?q") "http://a/b/c/d;p?y")) - (should (equal (url-expand-file-name "g?y" "http://a/b/c/d;p?q") "http://a/b/c/g?y")) - (should (equal (url-expand-file-name "#s" "http://a/b/c/d;p?q") "http://a/b/c/d;p?q#s")) - (should (equal (url-expand-file-name "g#s" "http://a/b/c/d;p?q") "http://a/b/c/g#s")) - (should (equal (url-expand-file-name "g?y#s" "http://a/b/c/d;p?q") "http://a/b/c/g?y#s")) - (should (equal (url-expand-file-name ";x" "http://a/b/c/d;p?q") "http://a/b/c/;x")) - (should (equal (url-expand-file-name "g;x" "http://a/b/c/d;p?q") "http://a/b/c/g;x")) - (should (equal (url-expand-file-name "g;x?y#s" "http://a/b/c/d;p?q") "http://a/b/c/g;x?y#s")) - (should (equal (url-expand-file-name "" "http://a/b/c/d;p?q") "http://a/b/c/d;p?q")) - (should (equal (url-expand-file-name "." "http://a/b/c/d;p?q") "http://a/b/c/")) - (should (equal (url-expand-file-name "./" "http://a/b/c/d;p?q") "http://a/b/c/")) - (should (equal (url-expand-file-name ".." "http://a/b/c/d;p?q") "http://a/b/")) - (should (equal (url-expand-file-name "../" "http://a/b/c/d;p?q") "http://a/b/")) - (should (equal (url-expand-file-name "../g" "http://a/b/c/d;p?q") "http://a/b/g")) - (should (equal (url-expand-file-name "../.." "http://a/b/c/d;p?q") "http://a/")) - (should (equal (url-expand-file-name "../../" "http://a/b/c/d;p?q") "http://a/")) - (should (equal (url-expand-file-name "../../g" "http://a/b/c/d;p?q") "http://a/g"))) - -(ert-deftest url-expand-file-name/relative-resolution-absolute-examples () - "RFC 3986, Section 5.4 Reference Resolution Examples / Section 5.4.2. Abnormal Examples" - (should (equal (url-expand-file-name "../../../g" "http://a/b/c/d;p?q") "http://a/g")) - (should (equal (url-expand-file-name "../../../../g" "http://a/b/c/d;p?q") "http://a/g")) - - (should (equal (url-expand-file-name "/./g" "http://a/b/c/d;p?q") "http://a/g")) - (should (equal (url-expand-file-name "/../g" "http://a/b/c/d;p?q") "http://a/g")) - (should (equal (url-expand-file-name "g." "http://a/b/c/d;p?q") "http://a/b/c/g.")) - (should (equal (url-expand-file-name ".g" "http://a/b/c/d;p?q") "http://a/b/c/.g")) - (should (equal (url-expand-file-name "g.." "http://a/b/c/d;p?q") "http://a/b/c/g..")) - (should (equal (url-expand-file-name "..g" "http://a/b/c/d;p?q") "http://a/b/c/..g")) - - (should (equal (url-expand-file-name "./../g" "http://a/b/c/d;p?q") "http://a/b/g")) - (should (equal (url-expand-file-name "./g/." "http://a/b/c/d;p?q") "http://a/b/c/g/")) - (should (equal (url-expand-file-name "g/./h" "http://a/b/c/d;p?q") "http://a/b/c/g/h")) - (should (equal (url-expand-file-name "g/../h" "http://a/b/c/d;p?q") "http://a/b/c/h")) - (should (equal (url-expand-file-name "g;x=1/./y" "http://a/b/c/d;p?q") "http://a/b/c/g;x=1/y")) - (should (equal (url-expand-file-name "g;x=1/../y" "http://a/b/c/d;p?q") "http://a/b/c/y")) - - (should (equal (url-expand-file-name "g?y/./x" "http://a/b/c/d;p?q") "http://a/b/c/g?y/./x")) - (should (equal (url-expand-file-name "g?y/../x" "http://a/b/c/d;p?q") "http://a/b/c/g?y/../x")) - (should (equal (url-expand-file-name "g#s/./x" "http://a/b/c/d;p?q") "http://a/b/c/g#s/./x")) - (should (equal (url-expand-file-name "g#s/../x" "http://a/b/c/d;p?q") "http://a/b/c/g#s/../x")) - - (should (equal (url-expand-file-name "http:g" "http://a/b/c/d;p?q") "http:g")) ; for strict parsers - ) - -(ert-deftest url-expand-file-name/relative-resolution-additional-examples () - "Reference Resolution Examples / Arbitrary Examples" - (should (equal (url-expand-file-name "" "http://host/foobar") "http://host/foobar")) - (should (equal (url-expand-file-name "?y" "http://a/b/c/d") "http://a/b/c/d?y")) - (should (equal (url-expand-file-name "?y" "http://a/b/c/d/") "http://a/b/c/d/?y")) - (should (equal (url-expand-file-name "?y#fragment" "http://a/b/c/d;p?q") "http://a/b/c/d;p?y#fragment")) - (should (equal (url-expand-file-name "#bar" "http://host") "http://host#bar")) - (should (equal (url-expand-file-name "#bar" "http://host/") "http://host/#bar")) - (should (equal (url-expand-file-name "#bar" "http://host/foo") "http://host/foo#bar")) - (should (equal (url-expand-file-name "foo#bar" "http://host/foobar") "http://host/foo#bar")) - (should (equal (url-expand-file-name "foo#bar" "http://host/foobar/") "http://host/foobar/foo#bar"))) - -(provide 'url-expand-tests) - -;;; url-expand-tests.el ends here diff --git a/test/automated/url-parse-tests.el b/test/automated/url-parse-tests.el deleted file mode 100644 index 443034a603e..00000000000 --- a/test/automated/url-parse-tests.el +++ /dev/null @@ -1,167 +0,0 @@ -;;; url-parse-tests.el --- Test suite for URI/URL parsing. - -;; Copyright (C) 2012-2015 Free Software Foundation, Inc. - -;; Author: Alain Schneble -;; Version: 1.0 - -;; 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 . - -;;; Commentary: - -;; Test cases covering generic URI syntax as described in RFC3986, -;; section 3. Syntax Components and 4. Usage. See also appendix -;; A. Collected ABNF for URI, as the example given here are all -;; productions of this grammar. - -;; Each tests parses a given URI string - whether relative or absolute - -;; using `url-generic-parse-url' and compares the constructed -;; URL-struct (Actual) against a manually `url-parse-make-urlobj'- -;; constructed URL-struct (Expected). - -;;; Code: - -(require 'url-parse) -(require 'ert) - -(ert-deftest url-generic-parse-url/generic-uri-examples () - "RFC 3986, section 1.1.2. Examples / Example illustrating several URI schemes and variations in their common syntax components" - (should (equal (url-generic-parse-url "ftp://ftp.is.co.za/rfc/rfc1808.txt") (url-parse-make-urlobj "ftp" nil nil "ftp.is.co.za" nil "/rfc/rfc1808.txt" nil nil t))) - (should (equal (url-generic-parse-url "http://www.ietf.org/rfc/rfc2396.txt") (url-parse-make-urlobj "http" nil nil "www.ietf.org" nil "/rfc/rfc2396.txt" nil nil t))) - (should (equal (url-generic-parse-url "ldap://[2001:db8::7]/c=GB?objectClass?one") (url-parse-make-urlobj "ldap" nil nil "[2001:db8::7]" nil "/c=GB?objectClass?one" nil nil t))) - (should (equal (url-generic-parse-url "mailto:John.Doe@example.com") (url-parse-make-urlobj "mailto" nil nil nil nil "John.Doe@example.com" nil nil nil))) - (should (equal (url-generic-parse-url "news:comp.infosystems.www.servers.unix") (url-parse-make-urlobj "news" nil nil nil nil "comp.infosystems.www.servers.unix" nil nil nil))) - (should (equal (url-generic-parse-url "tel:+1-816-555-1212") (url-parse-make-urlobj "tel" nil nil nil nil "+1-816-555-1212" nil nil nil))) - (should (equal (url-generic-parse-url "telnet://192.0.2.16:80/") (url-parse-make-urlobj "telnet" nil nil "192.0.2.16" 80 "/" nil nil t))) - (should (equal (url-generic-parse-url "urn:oasis:names:specification:docbook:dtd:xml:4.1.2") (url-parse-make-urlobj "urn" nil nil nil nil "oasis:names:specification:docbook:dtd:xml:4.1.2" nil nil nil)))) - -(ert-deftest url-generic-parse-url/generic-uri () - "RFC 3986, section 3. Syntax Components / generic URI syntax" - ;; empty path - (should (equal (url-generic-parse-url "http://host#") (url-parse-make-urlobj "http" nil nil "host" nil "" "" nil t))) - (should (equal (url-generic-parse-url "http://host#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "" "fragment" nil t))) - (should (equal (url-generic-parse-url "http://host?#") (url-parse-make-urlobj "http" nil nil "host" nil "?" "" nil t))) - (should (equal (url-generic-parse-url "http://host?query#") (url-parse-make-urlobj "http" nil nil "host" nil "?query" "" nil t))) - (should (equal (url-generic-parse-url "http://host?#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "?" "fragment" nil t))) - (should (equal (url-generic-parse-url "http://host?query#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "?query" "fragment" nil t))) - ;; absolute path / - (should (equal (url-generic-parse-url "http://host/#") (url-parse-make-urlobj "http" nil nil "host" nil "/" "" nil t))) - (should (equal (url-generic-parse-url "http://host/#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/" "fragment" nil t))) - (should (equal (url-generic-parse-url "http://host/?#") (url-parse-make-urlobj "http" nil nil "host" nil "/?" "" nil t))) - (should (equal (url-generic-parse-url "http://host/?query#") (url-parse-make-urlobj "http" nil nil "host" nil "/?query" "" nil t))) - (should (equal (url-generic-parse-url "http://host/?#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/?" "fragment" nil t))) - (should (equal (url-generic-parse-url "http://host/?query#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/?query" "fragment" nil t))) - ;; absolute path /foo - (should (equal (url-generic-parse-url "http://host/foo#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo" "" nil t))) - (should (equal (url-generic-parse-url "http://host/foo#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo" "fragment" nil t))) - (should (equal (url-generic-parse-url "http://host/foo?#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo?" "" nil t))) - (should (equal (url-generic-parse-url "http://host/foo?query#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo?query" "" nil t))) - (should (equal (url-generic-parse-url "http://host/foo?#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo?" "fragment" nil t))) - (should (equal (url-generic-parse-url "http://host/foo?query#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo?query" "fragment" nil t))) - ;; absolute path /foo/ - (should (equal (url-generic-parse-url "http://host/foo/#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/" "" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/" "fragment" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/?#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/?" "" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/?query#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/?query" "" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/?#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/?" "fragment" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/?query#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/?query" "fragment" nil t))) - ;; absolute path /foo/bar - (should (equal (url-generic-parse-url "http://host/foo/bar#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar" "" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar" "fragment" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar?#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar?" "" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar?query#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar?query" "" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar?#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar?" "fragment" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar?query#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar?query" "fragment" nil t))) - ;; absolute path /foo/bar/ - (should (equal (url-generic-parse-url "http://host/foo/bar/#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/" "" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar/#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/" "fragment" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar/?#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/?" "" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar/?query#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/?query" "" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar/?#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/?" "fragment" nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar/?query#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/?query" "fragment" nil t))) - ;; for more examples of URIs without fragments, see tests covering section 4.3. Absolute URI - ) - -(ert-deftest url-generic-parse-url/network-path-reference () - "RFC 3986, section 4.2. Relative Reference / network-path reference: a relative reference that begins with two slash characters" - (should (equal (url-generic-parse-url "//host") (url-parse-make-urlobj nil nil nil "host" nil "" nil nil t))) - (should (equal (url-generic-parse-url "//host/") (url-parse-make-urlobj nil nil nil "host" nil "/" nil nil t))) - (should (equal (url-generic-parse-url "//host/foo") (url-parse-make-urlobj nil nil nil "host" nil "/foo" nil nil t))) - (should (equal (url-generic-parse-url "//host/foo/bar") (url-parse-make-urlobj nil nil nil "host" nil "/foo/bar" nil nil t))) - (should (equal (url-generic-parse-url "//host/foo/bar/") (url-parse-make-urlobj nil nil nil "host" nil "/foo/bar/" nil nil t)))) - -(ert-deftest url-generic-parse-url/absolute-path-reference () - "RFC 3986, section 4.2. Relative Reference / absolute-path reference: a relative reference that begins with a single slash character" - (should (equal (url-generic-parse-url "/") (url-parse-make-urlobj nil nil nil nil nil "/" nil nil nil))) - (should (equal (url-generic-parse-url "/foo") (url-parse-make-urlobj nil nil nil nil nil "/foo" nil nil nil))) - (should (equal (url-generic-parse-url "/foo/bar") (url-parse-make-urlobj nil nil nil nil nil "/foo/bar" nil nil nil))) - (should (equal (url-generic-parse-url "/foo/bar/") (url-parse-make-urlobj nil nil nil nil nil "/foo/bar/" nil nil nil))) - (should (equal (url-generic-parse-url "/foo/bar#") (url-parse-make-urlobj nil nil nil nil nil "/foo/bar" "" nil nil))) - (should (equal (url-generic-parse-url "/foo/bar/#") (url-parse-make-urlobj nil nil nil nil nil "/foo/bar/" "" nil nil)))) - -(ert-deftest url-generic-parse-url/relative-path-reference () - "RFC 3986, section 4.2. Relative Reference / relative-path reference: a relative reference that does not begin with a slash character" - (should (equal (url-generic-parse-url "foo") (url-parse-make-urlobj nil nil nil nil nil "foo" nil nil nil))) - (should (equal (url-generic-parse-url "foo/bar") (url-parse-make-urlobj nil nil nil nil nil "foo/bar" nil nil nil))) - (should (equal (url-generic-parse-url "foo/bar/") (url-parse-make-urlobj nil nil nil nil nil "foo/bar/" nil nil nil))) - (should (equal (url-generic-parse-url "./foo") (url-parse-make-urlobj nil nil nil nil nil "./foo" nil nil nil))) - (should (equal (url-generic-parse-url "./foo/bar") (url-parse-make-urlobj nil nil nil nil nil "./foo/bar" nil nil nil))) - (should (equal (url-generic-parse-url "./foo/bar/") (url-parse-make-urlobj nil nil nil nil nil "./foo/bar/" nil nil nil))) - (should (equal (url-generic-parse-url "../foo") (url-parse-make-urlobj nil nil nil nil nil "../foo" nil nil nil))) - (should (equal (url-generic-parse-url "../foo/bar") (url-parse-make-urlobj nil nil nil nil nil "../foo/bar" nil nil nil))) - (should (equal (url-generic-parse-url "../foo/bar/") (url-parse-make-urlobj nil nil nil nil nil "../foo/bar/" nil nil nil))) - (should (equal (url-generic-parse-url "./this:that") (url-parse-make-urlobj nil nil nil nil nil "./this:that" nil nil nil))) - ;; for more examples of relative-path references, see tests covering section 4.4. Same-Document Reference - ) - -(ert-deftest url-generic-parse-url/absolute-uri () - "RFC 3986, section 4.3. Absolute URI / absolute URI: absolute form of a URI without a fragment identifier" - ;; empty path - (should (equal (url-generic-parse-url "http://host") (url-parse-make-urlobj "http" nil nil "host" nil "" nil nil t))) - (should (equal (url-generic-parse-url "http://host?") (url-parse-make-urlobj "http" nil nil "host" nil "?" nil nil t))) - (should (equal (url-generic-parse-url "http://host?query") (url-parse-make-urlobj "http" nil nil "host" nil "?query" nil nil t))) - ;; absolute path / - (should (equal (url-generic-parse-url "http://host/") (url-parse-make-urlobj "http" nil nil "host" nil "/" nil nil t))) - (should (equal (url-generic-parse-url "http://host/?") (url-parse-make-urlobj "http" nil nil "host" nil "/?" nil nil t))) - (should (equal (url-generic-parse-url "http://host/?query") (url-parse-make-urlobj "http" nil nil "host" nil "/?query" nil nil t))) - ;; absolute path /foo - (should (equal (url-generic-parse-url "http://host/foo") (url-parse-make-urlobj "http" nil nil "host" nil "/foo" nil nil t))) - (should (equal (url-generic-parse-url "http://host/foo?") (url-parse-make-urlobj "http" nil nil "host" nil "/foo?" nil nil t))) - (should (equal (url-generic-parse-url "http://host/foo?query") (url-parse-make-urlobj "http" nil nil "host" nil "/foo?query" nil nil t))) - ;; absolute path /foo/ - (should (equal (url-generic-parse-url "http://host/foo/") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/" nil nil t))) - (should (equal (url-generic-parse-url "http://host/foo/?") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/?" nil nil t))) - (should (equal (url-generic-parse-url "http://host/foo/?query") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/?query" nil nil t))) - ;; absolute path /foo/bar - (should (equal (url-generic-parse-url "http://host/foo/bar") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar" nil nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar?") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar?" nil nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar?query") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar?query" nil nil t))) - ;; absolute path /foo/bar/ - (should (equal (url-generic-parse-url "http://host/foo/bar/") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/" nil nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar/?") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/?" nil nil t))) - (should (equal (url-generic-parse-url "http://host/foo/bar/?query") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/?query" nil nil t))) - ;; example mentioned in RFC3986, section 5.4. Reference Resolution Examples - (should (equal (url-generic-parse-url "http://a/b/c/d;p?q") (url-parse-make-urlobj "http" nil nil "a" nil "/b/c/d;p?q" nil nil t)))) - -(ert-deftest url-generic-parse-url/same-document-reference () - "RFC 3986, section 4.4. Same-Document Reference / same-document reference: empty or number sign (\"#\") followed by a fragment identifier" - (should (equal (url-generic-parse-url "") (url-parse-make-urlobj nil nil nil nil nil "" nil nil nil))) - (should (equal (url-generic-parse-url "#") (url-parse-make-urlobj nil nil nil nil nil "" "" nil nil))) - (should (equal (url-generic-parse-url "#foo") (url-parse-make-urlobj nil nil nil nil nil "" "foo" nil nil)))) - -(provide 'url-parse-tests) - -;;; url-parse-tests.el ends here diff --git a/test/etags/lua-src/test.lua b/test/etags/lua-src/test.lua deleted file mode 100644 index 405eb5f1de0..00000000000 --- a/test/etags/lua-src/test.lua +++ /dev/null @@ -1,36 +0,0 @@ -Rectangle = {} -function Rectangle.getPos () -end - -Circle = {} -function Circle.getPos () -end - -Cube = {} -function Cube.data.getFoo () -end - -Square = {} -function Square.something:Bar () -end - --- Comment line - -- Indented comment line - -test = {} - - function test.me_22a(one, two) - print"me_22a" - end - local function test.me22b (one) - print"me_22b" - end - - - test.i_123 = function (x) - print"i_123" -end - - -test.me_12a(1,2) -test.i_123(1) diff --git a/test/etags/ruby-src/test.rb b/test/etags/ruby-src/test.rb deleted file mode 100644 index 9254c5bffa9..00000000000 --- a/test/etags/ruby-src/test.rb +++ /dev/null @@ -1,54 +0,0 @@ -module ModuleExample - class ClassExample - def class_method - puts "in class_method" - end - def ClassExample.singleton_class_method - puts "in singleton_class_method" - end - def class_method_exclamation! - puts "in class_method_exclamation!" - end - def class_method_question? - puts "in class_method_question?" - end - def class_method_equals= - puts "in class_method_equals=" - end - def `(command) - return "just testing a backquote override" - end - def +(y) - @x + y - end - def [](y) - @ary[y] - end - def []=(y, val) - @ary[y] = val - end - def <<(y) - @x << y - end - def ==(y) - @ary.length == y.ary.length - end - def <=(y) - '@ary.length < y.ary.length' - end - def <=>(y) - nil - end - def ===(y) - self == y - end - end - def module_method - puts "in module_method" - end - def ModuleExample.singleton_module_method - puts "in singleton_module_method" - end -end - -ModuleExample::ClassExample.singleton_class_method diff --git a/test/etags/ruby-src/test1.ruby b/test/etags/ruby-src/test1.ruby deleted file mode 100644 index 43b1a14b95e..00000000000 --- a/test/etags/ruby-src/test1.ruby +++ /dev/null @@ -1,7 +0,0 @@ -class A - def a() - super(" do ") - end - def b() - end -end diff --git a/test/lisp/emacs-lisp/package-resources/macro-problem-package-1.0/macro-aux.el b/test/lisp/emacs-lisp/package-resources/macro-problem-package-1.0/macro-aux.el new file mode 100644 index 00000000000..f43232224af --- /dev/null +++ b/test/lisp/emacs-lisp/package-resources/macro-problem-package-1.0/macro-aux.el @@ -0,0 +1,12 @@ +;;; macro-aux.el --- laksd -*- lexical-binding: t; -*- + +;; Author: Artur Malabarba + +;;; Code: + +(defun macro-aux-1 ( &rest forms) + "Description" + `(progn ,@forms)) + +(provide 'macro-aux) +;;; macro-aux.el ends here diff --git a/test/lisp/emacs-lisp/package-resources/macro-problem-package-1.0/macro-problem.el b/test/lisp/emacs-lisp/package-resources/macro-problem-package-1.0/macro-problem.el new file mode 100644 index 00000000000..0533b1bd9c4 --- /dev/null +++ b/test/lisp/emacs-lisp/package-resources/macro-problem-package-1.0/macro-problem.el @@ -0,0 +1,21 @@ +;;; macro-problem.el --- laksd -*- lexical-binding: t; -*- + +;; Author: Artur Malabarba +;; Keywords: tools +;; Version: 1.0 + +;;; Code: + +(require 'macro-aux) + +(defmacro macro-problem-1 ( &rest forms) + "Description" + `(progn ,@forms)) + +(defun macro-problem-func () + "" + (macro-problem-1 'a 'b) + (macro-aux-1 'a 'b)) + +(provide 'macro-problem) +;;; macro-problem.el ends here diff --git a/test/lisp/emacs-lisp/package-resources/macro-problem-package-2.0/macro-aux.el b/test/lisp/emacs-lisp/package-resources/macro-problem-package-2.0/macro-aux.el new file mode 100644 index 00000000000..6a55a40e3b4 --- /dev/null +++ b/test/lisp/emacs-lisp/package-resources/macro-problem-package-2.0/macro-aux.el @@ -0,0 +1,16 @@ +;;; macro-aux.el --- laksd -*- lexical-binding: t; -*- + +;; Author: Artur Malabarba + +;;; Code: + +(defmacro macro-aux-1 ( &rest forms) + "Description" + `(progn ,@forms)) + +(defmacro macro-aux-3 ( &rest _) + "Description" + 90) + +(provide 'macro-aux) +;;; macro-aux.el ends here diff --git a/test/lisp/emacs-lisp/package-resources/macro-problem-package-2.0/macro-problem.el b/test/lisp/emacs-lisp/package-resources/macro-problem-package-2.0/macro-problem.el new file mode 100644 index 00000000000..cad4ed93f19 --- /dev/null +++ b/test/lisp/emacs-lisp/package-resources/macro-problem-package-2.0/macro-problem.el @@ -0,0 +1,30 @@ +;;; macro-problem.el --- laksd -*- lexical-binding: t; -*- + +;; Author: Artur Malabarba +;; Keywords: tools +;; Version: 2.0 + +;;; Code: + +(require 'macro-aux) + +(defmacro macro-problem-1 ( &rest forms) + "Description" + `(progn ,(cadr (car forms)))) + + +(defun macro-problem-func () + "" + (list (macro-problem-1 '1 'b) + (macro-aux-1 'a 'b))) + +(defmacro macro-problem-3 (&rest _) + "Description" + 10) + +(defun macro-problem-10-and-90 () + "" + (list (macro-problem-3 haha) (macro-aux-3 hehe))) + +(provide 'macro-problem) +;;; macro-problem.el ends here diff --git a/test/lisp/url/url-expand-tests.el b/test/lisp/url/url-expand-tests.el new file mode 100644 index 00000000000..2bd28687f8d --- /dev/null +++ b/test/lisp/url/url-expand-tests.el @@ -0,0 +1,105 @@ +;;; url-expand-tests.el --- Test suite for relative URI/URL resolution. + +;; Copyright (C) 2012-2015 Free Software Foundation, Inc. + +;; Author: Alain Schneble +;; Version: 1.0 + +;; 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 . + +;;; Commentary: + +;; Test cases covering URI reference resolution as described in RFC3986, +;; section 5. Reference Resolution and especially the relative resolution +;; rules specified in section 5.2. Relative Resolution. + +;; Each test calls `url-expand-file-name', typically with a relative +;; reference URI and a base URI as string and compares the result (Actual) +;; against a manually specified URI (Expected) + +;;; Code: + +(require 'url-expand) +(require 'ert) + +(ert-deftest url-expand-file-name/relative-resolution-normal-examples () + "RFC 3986, Section 5.4 Reference Resolution Examples / Section 5.4.1. Normal Examples" + (should (equal (url-expand-file-name "g:h" "http://a/b/c/d;p?q") "g:h")) + (should (equal (url-expand-file-name "g" "http://a/b/c/d;p?q") "http://a/b/c/g")) + (should (equal (url-expand-file-name "./g" "http://a/b/c/d;p?q") "http://a/b/c/g")) + (should (equal (url-expand-file-name "g/" "http://a/b/c/d;p?q") "http://a/b/c/g/")) + (should (equal (url-expand-file-name "/g" "http://a/b/c/d;p?q") "http://a/g")) + (should (equal (url-expand-file-name "//g" "http://a/b/c/d;p?q") "http://g")) + (should (equal (url-expand-file-name "?y" "http://a/b/c/d;p?q") "http://a/b/c/d;p?y")) + (should (equal (url-expand-file-name "g?y" "http://a/b/c/d;p?q") "http://a/b/c/g?y")) + (should (equal (url-expand-file-name "#s" "http://a/b/c/d;p?q") "http://a/b/c/d;p?q#s")) + (should (equal (url-expand-file-name "g#s" "http://a/b/c/d;p?q") "http://a/b/c/g#s")) + (should (equal (url-expand-file-name "g?y#s" "http://a/b/c/d;p?q") "http://a/b/c/g?y#s")) + (should (equal (url-expand-file-name ";x" "http://a/b/c/d;p?q") "http://a/b/c/;x")) + (should (equal (url-expand-file-name "g;x" "http://a/b/c/d;p?q") "http://a/b/c/g;x")) + (should (equal (url-expand-file-name "g;x?y#s" "http://a/b/c/d;p?q") "http://a/b/c/g;x?y#s")) + (should (equal (url-expand-file-name "" "http://a/b/c/d;p?q") "http://a/b/c/d;p?q")) + (should (equal (url-expand-file-name "." "http://a/b/c/d;p?q") "http://a/b/c/")) + (should (equal (url-expand-file-name "./" "http://a/b/c/d;p?q") "http://a/b/c/")) + (should (equal (url-expand-file-name ".." "http://a/b/c/d;p?q") "http://a/b/")) + (should (equal (url-expand-file-name "../" "http://a/b/c/d;p?q") "http://a/b/")) + (should (equal (url-expand-file-name "../g" "http://a/b/c/d;p?q") "http://a/b/g")) + (should (equal (url-expand-file-name "../.." "http://a/b/c/d;p?q") "http://a/")) + (should (equal (url-expand-file-name "../../" "http://a/b/c/d;p?q") "http://a/")) + (should (equal (url-expand-file-name "../../g" "http://a/b/c/d;p?q") "http://a/g"))) + +(ert-deftest url-expand-file-name/relative-resolution-absolute-examples () + "RFC 3986, Section 5.4 Reference Resolution Examples / Section 5.4.2. Abnormal Examples" + (should (equal (url-expand-file-name "../../../g" "http://a/b/c/d;p?q") "http://a/g")) + (should (equal (url-expand-file-name "../../../../g" "http://a/b/c/d;p?q") "http://a/g")) + + (should (equal (url-expand-file-name "/./g" "http://a/b/c/d;p?q") "http://a/g")) + (should (equal (url-expand-file-name "/../g" "http://a/b/c/d;p?q") "http://a/g")) + (should (equal (url-expand-file-name "g." "http://a/b/c/d;p?q") "http://a/b/c/g.")) + (should (equal (url-expand-file-name ".g" "http://a/b/c/d;p?q") "http://a/b/c/.g")) + (should (equal (url-expand-file-name "g.." "http://a/b/c/d;p?q") "http://a/b/c/g..")) + (should (equal (url-expand-file-name "..g" "http://a/b/c/d;p?q") "http://a/b/c/..g")) + + (should (equal (url-expand-file-name "./../g" "http://a/b/c/d;p?q") "http://a/b/g")) + (should (equal (url-expand-file-name "./g/." "http://a/b/c/d;p?q") "http://a/b/c/g/")) + (should (equal (url-expand-file-name "g/./h" "http://a/b/c/d;p?q") "http://a/b/c/g/h")) + (should (equal (url-expand-file-name "g/../h" "http://a/b/c/d;p?q") "http://a/b/c/h")) + (should (equal (url-expand-file-name "g;x=1/./y" "http://a/b/c/d;p?q") "http://a/b/c/g;x=1/y")) + (should (equal (url-expand-file-name "g;x=1/../y" "http://a/b/c/d;p?q") "http://a/b/c/y")) + + (should (equal (url-expand-file-name "g?y/./x" "http://a/b/c/d;p?q") "http://a/b/c/g?y/./x")) + (should (equal (url-expand-file-name "g?y/../x" "http://a/b/c/d;p?q") "http://a/b/c/g?y/../x")) + (should (equal (url-expand-file-name "g#s/./x" "http://a/b/c/d;p?q") "http://a/b/c/g#s/./x")) + (should (equal (url-expand-file-name "g#s/../x" "http://a/b/c/d;p?q") "http://a/b/c/g#s/../x")) + + (should (equal (url-expand-file-name "http:g" "http://a/b/c/d;p?q") "http:g")) ; for strict parsers + ) + +(ert-deftest url-expand-file-name/relative-resolution-additional-examples () + "Reference Resolution Examples / Arbitrary Examples" + (should (equal (url-expand-file-name "" "http://host/foobar") "http://host/foobar")) + (should (equal (url-expand-file-name "?y" "http://a/b/c/d") "http://a/b/c/d?y")) + (should (equal (url-expand-file-name "?y" "http://a/b/c/d/") "http://a/b/c/d/?y")) + (should (equal (url-expand-file-name "?y#fragment" "http://a/b/c/d;p?q") "http://a/b/c/d;p?y#fragment")) + (should (equal (url-expand-file-name "#bar" "http://host") "http://host#bar")) + (should (equal (url-expand-file-name "#bar" "http://host/") "http://host/#bar")) + (should (equal (url-expand-file-name "#bar" "http://host/foo") "http://host/foo#bar")) + (should (equal (url-expand-file-name "foo#bar" "http://host/foobar") "http://host/foo#bar")) + (should (equal (url-expand-file-name "foo#bar" "http://host/foobar/") "http://host/foobar/foo#bar"))) + +(provide 'url-expand-tests) + +;;; url-expand-tests.el ends here diff --git a/test/manual/etags/lua-src/test.lua b/test/manual/etags/lua-src/test.lua new file mode 100644 index 00000000000..405eb5f1de0 --- /dev/null +++ b/test/manual/etags/lua-src/test.lua @@ -0,0 +1,36 @@ +Rectangle = {} +function Rectangle.getPos () +end + +Circle = {} +function Circle.getPos () +end + +Cube = {} +function Cube.data.getFoo () +end + +Square = {} +function Square.something:Bar () +end + +-- Comment line + -- Indented comment line + +test = {} + + function test.me_22a(one, two) + print"me_22a" + end + local function test.me22b (one) + print"me_22b" + end + + + test.i_123 = function (x) + print"i_123" +end + + +test.me_12a(1,2) +test.i_123(1) diff --git a/test/manual/etags/ruby-src/test.rb b/test/manual/etags/ruby-src/test.rb new file mode 100644 index 00000000000..9254c5bffa9 --- /dev/null +++ b/test/manual/etags/ruby-src/test.rb @@ -0,0 +1,54 @@ +module ModuleExample + class ClassExample + def class_method + puts "in class_method" + end + def ClassExample.singleton_class_method + puts "in singleton_class_method" + end + def class_method_exclamation! + puts "in class_method_exclamation!" + end + def class_method_question? + puts "in class_method_question?" + end + def class_method_equals= + puts "in class_method_equals=" + end + def `(command) + return "just testing a backquote override" + end + def +(y) + @x + y + end + def [](y) + @ary[y] + end + def []=(y, val) + @ary[y] = val + end + def <<(y) + @x << y + end + def ==(y) + @ary.length == y.ary.length + end + def <=(y) + '@ary.length < y.ary.length' + end + def <=>(y) + nil + end + def ===(y) + self == y + end + end + def module_method + puts "in module_method" + end + def ModuleExample.singleton_module_method + puts "in singleton_module_method" + end +end + +ModuleExample::ClassExample.singleton_class_method diff --git a/test/manual/etags/ruby-src/test1.ruby b/test/manual/etags/ruby-src/test1.ruby new file mode 100644 index 00000000000..43b1a14b95e --- /dev/null +++ b/test/manual/etags/ruby-src/test1.ruby @@ -0,0 +1,7 @@ +class A + def a() + super(" do ") + end + def b() + end +end