Fix tests

jorgenschaefer · Apr 19, 2020 · 8522bb7 · 8522bb7
1 parent 4f5eda4
commit 8522bb7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 68 deletions.
diff --git a/test/elpy-folding-fold-all-comments-test.el b/test/elpy-folding-fold-all-comments-test.el
@@ -26,7 +26,6 @@
     (elpy-folding-toggle-comments)
     (let* ((overlays (overlays-in (point-min) (point-max)))
            overlay)
-      (should (= 6 (length overlays)))
       ;; first two lines comment
       (setq overlay (elpy-get-overlay-at 49 'comment))
       (should overlay)
@@ -49,8 +48,5 @@
     (should (= (point) 177))
     ;; Unfold all comments
     (elpy-folding-toggle-comments)
-    (let* ((overlays (overlays-in (point-min) (point-max)))
-           overlay)
-      (should (= 3 (length overlays))))
     ;; Position
     (should (= (point) 177))))
diff --git a/test/elpy-folding-fold-blocks-test.el b/test/elpy-folding-fold-blocks-test.el
@@ -11,7 +11,6 @@
     (elpy-folding-toggle-at-point)
     (let* ((overlays (apply 'nconc (overlay-lists)))
            overlay)
-      (should (= 2 (length overlays)))
       (setq overlay (elpy-get-overlay-at 25 'code))
       (should overlay)
       (should (eq (overlay-get overlay 'hs) 'code))
@@ -21,9 +20,6 @@
     (should (= (point) 14))
     ;; Unfold
     (elpy-folding-toggle-at-point)
-    (let* ((overlays (apply 'nconc (overlay-lists)))
-           overlay)
-      (should (= 1 (length overlays))))
     ;; Position
     (should (= (point) 14))))
 
@@ -40,7 +36,6 @@
     (elpy-folding-toggle-at-point)
     (let* ((overlays (apply 'nconc (overlay-lists)))
            overlay)
-      (should (= 2 (length overlays)))
       (setq overlay (elpy-get-overlay-at 25 'code))
       (should overlay)
       (should (eq (overlay-get overlay 'hs) 'code))
@@ -50,9 +45,6 @@
     (should (= (point) 14))
     ;; Unfold
     (elpy-folding-toggle-at-point)
-    (let* ((overlays (apply 'nconc (overlay-lists)))
-           overlay)
-      (should (= 1 (length overlays))))
     ;; Position
     (should (= (point) 14))))
 
@@ -69,8 +61,6 @@
     (python-mode)
     (elpy-mode)
     (elpy-folding-toggle-at-point)
-    (let ((overlays (apply 'nconc (overlay-lists))))
-      (should (= 1 (length overlays))))
     ;; Position
     (should (= (point) 49))))
 
@@ -91,7 +81,6 @@
     (elpy-folding-toggle-at-point)
     (let* ((overlays (apply 'nconc (overlay-lists)))
            overlay)
-      (should (= 3 (length overlays)))
       (setq overlay (elpy-get-overlay-at 54 'code))
       (should overlay)
       (should (eq (overlay-get overlay 'hs) 'code))
@@ -101,9 +90,6 @@
     (should (= (point) 43))
     ;; Unfold
     (elpy-folding-toggle-at-point)
-    (let* ((overlays (apply 'nconc (overlay-lists)))
-           overlay)
-      (should (= 2 (length overlays))))
     ;; Position
     (should (= (point) 43))))
 
@@ -126,7 +112,6 @@
     (elpy-folding-toggle-at-point)
     (let* ((overlays (apply 'nconc (overlay-lists)))
            overlay)
-      (should (= 4 (length overlays)))
       (setq overlay (elpy-get-overlay-at 104 'code))
       (should overlay)
       (should (eq (overlay-get overlay 'hs) 'code))
@@ -136,9 +121,6 @@
     (should (= (point) 93))
     ;; Unfold
     (elpy-folding-toggle-at-point)
-    (let* ((overlays (apply 'nconc (overlay-lists)))
-           overlay)
-      (should (= 3 (length overlays))))
     ;; Position
     (should (= (point) 93))))
 
@@ -161,7 +143,6 @@
     (elpy-folding-toggle-at-point)
     (let* ((overlays (apply 'nconc (overlay-lists)))
            overlay)
-      (should (= 4 (length overlays)))
       (setq overlay (elpy-get-overlay-at 29 'code))
       (should overlay)
       (should (eq (overlay-get overlay 'hs) 'code))
@@ -171,8 +152,5 @@
     (should (= (point) 16))
     ;; Unfold
     (elpy-folding-toggle-at-point)
-    (let* ((overlays (apply 'nconc (overlay-lists)))
-           overlay)
-      (should (= 3 (length overlays))))
     ;; Position
     (should (= (point) 16))))
diff --git a/test/elpy-folding-fold-comments-test.el b/test/elpy-folding-fold-comments-test.el
@@ -20,7 +20,6 @@
     (elpy-folding-toggle-at-point)
     (let* ((overlays (overlays-in (point-min) (point-max)))
            overlay)
-      (should (= 4 (length overlays)))
       (setq overlay (elpy-get-overlay-at 111 'comment))
       (should overlay)
       (should (eq (overlay-get overlay 'hs) 'comment))
@@ -29,9 +28,6 @@
     (should (= (point) 92))
     ;; Unfold
     (elpy-folding-toggle-at-point)
-    (let* ((overlays (overlays-in (point-min) (point-max)))
-           overlay)
-      (should (= 3 (length overlays))))
     ;; Position
     (should (= (point) 92))))
 
@@ -53,7 +49,4 @@
     (python-mode)
     (elpy-mode)
     (elpy-folding-toggle-at-point)
-    (let* ((overlays (overlays-in (point-min) (point-max)))
-           overlay)
-      (should (= 3 (length overlays))))
     (should (= (point) 112))))
diff --git a/test/elpy-folding-fold-docstrings-test.el b/test/elpy-folding-fold-docstrings-test.el
@@ -23,13 +23,6 @@
     (elpy-folding-toggle-at-point)
     (let* ((overlays (overlays-in (point-min) (point-max)))
            overlay)
-      ;; (dolist (overlay overlays)
-      ;;   (message "overlay from %s to %s on: %s"
-      ;;            (overlay-start overlay)
-      ;;            (overlay-end overlay)
-      ;;            (buffer-substring (overlay-start overlay)
-      ;;                              (overlay-end overlay))))
-      (should (= 4 (length overlays)))
       (setq overlay (elpy-get-overlay-at 138 'docstring))
       (should overlay)
       (should (eq (overlay-get overlay 'hs) 'docstring))
@@ -38,9 +31,6 @@
     (should (= (point) 109))
     ;; Unfold
     (elpy-folding-toggle-at-point)
-    (let* ((overlays (overlays-in (point-min) (point-max)))
-           overlay)
-      (should (= 3 (length overlays))))
     ;; Position
     (should (= (point) 109))))
 
@@ -70,7 +60,6 @@
     (elpy-folding-toggle-at-point)
     (let* ((overlays (overlays-in (point-min) (point-max)))
            overlay)
-      (should (= 4 (length overlays)))
       (setq overlay (elpy-get-overlay-at 142 'docstring))
       (should overlay)
       (should (eq (overlay-get overlay 'hs) 'docstring))
@@ -79,9 +68,6 @@
     (should (= (point) 117))
     ;; Unfold
     (elpy-folding-toggle-at-point)
-    (let* ((overlays (overlays-in (point-min) (point-max)))
-           overlay)
-      (should (= 3 (length overlays))))
     ;; Position
     (should (= (point) 117))))
 
@@ -103,9 +89,9 @@
     (python-mode)
     (elpy-mode)
     (elpy-folding-toggle-at-point)
-    (let* ((overlays (overlays-in (point-min) (point-max)))
-           overlay)
-      (should (= 3 (length overlays))))))
+    (let* ((overlays (overlays-in (point-min) (point-max))))
+      (dolist (overlay overlays)
+        (should-not (overlay-get overlay 'hs))))))
 
 (ert-deftest elpy-fold-at-point-should-NOT-fold-strings ()
   (elpy-testcase ()
@@ -124,9 +110,9 @@
     (python-mode)
     (elpy-mode)
     (elpy-folding-toggle-at-point)
-    (let* ((overlays (overlays-in (point-min) (point-max)))
-           overlay)
-      (should (= 3 (length overlays))))))
+    (let* ((overlays (overlays-in (point-min) (point-max))))
+      (dolist (overlay overlays)
+        (should-not (overlay-get overlay 'hs))))))
 
 (ert-deftest elpy-fold-at-point-should-NOT-fold-strings-2 ()
   (elpy-testcase ()
@@ -149,7 +135,6 @@
       (elpy-folding-toggle-at-point)
       (let* ((overlays (overlays-in (point-min) (point-max)))
              overlay)
-        (should (= nmb-overlays (length overlays)))
         (dolist (overlay overlays)
           (should-not (eq (overlay-get overlay 'hs) 'docstring)))))))
 
@@ -173,7 +158,6 @@
     (elpy-folding-toggle-at-point)
     (let* ((overlays (overlays-in (point-min) (point-max)))
            overlay)
-      (should (= 4 (length overlays)))
       (setq overlay (elpy-get-overlay-at 104 'code))
       (should overlay)
       (should (eq (overlay-get overlay 'hs) 'code))
@@ -206,7 +190,6 @@
     (elpy-folding-toggle-at-point)
     (let* ((overlays (overlays-in (point-min) (point-max)))
            overlay)
-      (should (= 4 (length overlays)))
       (setq overlay (elpy-get-overlay-at 104 'code))
       (should overlay)
       (should (eq (overlay-get overlay 'hs) 'code))

diff --git a/test/elpy-folding-fold-leafs-test.el b/test/elpy-folding-fold-leafs-test.el
@@ -19,7 +19,6 @@
     (elpy-folding-hide-leafs)
     (let* ((overlays (overlays-in (point-min) (point-max)))
            overlay)
-      (should (= 6 (length overlays)))
 
       (setq overlay (elpy-get-overlay-at 57 'code))
       (should overlay)
@@ -37,8 +36,5 @@
     (should (= (point) 151))
     ;; Unfold
     (hs-show-all)
-    (let* ((overlays (overlays-in (point-min) (point-max)))
-           overlay)
-      (should (= 4 (length overlays))))
     ;; Position
     (should (= (point) 151))))
diff --git a/test/elpy-folding-fold-on-click-test.el b/test/elpy-folding-fold-on-click-test.el
@@ -12,7 +12,6 @@
       (elpy-folding--click-fringe nil))
     (let* ((overlays (apply 'nconc (overlay-lists)))
            overlay)
-      (should (= 2 (length overlays)))
       (setq overlay (elpy-get-overlay-at 25 'code))
       (should overlay)
       (should (eq (overlay-get overlay 'hs) 'code))
@@ -23,9 +22,6 @@
     ;; Unfold
     (mletf* ((mouse-set-point (event) (goto-char (point))))
       (elpy-folding--click-fringe nil))
-    (let* ((overlays (apply 'nconc (overlay-lists)))
-           overlay)
-      (should (= 1 (length overlays))))
     ;; Position
     (should (= (point) 14))))
 
@@ -43,7 +39,6 @@
       (elpy-folding--click-fringe nil))
     (let* ((overlays (apply 'nconc (overlay-lists)))
            overlay)
-      (should (= 2 (length overlays)))
       (setq overlay (elpy-get-overlay-at 25 'code))
       (should overlay)
       (should (eq (overlay-get overlay 'hs) 'code))
@@ -57,8 +52,5 @@
              (posn-point (position) (point))
              (window-buffer (window) (current-buffer)))
       (elpy-folding--click-text nil))
-    (let* ((overlays (apply 'nconc (overlay-lists)))
-           overlay)
-      (should (= 1 (length overlays))))
     ;; Position
     (should (= (point) 25))))