Merge pull request #36 from mbourqui/fix/#35

Fix #35
mbourqui · Aug 9, 2017 · 642628b · 642628b
2 parents 81a8211 + ee9b092
commit 642628b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/echoices/enums.py b/echoices/enums.py
@@ -250,7 +250,7 @@ def __eq__(self, other):
             return self.value == other.value
         try:
             return self.value == self.coerce(other)
-        except TypeError:
+        except (TypeError, ValueError):
             return False
 
     def __ge__(self, other):

diff --git a/echoices/tests/tests.py b/echoices/tests/tests.py
@@ -116,7 +116,8 @@ def test_get(self):
 
     def test_coerce(self):
         self.assertEquals(ETestIntChoices.coerce('1'), 1)
-        # TODO: expand
+        self.assertRaises(TypeError, ETestIntChoices.coerce, None)
+        self.assertRaises(ValueError, ETestIntChoices.coerce, '')
 
     def test_call(self):
         self.assertIs(ETestCharChoices.FIELD1('name'), ETestCharChoices.FIELD1.name)
@@ -233,6 +234,7 @@ def test_orderable(self):
         self.assertFalse(ETestIntOrderedChoices.FIELD2 == 20)
         self.assertFalse(ETestIntOrderedChoices.FIELD2 == '20')
         self.assertFalse(ETestIntOrderedChoices.FIELD2 == None)
+        self.assertFalse(ETestIntOrderedChoices.FIELD2 == '')
         self.assertTrue(ETestStrOrderedChoices.FIELD3 < ETestStrOrderedChoices.FIELD1)
         self.assertTrue(ETestIntOrderedChoices.FIELD3 < ETestIntOrderedChoices.FIELD1)
         self.assertTrue(ETestIntOrderedChoices.FIELD3 < 30)