Refactoring

* drop unnecessary string-match
* add test cases to make string-match test sensitive
* slightly rearrange some tests assertions to make them more intuitive
  * (should (equal nil ...)) → (should-not ...)
  * (should-not (equal nil ...)) → (should ...)

Author: johannes-mueller

string-inflection.el

@@ -390,7 +390,7 @@ selected. If include `:', select `FOO::VERSION' to run
   "if FooBar => t"
   (let ((case-fold-search nil))
     (and
-     (string-match "[[:lower:]]" str)  ;; no test actually requires this
+     (string-match "[[:lower:]]" str)
      (string-match "\\`[[:upper:]][[:lower:][:upper:][:digit:]]+\\'" str))))
 
 (fset 'string-inflection-upper-camelcase-p 'string-inflection-pascal-case-p)
@@ -412,7 +412,6 @@ selected. If include `:', select `FOO::VERSION' to run
   "if Foo_Bar => t"
   (let ((case-fold-search nil))
     (and
-     (string-match "[[:upper:]]" str)  ;; no test actually requires this
      (string-match "_" str)
      (string-match "\\`[[:upper:]][[:lower:][:upper:][:digit:]_]+\\'" str))))
 

test/string-inflection-test.el

@@ -110,42 +110,44 @@
 ;; --------------------------------------------------------------------------------
 
 (ert-deftest test-word-p ()
-  (should-not (equal nil (string-inflection-word-p "foo")))
-  (should-not (equal nil (string-inflection-word-p "eĥo")))
-  (should (equal nil (string-inflection-word-p "foo_bar")))
-  (should (equal nil (string-inflection-word-p "eĥo_ŝanĝo"))))
+  (should (string-inflection-word-p "foo"))
+  (should (string-inflection-word-p "eĥo"))
+  (should-not (string-inflection-word-p "foo_bar"))
+  (should-not (string-inflection-word-p "eĥo_ŝanĝo")))
 
 (ert-deftest test-underscore-p ()
-  (should-not (equal nil (string-inflection-underscore-p "foo")))
-  (should-not (equal nil (string-inflection-underscore-p "eĥo")))
-  (should-not (equal nil (string-inflection-underscore-p "foo_bar")))
-  (should-not (equal nil (string-inflection-underscore-p "eĥo_ŝanĝo"))))
+  (should (string-inflection-underscore-p "foo"))
+  (should (string-inflection-underscore-p "eĥo"))
+  (should (string-inflection-underscore-p "foo_bar"))
+  (should (string-inflection-underscore-p "eĥo_ŝanĝo")))
 
 (ert-deftest test-pascal-case-p ()
-  (should-not (equal nil (string-inflection-pascal-case-p "Foo")))
-  (should-not (equal nil (string-inflection-pascal-case-p "Eĥo")))
-  (should-not (equal nil (string-inflection-pascal-case-p "FooBar")))
-  (should-not (equal nil (string-inflection-pascal-case-p "EĥoŜanĝo"))))
+  (should (string-inflection-pascal-case-p "Foo"))
+  (should (string-inflection-pascal-case-p "Eĥo"))
+  (should (string-inflection-pascal-case-p "FooBar"))
+  (should (string-inflection-pascal-case-p "EĥoŜanĝo"))
+  (should-not (string-inflection-pascal-case-p "FOO"))
+  (should (string-inflection-pascal-case-p "Eĥĥ")))
 
 (ert-deftest test-camelcase-p ()
-  (should (equal nil (string-inflection-camelcase-p "foo")))
-  (should (equal nil (string-inflection-camelcase-p "eĥo")))
-  (should-not (equal nil (string-inflection-camelcase-p "fooBar")))
-  (should-not (equal nil (string-inflection-camelcase-p "eĥoŜanĝo"))))
+  (should-not (string-inflection-camelcase-p "foo"))
+  (should-not (string-inflection-camelcase-p "eĥo"))
+  (should (string-inflection-camelcase-p "fooBar"))
+  (should (string-inflection-camelcase-p "eĥoŜanĝo")))
 
 (ert-deftest test-lower-upcase-p ()
-  (should-not (equal nil (string-inflection-upcase-p "FOO")))
-  (should-not (equal nil (string-inflection-upcase-p "EĤO")))
-  (should-not (equal nil (string-inflection-upcase-p "FOO_BAR")))
-  (should-not (equal nil (string-inflection-upcase-p "EĤO_ŜANĜO"))))
+  (should (string-inflection-upcase-p "FOO"))
+  (should (string-inflection-upcase-p "EĤO"))
+  (should (string-inflection-upcase-p "FOO_BAR"))
+  (should (string-inflection-upcase-p "EĤO_ŜANĜO")))
 
 (ert-deftest test-kebab-case-p ()
-  (should-not (equal nil (string-inflection-kebab-case-p "foo-bar")))
-  (should-not (equal nil (string-inflection-kebab-case-p "eĥo-ŝanĝo"))))
+  (should (string-inflection-kebab-case-p "foo-bar"))
+  (should (string-inflection-kebab-case-p "eĥo-ŝanĝo")))
 
 (ert-deftest test-capital-underscore-p ()
-  (should-not (equal nil (string-inflection-capital-underscore-p "Foo_Bar")))
-  (should-not (equal nil (string-inflection-capital-underscore-p "Eĥo_Ŝanĝo"))))
+  (should (string-inflection-capital-underscore-p "Foo_Bar"))
+  (should (string-inflection-capital-underscore-p "Eĥo_Ŝanĝo")))
 
 ;; -------------------------------------------------------------------------------- Target word of cursor position