Merge branch 'haxney/tests-with-magic-comments'

* haxney/tests-with-magic-comments:
  Use magic for tests of issues #14, #19, #27, #29, #42
  Use "magic" comments in PHP files to simplify indentation testing

Author: Eric James Michael Ritz

php-mode-test.el

@@ -37,7 +37,35 @@
 (defvar php-mode-test-dir (expand-file-name "tests" (file-name-directory load-file-name))
   "Directory containing the `php-mode' test files.")
 
-(defmacro* with-php-mode-test ((file &optional &key style) &rest body)
+(defvar php-mode-test-valid-magics '(indent)
+  "List of allowed \"magic\" directives which can appear in test cases.")
+
+(defvar php-mode-test-magic-regexp "###php-mode-test### \\((.+)\\)"
+  "Regexp which identifies a magic comment.")
+
+(defun php-mode-test-process-magics ()
+  "Process the test directives in the current buffer.
+These are the ###php-mode-test### comments. Valid magics are
+listed in `php-mode-test-valid-magics'; no other directives will
+be processed."
+  (flet ((indent (offset) (equal (current-indentation) offset)))
+    (let (directives answers)
+     (save-excursion
+       (goto-char (point-min))
+       (while (re-search-forward php-mode-test-magic-regexp nil t)
+         (setq directives (read (buffer-substring (match-beginning 1)
+                                                  (match-end 1))))
+         (setq answers
+               (append (mapcar (lambda (curr)
+                                 (let ((fn (car curr))
+                                       (args (mapcar 'eval (cdr-safe curr))))
+                                   (if (memq fn php-mode-test-valid-magics)
+                                       (apply fn args))))
+                               directives)
+                       answers))))
+     answers)))
+
+(defmacro* with-php-mode-test ((file &optional &key style indent magic) &rest body)
   "Set up environment for testing `php-mode'.
 Execute BODY in a temporary buffer containing the contents of
 FILE, in `php-mode'. Optional keyword `:style' can be used to set
@@ -51,6 +79,11 @@ the coding style to one of `pear', `drupal', or `wordpress'."
         (wordpress '(php-enable-wordpress-coding-style)))
      (php-mode)
      (font-lock-fontify-buffer)
+     ,(if indent
+          '(indent-region (point-min) (point-max)))
+     ,(if magic
+          '(should (reduce (lambda (l r) (and l r))
+                           (php-mode-test-process-magics))))
      (goto-char (point-min))
      ,@body))
 
@@ -75,17 +108,7 @@ have a string face."
 (ert-deftest php-mode-test-issue-14 ()
   "Array indentation."
   :expected-result :failed
-  (with-php-mode-test ("issue-14.php")
-    (let ((expected (concat "$post = Post::model()->find(array(\n"
-                            "    'select' => 'title',\n"
-                            "    'condition' => 'postID=:postID',\n"
-                            "    'params' => array(':postID'=>10),\n"
-                            "));")))
-      (indent-region (point-min) (point-max))
-      (goto-char (point-min))
-      (re-search-forward "^\\$post")
-      (should (string= (buffer-substring-no-properties (match-beginning 0) (point-max))
-                       expected)))))
+  (with-php-mode-test ("issue-14.php" :indent t :magic t)))
 
 (ert-deftest php-mode-test-issue-16 ()
   "Comma separated \"use\" (namespaces).
@@ -98,22 +121,12 @@ Gets the face of the text after the comma."
 
 (ert-deftest php-mode-test-issue-18 ()
   "Indentation of strings which include \"//\"."
-  (with-php-mode-test ("issue-18.php")
-    (let ((expected (concat "if ($a === 'github') {\n"
-                            "    header('Location: http://github.com');\n"
-                            "}")))
-      (indent-region (point-min) (point-max))
-      (goto-char (point-min))
-      (re-search-forward "^if ")
-      (should (string= (buffer-substring-no-properties (match-beginning 0) (point-max))
-                       expected)))))
+  (with-php-mode-test ("issue-18.php" :indent t :magic t)))
 
 (ert-deftest php-mode-test-issue-19 ()
   "Alignment of arrow operators."
   :expected-result :failed
-  (with-php-mode-test ("issue-19.php")
-    (indent-region (point-min) (point-max))
-    (goto-char (point-min))
+  (with-php-mode-test ("issue-19.php" :indent t)
     (while (re-search-forward "^\\s-*\\$object->")
       ;; Point is just after `->'
       (let ((col (current-column)))
@@ -141,11 +154,7 @@ This applies for both single and double quotes."
 
 (ert-deftest php-mode-test-issue-27 ()
   "Indentation in a file with a shebang."
-  (with-php-mode-test ("issue-27.php")
-    (re-search-forward "^\\s-*// Tab")
-    (indent-for-tab-command)
-    (back-to-indentation)
-    (should (eq (current-column) tab-width))))
+  (with-php-mode-test ("issue-27.php" :indent t :magic t)))
 
 (ert-deftest php-mode-test-issue-28 ()
   "Slowdown when scrolling.
@@ -161,16 +170,10 @@ This doesn't test anything, for now."
 (ert-deftest php-mode-test-issue-29 ()
   "Indentation of anonymous functions as arguments.
 The closing brace and parenthesis should be at column 0."
-  (with-php-mode-test ("issue-29.php")
-    (indent-region (point-min) (point-max))
-    (goto-char (point-min))
-    (re-search-forward "^\\s-*});")
-    (back-to-indentation)
-    (should (eq (current-column) 0))))
+  (with-php-mode-test ("issue-29.php" :indent t :magic t)))
 
 (ert-deftest php-mode-test-issue-42 ()
   "Error while indenting closures.
 If the bug has been fixed, indenting the buffer should not cause
 an error."
-  (with-php-mode-test ("issue-42.php")
-    (indent-region (point-min) (point-max))))
+  (with-php-mode-test ("issue-42.php" :indent t)))

tests/issue-14.php

@@ -15,7 +15,7 @@
  */
 
 $post = Post::model()->find(array(
-    'select' => 'title',
-    'condition' => 'postID=:postID',
-    'params' => array(':postID'=>10),
-));
+    'select' => 'title',              // ###php-mode-test### ((indent c-basic-offset))
+    'condition' => 'postID=:postID',  // ###php-mode-test### ((indent c-basic-offset))
+    'params' => array(':postID'=>10), // ###php-mode-test### ((indent c-basic-offset))
+));                                   // ###php-mode-test### ((indent 0))

tests/issue-18.php

@@ -19,5 +19,5 @@
 $a = 'github';
 
 if ($a === 'github') {
-    header('Location: http://github.com');
+    header('Location: http://github.com'); // ###php-mode-test### ((indent c-basic-offset))
 }

tests/issue-27.php

@@ -12,5 +12,5 @@
  */
 
 if (1 == 1) {
-    // Tab
+    // Tab ###php-mode-test### ((indent c-basic-offset))
 }

tests/issue-29.php

@@ -12,5 +12,5 @@
  */
 
 $app->get("/index", function() {
-    $app->redirect("foo");
-});
+    $app->redirect("foo"); // ###php-mode-test### ((indent c-basic-offset))
+});                        // ###php-mode-test### ((indent 0))