[elpa] externals/ess 4ac22227c7 09/12: Move cycle assign tests to edit file

[ELPA Syncer]

branch: externals/ess
commit 4ac22227c7c4b476775702ac76777277b4909294
Author: Lionel Henry <lionel.hry@gmail.com>
Commit: Lionel Henry <lionel.hry@gmail.com>

    Move cycle assign tests to edit file
---
 test/ess-test-r-edit.el | 45 +++++++++++++++++++++++++++++++++++++++++++++
 test/ess-test-r.el      | 44 --------------------------------------------
 2 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/test/ess-test-r-edit.el b/test/ess-test-r-edit.el
index 3d5611fcaf..c1fd87c7a4 100644
--- a/test/ess-test-r-edit.el
+++ b/test/ess-test-r-edit.el
@@ -16,6 +16,16 @@
 ;;; Commentary:
 ;;
 
+(require 'ert)
+(require 'etest "etest/etest")
+(require 'ess-r-mode)
+(require 'ess-test-r-utils)
+
+(defun ess-test-init-insert-assign ()
+  (let ((map (make-sparse-keymap)))
+    (define-key map "_" #'ess-insert-assign)
+    (use-local-map map)))
+
 (etest-deftest test-ess-r-edit-keybindings-smart-assign ()
   (define-key ess-mode-map "_" #'ess-insert-assign)
   :case "foo¶"
@@ -57,6 +67,41 @@
   "_" :result "foo_¶"
   "_" :result "foo_ <~ ¶")
 
+(etest-deftest test-ess-r-edit-insert-assign ()
+  "Repeated calls cycle between assignment and self-insert."
+  :init ((eval . (ess-test-init-insert-assign)))
+  :case "foo¶"
+  "_" :result "foo <- ¶"
+  "_" :result "foo_¶"
+  "_" :result "foo_ <- ¶")
+
+(etest-deftest test-ess-r-edit-insert-assign-whitespace ()
+  "Whitespace is cleaned up before insertion."
+  :init ((eval . (ess-test-init-insert-assign)))
+  :case "foo ¶"  "_" :result "foo <- ¶"
+  :case "foo  ¶" "_" :result "foo <- ¶")
+
+(etest-deftest test-ess-r-edit-cycle-assign-test ()
+  "Repeated calls cycle trough assignment operators."
+  :case "foo¶"
+  "C-c C-=" :result "foo <- ¶"
+  "C-c C-=" :result "foo <<- ¶"
+  "C-c C-=" :result "foo = ¶"
+  "C-c C-=" :result "foo -> ¶"
+  "C-c C-=" :result "foo ->> ¶"
+  "C-c C-=" :result "foo <- ¶"
+  "C-c C-=" :result "foo <<- ¶")
+
+(etest-deftest test-ess-r-edit-cycle-assign-whitespace-test ()
+  "Whitespace is cleaned up before insertion"
+  :case "foo ¶"
+  "C-c C-=" :result "foo <- ¶"
+  "C-c C-=" :result "foo <<- ¶"
+
+  :case "foo  ¶"
+  "C-c C-=" :result "foo <- ¶"
+  "C-c C-=" :result "foo <<- ¶")
+
 ;; Local Variables:
 ;; etest-local-config: etest-r-config
 ;; End:
diff --git a/test/ess-test-r.el b/test/ess-test-r.el
index fb3da5bf57..0f3b671320 100644
--- a/test/ess-test-r.el
+++ b/test/ess-test-r.el
@@ -203,50 +203,6 @@
                                          ("2005-12-30" . "R-2.0")))
                  "R-dev")))
 
-(defun ess-test-init-insert-assign ()
-  (let ((map (make-sparse-keymap)))
-    (define-key map "_" #'ess-insert-assign)
-    (use-local-map map)))
-
-(etest-deftest ess-insert-assign-test ()
-  "Repeated calls cycle between assignment and self-insert."
-  :init ((mode . r)
-         (eval . (ess-test-init-insert-assign)))
-  :case "foo¶"
-  "_" :result "foo <- ¶"
-  "_" :result "foo_¶"
-  "_" :result "foo_ <- ¶")
-
-(etest-deftest ess-insert-assign-whitespace-test ()
-  "Whitespace is cleaned up before insertion."
-  :init ((mode . r)
-         (eval . (ess-test-init-insert-assign)))
-  :case "foo ¶"  "_" :result "foo <- ¶"
-  :case "foo  ¶" "_" :result "foo <- ¶")
-
-(etest-deftest ess-cycle-assign-test ()
-  "Repeated calls cycle trough assignment operators."
-  :init ((mode . r))
-  :case "foo¶"
-  "C-c C-=" :result "foo <- ¶"
-  "C-c C-=" :result "foo <<- ¶"
-  "C-c C-=" :result "foo = ¶"
-  "C-c C-=" :result "foo -> ¶"
-  "C-c C-=" :result "foo ->> ¶"
-  "C-c C-=" :result "foo <- ¶"
-  "C-c C-=" :result "foo <<- ¶")
-
-(etest-deftest ess-cycle-assign-whitespace-test ()
-  "Whitespace is cleaned up before insertion"
-  :init ((mode . r))
-  :case "foo ¶"
-  "C-c C-=" :result "foo <- ¶"
-  "C-c C-=" :result "foo <<- ¶"
-
-  :case "foo  ¶"
-  "C-c C-=" :result "foo <- ¶"
-  "C-c C-=" :result "foo <<- ¶")
-
 (ert-deftest ess-skip-thing-test ()
   (should (eql 18
                (ess-r-test-with-temp-text "x <- function(x){\n mean(x)\n }\n 
\n \n x(3)\n "