1 files changed, 42 insertions, 37 deletions

diff --git a/test/lisp/ses-tests.el b/test/lisp/ses-tests.el
index d08237e285b..c773c9b396f 100644
--- a/test/lisp/ses-tests.el
+++ b/test/lisp/ses-tests.el
@@ -38,7 +38,7 @@ interactively."
       (dolist (c '((0 0 1) (1 0 (1+ A1))))
         (apply 'ses-cell-set-formula c)
         (apply 'ses-calculate-cell (list (car c) (cadr c) nil)))
-      (should (eq A2 2)))))
+      (should (eq (bound-and-true-p A2) 2)))))
 
 (ert-deftest ses-tests-plain-formula ()
   "Check that setting A1 to 1 and A2 to (1+ A1), makes A2 value
@@ -49,13 +49,16 @@ equal to 2. This is done  using interactive calls."
       (dolist (c '((0 0 1) (1 0 (1+ A1))))
         (apply 'funcall-interactively 'ses-edit-cell c))
       (ses-command-hook)
-      (should (eq A2 2)))))
+      (should (eq (bound-and-true-p A2) 2)))))
 
 ;; PLAIN CELL RENAMING TESTS
 ;; ======================================================================
 
+(defvar ses--foo)
+(defvar ses--cells)
+
 (ert-deftest ses-tests-lowlevel-renamed-cell ()
-  "Check that renaming A1 to `foo' and setting `foo' to 1 and A2 to (1+ foo), makes A2 value equal to 2.
+  "Check that renaming A1 to `ses--foo' and setting `ses--foo' to 1 and A2 to (1+ ses--foo), makes A2 value equal to 2.
 This is done using low level functions, `ses-rename-cell' is not
 called but instead we use text replacement in the buffer
 previously passed in text mode."
@@ -69,63 +72,63 @@ previously passed in text mode."
       (text-mode)
       (goto-char (point-min))
       (while (re-search-forward "\\<A1\\>" nil t)
-        (replace-match "foo" t t))
+        (replace-match "ses--foo" t t))
       (ses-mode)
       (should-not  (local-variable-p 'A1))
-      (should (eq foo 1))
-      (should (equal (ses-cell-formula 1 0) '(ses-safe-formula (1+ foo))))
-      (should (eq A2 2)))))
+      (should (eq ses--foo 1))
+      (should (equal (ses-cell-formula 1 0) '(ses-safe-formula (1+ ses--foo))))
+      (should (eq (bound-and-true-p A2) 2)))))
 
 (ert-deftest ses-tests-renamed-cell ()
-  "Check that renaming A1 to `foo' and setting `foo' to 1 and A2
-to (1+ foo), makes A2 value equal to 2."
+  "Check that renaming A1 to `ses--foo' and setting `ses--foo' to 1 and A2
+to (1+ ses--foo), makes A2 value equal to 2."
   (let ((ses-initial-size '(2 . 1)))
     (with-temp-buffer
       (ses-mode)
-      (ses-rename-cell 'foo (ses-get-cell 0 0))
-      (dolist (c '((0 0 1) (1 0 (1+ foo))))
+      (ses-rename-cell 'ses--foo (ses-get-cell 0 0))
+      (dolist (c '((0 0 1) (1 0 (1+ ses--foo))))
         (apply 'funcall-interactively 'ses-edit-cell c))
       (ses-command-hook)
       (should-not  (local-variable-p 'A1))
-      (should (eq foo 1))
-      (should (equal (ses-cell-formula 1 0) '(1+ foo)))
-      (should (eq A2 2)))))
+      (should (eq ses--foo 1))
+      (should (equal (ses-cell-formula 1 0) '(1+ ses--foo)))
+      (should (eq (bound-and-true-p A2) 2)))))
 
 (ert-deftest ses-tests-renamed-cell-after-setting ()
   "Check that setting A1 to 1 and A2 to (1+ A1), and then
-renaming A1 to `foo' makes `foo' value equal to 2."
+renaming A1 to `ses--foo' makes `ses--foo' value equal to 2."
   (let ((ses-initial-size '(2 . 1)))
     (with-temp-buffer
       (ses-mode)
       (dolist (c '((0 0 1) (1 0 (1+ A1))))
         (apply 'funcall-interactively 'ses-edit-cell c))
       (ses-command-hook); deferred recalc
-      (ses-rename-cell 'foo (ses-get-cell 0 0))
+      (ses-rename-cell 'ses--foo (ses-get-cell 0 0))
       (should-not  (local-variable-p 'A1))
-      (should (eq foo 1))
-      (should (equal (ses-cell-formula 1 0) '(1+ foo)))
-      (should (eq A2 2)))))
+      (should (eq ses--foo 1))
+      (should (equal (ses-cell-formula 1 0) '(1+ ses--foo)))
+      (should (eq (bound-and-true-p A2) 2)))))
 
 (ert-deftest ses-tests-renaming-cell-with-one-symbol-formula ()
   "Check that setting A1 to 1 and A2 to A1, and then renaming A1
-to `foo' makes `foo' value equal to 1. Then set A1 to 2 and check
-that `foo' becomes 2."
+to `ses--foo' makes `ses--foo' value equal to 1. Then set A1 to 2 and check
+that `ses--foo' becomes 2."
   (let ((ses-initial-size '(3 . 1)))
     (with-temp-buffer
       (ses-mode)
       (dolist (c '((0 0 1) (1 0 A1)))
         (apply 'funcall-interactively 'ses-edit-cell c))
       (ses-command-hook); deferred recalc
-      (ses-rename-cell 'foo (ses-get-cell 0 0))
+      (ses-rename-cell 'ses--foo (ses-get-cell 0 0))
       (ses-command-hook); deferred recalc
       (should-not  (local-variable-p 'A1))
-      (should (eq foo 1))
-      (should (equal (ses-cell-formula 1 0) 'foo))
-      (should (eq A2 1))
+      (should (eq ses--foo 1))
+      (should (equal (ses-cell-formula 1 0) 'ses--foo))
+      (should (eq (bound-and-true-p A2) 1))
       (funcall-interactively 'ses-edit-cell 0 0 2)
       (ses-command-hook); deferred recalc
-      (should (eq A2 2))
-      (should (eq foo 2)))))
+      (should (eq (bound-and-true-p A2) 2))
+      (should (eq ses--foo 2)))))
 
 
 ;; ROW INSERTION TESTS
@@ -144,12 +147,14 @@ to A2 and inserting a row, makes A2 value empty, and A3 equal to
       (ses-jump 'A2)
       (ses-insert-row 1)
       (ses-command-hook)
-      (should-not A2)
-      (should (eq A3 2)))))
+      (should-not (bound-and-true-p A2))
+      (should (eq (bound-and-true-p A3) 2)))))
+
+(defvar ses--bar)
 
 (ert-deftest ses-tests-renamed-cells-row-insertion ()
-  "Check that setting A1 to 1 and A2 to (1+ A1), and then renaming A1 to `foo' and A2 to `bar' jumping
-to `bar' and inserting a row, makes A2 value empty, and `bar' equal to
+  "Check that setting A1 to 1 and A2 to (1+ A1), and then renaming A1 to `ses--foo' and A2 to `ses--bar' jumping
+to `ses--bar' and inserting a row, makes A2 value empty, and `ses--bar' equal to
 2."
   (let ((ses-initial-size '(2 . 1)))
     (with-temp-buffer
@@ -157,16 +162,16 @@ to `bar' and inserting a row, makes A2 value empty, and `bar' equal to
       (dolist (c '((0 0 1) (1 0 (1+ A1))))
         (apply 'funcall-interactively 'ses-edit-cell c))
       (ses-command-hook)
-      (ses-rename-cell 'foo (ses-get-cell 0 0))
+      (ses-rename-cell 'ses--foo (ses-get-cell 0 0))
       (ses-command-hook)
-      (ses-rename-cell 'bar (ses-get-cell 1 0))
+      (ses-rename-cell 'ses--bar (ses-get-cell 1 0))
       (ses-command-hook)
-      (should (eq bar 2))
-      (ses-jump 'bar)
+      (should (eq ses--bar 2))
+      (ses-jump 'ses--bar)
       (ses-insert-row 1)
       (ses-command-hook)
-      (should-not A2)
-      (should (eq bar 2)))))
+      (should-not (bound-and-true-p A2))
+      (should (eq ses--bar 2)))))
 
 
 (provide 'ses-tests)