Skip to content

Move test files #600

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
merged 1 commit into from
Dec 22, 2019
Merged

Move test files #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 tests/annotation.php → tests/lang/doc-comment/annotation.php
View file
Open in desktop
File renamed without changes.
0 tests/annotation.php.faces → tests/lang/doc-comment/annotation.php.faces
View file
Open in desktop
File renamed without changes.
0 tests/comments.php → tests/lang/doc-comment/comments.php
View file
Open in desktop
File renamed without changes.
0 tests/comments.php.24.faces → tests/lang/doc-comment/comments.php.24.faces
View file
Open in desktop
File renamed without changes.
0 tests/comments.php.27.faces → tests/lang/doc-comment/comments.php.27.faces
View file
Open in desktop
File renamed without changes.
0 tests/comments.php.faces → tests/lang/doc-comment/comments.php.faces
View file
Open in desktop
File renamed without changes.
0 tests/doc-comment/inheritdoc.php → tests/lang/doc-comment/inheritdoc.php
View file
Open in desktop
File renamed without changes.
0 tests/doc-comment/inheritdoc.php.faces → tests/lang/doc-comment/inheritdoc.php.faces
View file
Open in desktop
File renamed without changes.
0 tests/issue-8.php → tests/lang/doc-comment/issue-8.php
View file
Open in desktop
File renamed without changes.
0 tests/issue-8.php.faces → tests/lang/doc-comment/issue-8.php.faces
View file
Open in desktop
File renamed without changes.
0 tests/doc-comment/return-type.php → tests/lang/doc-comment/return-type.php
View file
Open in desktop
File renamed without changes.
0 tests/doc-comment/return-type.php.faces → tests/lang/doc-comment/return-type.php.faces
View file
Open in desktop
File renamed without changes.
18 changes: 6 additions & 12 deletions tests/php-mode-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,6 @@ file name and check that the faces of the fonts in the buffer match."
"Proper indentation for classs and functions in namespace block."
(with-php-mode-test ("namespace-block.php" :indent t :magic t)))

(ert-deftest php-mode-test-issue-8 ()
"Annotation highlighting."
(with-php-mode-test ("issue-8.php" :faces t)))

(ert-deftest php-mode-test-issue-9 ()
"Single quote in text in HTML misinterpreted.
The next character after \">We\" is a single quote. It should not
Expand Down Expand Up @@ -560,10 +556,6 @@ style from Drupal."
(should (eq 'php-variable-sigil (get-text-property (match-beginning 0) 'face)))
(should (eq 'php-variable-name (get-text-property (1+ (match-beginning 0)) 'face)))))

(ert-deftest psr-5-style-tag-annotation ()
"PSR-5 style tag annotation."
(with-php-mode-test ("annotation.php" :faces t)))

(ert-deftest php-mode-test-issue-305 ()
"Test highlighting variables which contains 'this' or 'that'."
(with-php-mode-test ("issue-305.php" :faces t)))
Expand Down Expand Up @@ -675,13 +667,15 @@ Meant for `php-mode-test-issue-503'."

(ert-deftest php-mode-test-lang ()
"Test highlighting for language constructs."
(with-php-mode-test ("comments.php"
(with-php-mode-test ("lang/class/anonymous-class.php" :indent t :magic t :faces t))
(with-php-mode-test ("lang/doc-comment/comments.php"
:faces (cond ((eq emacs-major-version 24) ".24.faces")
((version<= "27" emacs-version) ".27.faces")
(t t))))
(with-php-mode-test ("doc-comment/return-type.php" :faces t))
(with-php-mode-test ("doc-comment/inheritdoc.php" :faces t))
(with-php-mode-test ("lang/class/anonymous-class.php" :indent t :magic t :faces t))
(with-php-mode-test ("lang/doc-comment/annotation.php" :faces t))
(with-php-mode-test ("lang/doc-comment/issue-8.php" :faces t))
(with-php-mode-test ("lang/doc-comment/inheritdoc.php" :faces t))
(with-php-mode-test ("lang/doc-comment/return-type.php" :faces t))
(with-php-mode-test ("lang/function/calls.php" :faces t))
(with-php-mode-test ("lang/function/closure.php" :indent t :magic t :faces t))
(with-php-mode-test ("lang/try-cactch/multiple.php" :faces t))
Expand Down