tests: only use should for specific assertions

This improves debuggability of fails, because tests would only show
the part that failed. There's no reason to wrap full code blocks to
`should` because their execution may only exit past `should` if
exception is thrown, which would be caught by `ert` anyway.

Author: Hi-Angel

tests/purescript-sort-imports-tests.el

@@ -21,64 +21,64 @@
 (require 'purescript-sort-imports)
 
 (ert-deftest empty-buffer ()
-  (should (with-temp-buffer
+  (with-temp-buffer
             (purescript-sort-imports)
-            t)))
+            t))
 
 (ert-deftest single-line ()
-  (should (with-temp-buffer
+  (with-temp-buffer
             (insert "import A\n")
             (goto-char (point-min))
             (purescript-sort-imports)
-            (string= (buffer-string)
-                     "import A\n"))))
+            (should (string= (buffer-string)
+                             "import A\n"))))
 
 (ert-deftest two-idem ()
-  (should (with-temp-buffer
+  (with-temp-buffer
             (insert "import A
 import B
 ")
             (goto-char (point-min))
             (purescript-sort-imports)
-            (string= (buffer-string)
-                     "import A
+            (should (string= (buffer-string)
+                                     "import A
 import B
 ")))
-  (should (with-temp-buffer
+  (with-temp-buffer
             (insert "import A (A, B, C)
 import B
 ")
             (goto-char (point-min))
             (purescript-sort-imports)
-            (string= (buffer-string)
-                     "import A (A, B, C)
+            (should (string= (buffer-string)
+                             "import A (A, B, C)
 import B
 ")))
-  (should (with-temp-buffer
+  (with-temp-buffer
             (insert "import A (mtl)
 import B
 ")
             (goto-char (point-min))
             (purescript-sort-imports)
-            (string= (buffer-string)
-                     "import A (mtl)
+            (should (string= (buffer-string)
+                             "import A (mtl)
 import B
 "))))
 
 (ert-deftest two-rev ()
-  (should (with-temp-buffer
+  (with-temp-buffer
             (insert "import B
 import A
 ")
             (goto-char (point-min))
             (purescript-sort-imports)
-            (string= (buffer-string)
-                     "import A
+            (should (string= (buffer-string)
+                             "import A
 import B
 "))))
 
 (ert-deftest file-structure ()
-  (should (with-temp-buffer
+  (with-temp-buffer
             (insert "module A where
 import B
 import A
@@ -87,12 +87,12 @@ import A
             (goto-char (point-min))
             (forward-line 1)
             (purescript-sort-imports)
-            (string= (buffer-string)
-                     "module A where
+            (should (string= (buffer-string)
+                             "module A where
 import A
 import B
 ")))
-  (should (with-temp-buffer
+  (with-temp-buffer
             (insert "module C where
 
 import B
@@ -102,15 +102,15 @@ import A
             (goto-char (point-min))
             (forward-line 2)
             (purescript-sort-imports)
-            (string= (buffer-string)
-                     "module C where
+            (should (string= (buffer-string)
+                             "module C where
 
 import A
 import B
 "))))
 
 (ert-deftest bos-270 ()
-  (should (with-temp-buffer
+  (with-temp-buffer
             (insert "import Data.Aeson.Encode (encode)
 import Data.Aeson.Types
 import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith,
@@ -121,8 +121,8 @@ import Data.ByteString.Lazy as L
 ")
             (goto-char (point-min))
             (purescript-sort-imports)
-            (string= (buffer-string)
-                     "import Data.Aeson.Encode (encode)
+            (should (string= (buffer-string)
+                             "import Data.Aeson.Encode (encode)
 import Data.Aeson.Parser.Internal (decodeWith, decodeStrictWith,
                                    eitherDecodeWith, eitherDecodeStrictWith,
                                    jsonEOF, json, jsonEOF', json')