Skip to content

Refactor test files #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zonuexe merged 3 commits into from
May 12, 2019
Merged

Refactor test files #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d57587b
Fix indentation
zonuexe May 12, 2019
9ab0dcf
Add .editorconfig for test directory
zonuexe May 12, 2019
983fb5a
Clarification of the condition under test
zonuexe May 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 53 additions & 52 deletions php-mode-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
(c-after-font-lock-init)

(defvar php-mode-test-dir (expand-file-name "tests"
(if load-file-name
(file-name-directory load-file-name)
default-directory))
(if load-file-name
(file-name-directory load-file-name)
default-directory))
"Directory containing the `php-mode' test files.")

(defvar php-mode-test-valid-magics '(indent)
Expand Down Expand Up @@ -178,8 +178,8 @@ The next character after \">We\" is a single quote. It should not
have a string face."
:expected-result :failed
(with-php-mode-test ("issue-9.php")
(search-forward ">We")
(forward-char) ;; Jump to after the opening apostrophe
(search-forward ">We")
(forward-char) ;; Jump to after the opening apostrophe
(should-not (eq
(get-text-property (point) 'face)
'php-string))))
Expand Down Expand Up @@ -234,10 +234,10 @@ Gets the face of the text after the comma."
This applies for both single and double quotes."
(with-php-mode-test ("issue-21.php")
(while (search-forward "#" nil t)
(while (not (looking-at "\n"))
(should (eq (get-text-property (point) 'face)
'font-lock-comment-face))
(forward-char)))))
(while (not (looking-at "\n"))
(should (eq (get-text-property (point) 'face)
'font-lock-comment-face))
(forward-char)))))

(ert-deftest php-mode-test-issue-27 ()
"Indentation in a file with a shebang."
Expand Down Expand Up @@ -268,22 +268,25 @@ an error."
(ert-deftest php-mode-test-issue-53 ()
"Check if whitespace effects are undone when changing coding
style from Drupal."
(with-php-mode-test
("issue-53.php")
(search-forward "return $this->bar;")
;; the file written to has no significance, only the buffer
(let ((tmp-filename (concat (make-temp-name temporary-file-directory) ".php")))
(dolist (mode '(pear wordpress symfony2))
(php-set-style "drupal")
(php-set-style (symbol-name mode))
(should-not show-trailing-whitespace)
(php-set-style "psr2")
(php-set-style (symbol-name mode))
(should-not show-trailing-whitespace)

(php-set-style "drupal")
(write-file tmp-filename)
(should (looking-at-p "$"))))))
(with-php-mode-test ("issue-53.php")
(search-forward "return $this->bar;")
;; the file written to has no significance, only the buffer
(let ((tmp-filename (concat (make-temp-name temporary-file-directory) ".php")))
(dolist (mode '(pear wordpress symfony2))
(php-set-style "drupal")
(php-set-style (symbol-name mode))
(should (equal (list "drupal" mode nil)
(list "drupal" mode show-trailing-whitespace)))
(php-set-style "psr2")
(php-set-style (symbol-name mode))
(should (equal (list "psr2" mode nil)
(list "psr2" mode show-trailing-whitespace)))

(php-set-style "drupal")
(write-file tmp-filename)
(should (equal (list "drupal-after-write" mode t)
(list "drupal-after-write" mode show-trailing-whitespace)))
(should (looking-at-p "$"))))))

(ert-deftest php-mode-test-issue-73 ()
"The `delete-indentation' function should work properly for PHP.
Expand All @@ -309,15 +312,14 @@ style from Drupal."

(ert-deftest php-mode-test-issue-83 ()
"All static method should appear on imenu whether 'static' keyword is placed before or after visibility"
(with-php-mode-test
("issue-83.php")
(let* ((index-alist (imenu--make-index-alist))
(public-methods (mapcar 'car (cdr (assoc "Public Methods" index-alist))))
(all-methods (mapcar 'car (cdr (assoc "All Methods" index-alist)))))
(should (member "staticBeforeVisibility" public-methods))
(should (member "staticBeforeVisibility" all-methods))
(should (member "staticAfterVisibility" public-methods))
(should (member "staticAfterVisibility" all-methods)))))
(with-php-mode-test ("issue-83.php")
(let* ((index-alist (imenu--make-index-alist))
(public-methods (mapcar 'car (cdr (assoc "Public Methods" index-alist))))
(all-methods (mapcar 'car (cdr (assoc "All Methods" index-alist)))))
(should (member "staticBeforeVisibility" public-methods))
(should (member "staticBeforeVisibility" all-methods))
(should (member "staticAfterVisibility" public-methods))
(should (member "staticAfterVisibility" all-methods)))))

(ert-deftest php-mode-test-issue-99 ()
"Proper indentation for 'foreach' statements without braces."
Expand All @@ -340,14 +342,14 @@ style from Drupal."
(ert-deftest php-mode-test-issue-124 ()
"Proper syntax propertizing when a quote appears in a heredoc."
(with-php-mode-test ("issue-124.php" :indent t)
(search-forward "Start of heredoc")
;; The heredoc should be recognized as a string.
(dolist (syntax (c-guess-basic-syntax))
(should (eq (car syntax) 'string)))
(search-forward "function bar")
;; After the heredoc should *not* be recognized as a string.
(dolist (syntax (c-guess-basic-syntax))
(should (not (eq (car syntax) 'string))))))
(search-forward "Start of heredoc")
;; The heredoc should be recognized as a string.
(dolist (syntax (c-guess-basic-syntax))
(should (eq (car syntax) 'string)))
(search-forward "function bar")
;; After the heredoc should *not* be recognized as a string.
(dolist (syntax (c-guess-basic-syntax))
(should (not (eq (car syntax) 'string))))))

(ert-deftest php-mode-test-issue-136 ()
"Proper highlighting for variable interpolation."
Expand Down Expand Up @@ -964,16 +966,15 @@ Meant for `php-mode-test-issue-503'."

(ert-deftest php-mode-test-issue-503 ()
"Function `php-beginning-of-defun' should return non-nil on success."
(with-php-mode-test
("issue-503.php")
(php-mode)
(goto-char (point-max))
(should (eq (php-mode-test-in-function-p) nil))
(should (eq (php-mode-test-in-function-p (1- (point))) t))
(should (eq (php-mode-test-in-function-p 1) nil))
(should (eq (php-mode-test-in-function-p 24) t))
(goto-char (point-min))
(should (eq (php-mode-test-in-function-p nil) nil))))
(with-php-mode-test ("issue-503.php")
(php-mode)
(goto-char (point-max))
(should (eq (php-mode-test-in-function-p) nil))
(should (eq (php-mode-test-in-function-p (1- (point))) t))
(should (eq (php-mode-test-in-function-p 1) nil))
(should (eq (php-mode-test-in-function-p 24) t))
(goto-char (point-min))
(should (eq (php-mode-test-in-function-p nil) nil))))

(ert-deftest php-mode-test-php74-arrow-fn ()
"Test highlighting arrow funcsion (short closure syntax) added in PHP 7.4."
Expand Down
11 changes: 11 additions & 0 deletions tests/.editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = false

# Unix-style newlines with a newline ending every file
[*.php]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = false