Fix tests in batch mode

diff --git a/company-tests.el b/company-tests.el
index fc7aec170bc8a6e1b514be942716a89280d1497b..005bf3a544224e7fca03ef6c17de65c15e14545d 100644 (file)
--- a/company-tests.el
+++ b/company-tests.el
@@ -718,35 +718,39 @@
 
 (ert-deftest company-occurrence-prefer-closest-above ()
   (with-temp-buffer
-    (insert "foo0
+    (save-window-excursion
+      (set-window-buffer nil (current-buffer))
+      (insert "foo0
 foo1
 ")
-    (save-excursion
-      (insert "
+      (save-excursion
+        (insert "
 foo3
 foo2"))
-    (let ((company-backend 'company-dabbrev)
-          (company-occurrence-weight-function
-           'company-occurrence-prefer-closest-above))
-      (should (equal '("foo1" "foo0" "foo3" "foo2" "foo4")
-                     (company-sort-by-occurrence
-                      '("foo0" "foo1" "foo2" "foo3" "foo4")))))))
+      (let ((company-backend 'company-dabbrev)
+            (company-occurrence-weight-function
+             'company-occurrence-prefer-closest-above))
+        (should (equal '("foo1" "foo0" "foo3" "foo2" "foo4")
+                       (company-sort-by-occurrence
+                        '("foo0" "foo1" "foo2" "foo3" "foo4"))))))))
 
 (ert-deftest company-occurrence-prefer-any-closest ()
   (with-temp-buffer
-    (insert "foo0
+    (save-window-excursion
+      (set-window-buffer nil (current-buffer))
+      (insert "foo0
 foo1
 ")
-    (save-excursion
-      (insert "
+      (save-excursion
+        (insert "
 foo3
 foo2"))
-    (let ((company-backend 'company-dabbrev)
-          (company-occurrence-weight-function
-           'company-occurrence-prefer-any-closest))
-      (should (equal '("foo1" "foo3" "foo0" "foo2" "foo4")
-                     (company-sort-by-occurrence
-                      '("foo0" "foo1" "foo2" "foo3" "foo4")))))))
+      (let ((company-backend 'company-dabbrev)
+            (company-occurrence-weight-function
+             'company-occurrence-prefer-any-closest))
+        (should (equal '("foo1" "foo3" "foo0" "foo2" "foo4")
+                       (company-sort-by-occurrence
+                        '("foo0" "foo1" "foo2" "foo3" "foo4"))))))))
 
 ;;; Template