Tests, removed ugetext

.travis.yml

@@ -14,7 +14,7 @@ install:
     - pip install nose --use-mirrors
 script:
     - python setup.py build
-    - nosetests --with-coverage --cover-package=cstypo --cover-tests --cover-erase --with-doctest
+    - nosetests --with-coverage --cover-package=ares_util --cover-tests --cover-erase --with-doctest
 after_success:
     - coveralls
 notifications:

ares_util/tests/test.py

@@ -1,9 +1,11 @@
 #!/usr/bin/python
 # coding=utf-8
+import warnings
 
 from unittest2 import TestCase
 import unittest2 as unittest
 from ..ares import call_ares, validate_czech_company_id
+from ..validators import czech_company_id_numeric_validator, czech_company_id_ares_api_validator
 from ..exceptions import InvalidCompanyIDError
 
 
@@ -20,17 +22,28 @@ def test_valid_values(self):
 
 
 class ValidateCzechBusinessIdTestCase(TestCase):
+    invalid_values = [1234567, 12345678, "foo", "abcdefgh"]
+    valid_values = [68407700, 27074358, 27604977, 26168685]
+
     def test_invalid_values(self):
-        with self.assertRaises(InvalidCompanyIDError):
-            validate_czech_company_id(1234567)
-            validate_czech_company_id(12345678)
-            validate_czech_company_id("foo")
+        for invalid_value in self.invalid_values:
+            with self.assertRaises(InvalidCompanyIDError):
+                validate_czech_company_id(invalid_value)
+
+            try:
+                from django.core.exceptions import ValidationError
+
+                with self.assertRaises(ValidationError):
+                    czech_company_id_numeric_validator(invalid_value)
+
+                with self.assertRaises(ValidationError):
+                    czech_company_id_ares_api_validator(invalid_value)
+            except ImportError:
+                warnings.warn("Django is not installed")
 
     def test_valid_values(self):
-        self.assertTrue(validate_czech_company_id(68407700))
-        self.assertTrue(validate_czech_company_id(27074358))
-        self.assertTrue(validate_czech_company_id(27604977))
-        self.assertTrue(validate_czech_company_id(26168685))
+        for valid_value in self.valid_values:
+            self.assertTrue(validate_czech_company_id(valid_value))
 
 
 if __name__ == '__main__':

ares_util/validators.py

@@ -3,7 +3,9 @@
 """This module is designed only for use with Django."""
 
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext as _
+
+# TODO Add support for Django translations
+# from django.utils.translation import ugettext as _
 
 from .ares import call_ares, validate_czech_company_id
 from .exceptions import InvalidCompanyIDError
@@ -18,4 +20,4 @@ def czech_company_id_numeric_validator(business_id):
 
 def czech_company_id_ares_api_validator(business_id):
     if not call_ares(business_id):
-        raise ValidationError(_("Company ID is not registered in ARES."))
+        raise ValidationError("Company ID is not registered in ARES.")