Merge from trunk.

3 files changed, 121 insertions, 7 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 72b44747bac..44c013e9887 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,14 @@
+2012-11-13  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * automated/ruby-mode-tests.el (ruby-heredoc-font-lock)
+        (ruby-singleton-class-no-heredoc-font-lock)
+        (ruby-add-log-current-method-examples): New tests.
+        (ruby-test-string): Extract from ruby-should-indent-buffer.
+
+2012-11-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * automated/advice-tests.el: New tests.
+
 2012-10-14  Eli Zaretskii  <eliz@gnu.org>
 
         * automated/compile-tests.el (compile-tests--test-regexps-data):
diff --git a/test/automated/advice-tests.el b/test/automated/advice-tests.el
new file mode 100644
index 00000000000..9f9719fdcfc
--- /dev/null
+++ b/test/automated/advice-tests.el
@@ -0,0 +1,73 @@
+;;; advice-tests.el --- Test suite for the new advice thingy.
+
+;; Copyright (C) 2012 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 <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(defvar advice-tests--data
+  '(((defun sm-test1 (x) (+ x 4))
+     (sm-test1 6) 10)
+    ((advice-add 'sm-test1 :around (lambda (f y) (* (funcall f y) 5)))
+     (sm-test1 6) 50)
+    ((defun sm-test1 (x) (+ x 14))
+     (sm-test1 6) 100)
+    ((null (get 'sm-test1 'defalias-fset-function)) nil)
+    ((advice-remove 'sm-test1 (lambda (f y) (* (funcall f y) 5)))
+     (sm-test1 6) 20)
+    ((null (get 'sm-test1 'defalias-fset-function)) t)
+
+    ((defun sm-test2 (x) (+ x 4))
+     (sm-test2 6) 10)
+    ((defadvice sm-test2 (around sm-test activate)
+       ad-do-it (setq ad-return-value (* ad-return-value 5)))
+     (sm-test2 6) 50)
+    ((ad-deactivate 'sm-test2)
+     (sm-test2 6) 10)
+    ((ad-activate 'sm-test2)
+     (sm-test2 6) 50)
+    ((defun sm-test2 (x) (+ x 14))
+     (sm-test2 6) 100)
+    ((null (get 'sm-test2 'defalias-fset-function)) nil)
+    ((ad-remove-advice 'sm-test2 'around 'sm-test)
+     (sm-test2 6) 100)
+    ((ad-activate 'sm-test2)
+     (sm-test2 6) 20)
+    ((null (get 'sm-test2 'defalias-fset-function)) t)
+
+    ((advice-add 'sm-test3 :around
+                 (lambda (f &rest args) `(toto ,(apply f args)))
+                 '((name . wrap-with-toto)))
+     (defmacro sm-test3 (x) `(call-test3 ,x))
+     (macroexpand '(sm-test3 56)) (toto (call-test3 56)))
+
+    ))
+
+(ert-deftest advice-tests ()
+  "Test advice code."
+  (with-temp-buffer
+    (dolist (test advice-tests--data)
+      (let ((res (eval `(progn ,@(butlast test)))))
+        (should (equal (car (last test)) res))))))
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; advice-tests.el ends here.
diff --git a/test/automated/ruby-mode-tests.el b/test/automated/ruby-mode-tests.el
index ba3040577b1..0e41b2ba1e2 100644
--- a/test/automated/ruby-mode-tests.el
+++ b/test/automated/ruby-mode-tests.el
@@ -36,11 +36,13 @@
 
 The whitespace before and including \"|\" on each line is removed."
   (with-temp-buffer
-    (cl-flet ((fix-indent (s) (replace-regexp-in-string "^[ \t]*|" "" s)))
-      (insert (fix-indent content))
-      (ruby-mode)
-      (indent-region (point-min) (point-max))
-      (should (string= (fix-indent expected) (buffer-string))))))
+    (insert (ruby-test-string content))
+    (ruby-mode)
+    (indent-region (point-min) (point-max))
+    (should (string= (ruby-test-string expected) (buffer-string)))))
+
+(defun ruby-test-string (s &rest args)
+  (apply 'format (replace-regexp-in-string "^[ \t]*|" "" s) args))
 
 (defun ruby-assert-state (content &rest values-plist)
   "Assert syntax state values at the end of CONTENT.
@@ -76,6 +78,14 @@ VALUES-PLIST is a list with alternating index and value elements."
   (ruby-assert-state "foo <<asd\n" 3 ?\n)
   (ruby-assert-state "class <<asd\n" 3 nil))
 
+(ert-deftest ruby-heredoc-font-lock ()
+  (let ((s "foo <<eos.gsub('^ *', '')"))
+    (ruby-assert-face s 9 'font-lock-string-face)
+    (ruby-assert-face s 10 nil)))
+
+(ert-deftest ruby-singleton-class-no-heredoc-font-lock ()
+  (ruby-assert-face "class<<a" 8 nil))
+
 (ert-deftest ruby-deep-indent ()
   (let ((ruby-deep-arglist nil)
         (ruby-deep-indent-paren '(?\( ?\{ ?\[ ?\] t)))
@@ -202,13 +212,13 @@ VALUES-PLIST is a list with alternating index and value elements."
    |  end
    |"))
 
-(ert-deftest ruby-move-to-block-stops-at-opening ()
+(ert-deftest ruby-move-to-block-stops-at-indentation ()
   (with-temp-buffer
     (insert "def f\nend")
     (beginning-of-line)
     (ruby-mode)
     (ruby-move-to-block -1)
-    (should (looking-at "f$"))))
+    (should (looking-at "^def"))))
 
 (ert-deftest ruby-toggle-block-to-do-end ()
   (with-temp-buffer
@@ -253,6 +263,26 @@ VALUES-PLIST is a list with alternating index and value elements."
   (ruby-assert-face "# #{comment}\n \"#{interpolation}\"" 16
                     'font-lock-variable-name-face))
 
+(ert-deftest ruby-add-log-current-method-examples ()
+  (let ((pairs '(("foo" . "#foo")
+                 ("C.foo" . ".foo")
+                 ("self.foo" . ".foo"))))
+    (loop for (name . value) in pairs
+          do (with-temp-buffer
+               (insert (ruby-test-string
+                        "module M
+                        |  class C
+                        |    def %s
+                        |    end
+                        |  end
+                        |end"
+                        name))
+               (ruby-mode)
+               (search-backward "def")
+               (forward-line)
+               (should (string= (ruby-add-log-current-method)
+                                (format "M::C%s" value)))))))
+
 (provide 'ruby-mode-tests)
 
 ;;; ruby-mode-tests.el ends here