change tests to go straight to inflect functions. add a few more bc w…

…hy not

tests/test_inflect.py

@@ -1,26 +1,39 @@
 from unittest import TestCase
 
-from textblob import Word
-from textblob.en.inflect import plural_categories
+from textblob.en.inflect import (
+    plural_categories,
+    singular_ie,
+    singular_irregular,
+    singular_uncountable,
+    singular_uninflected,
+    singularize,
+    pluralize
+)
+
 
 class InflectTestCase(TestCase):
 
     def s_singular__pluralize_test(self):
-        lens = Word('lens')
-        self.assertEquals(lens.pluralize(), 'lenses')
+        self.assertEquals(pluralize('lens'), 'lenses')
 
     def s_singular_singularize_test(self):
-        lenses = Word('lenses')
-        self.assertEquals(lenses.singularize(), 'lens')
+        self.assertEquals(singularize('lenses'), 'lens')
 
     def diagnoses_singularize_test(self):
-        diagnoses = Word('diagnoses')
-        self.assertEquals(diagnoses.singularize(), 'diagnosis')
+        self.assertEquals(singularize('diagnoses'), 'diagnosis')
 
     def bus_pluralize_test(self):
-        bus = Word('bus')
-        self.assertEquals(bus.pluralize(), 'buses')
+        self.assertEquals(pluralize('bus'), 'buses')
 
     def test_all_singular_s(self):
         for w in plural_categories['s-singular']:
-            self.assertEquals(Word(w).pluralize().singularize(), w)
+            self.assertEquals(singularize(pluralize(w)), w)
+
+    def test_all_singular_ie(self):
+        for w in singular_ie:
+            self.assertTrue(pluralize(w).endswith('ies'))
+            self.assertEquals(singularize(pluralize(w)), w)
+
+    def test_all_singular_irregular(self):
+        for singular_w in singular_irregular.values():
+            self.assertEquals(singular_irregular[pluralize(singular_w)], singular_w)

textblob/en/inflect.py

@@ -382,6 +382,7 @@ def pluralize(word, pos=NOUN, custom={}, classical=True):
 ]
 singular_s = plural_categories['s-singular']
 
+# key plural, value singular
 singular_irregular = {
             "men": "man",
          "people": "person",