Merge branch 'develop' into feature/tox-with-coverage

4 files changed, 31 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 0120dbd..5781881 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,7 @@ PACKAGE_NAME = prettytable
 all: coverage
 
 test:
-	@nosetests
-	@nosetests --with-coverage --cover-min-percentage=$(COVER_PERC)
+	@nosetests --with-coverage --cover-package=$(PACKAGE_NAME) --cover-min-percentage=$(COVER_PERC)
 
 clean: clean-pyc clean-build clean-cover
 
@@ -27,7 +26,7 @@ clean-cover:
 coverage: #clean-cover
 	@nosetests --with-coverage --cover-package=$(PACKAGE_NAME) --cover-html --cover-html-dir=$(COVERAGE_DIR)
 
-opencover: test
+opencover: coverage
 	@open $(COVERAGE_DIR)/index.html
 
 make-docs:
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/__init__.py
diff --git a/tests/test_utils.py b/tests/test_utils.py
new file mode 100644
index 0000000..6ed710b
--- /dev/null
+++ b/tests/test_utils.py
@@ -0,0 +1,29 @@
+# -*- coding:utf-8 -*-
+from __future__ import unicode_literals
+import unittest
+
+from prettytable.prettytable import _char_block_width
+
+
+
+def _width_test_factory(width, words):
+    def _(self):
+        map(lambda x: self.assertEqual(width, _char_block_width(ord(x))),
+            list(words))
+    return _
+
+
+class CharBlockWidthTest(unittest.TestCase):
+    fixtures = {
+        'normal': (1, '12345qwerljk/.,WESD'),
+        'chs': (2, '石室诗士施氏嗜狮誓食十狮'),
+        'jp': (2, 'はじめまして'),
+        'hangul': (2, '우리글자언문청'),
+        'full_width_latin': (2, 'ＸＹＺ［＼］＾＿ｘｙｚ｛｜｝～｟'),
+        # 'cjk': (2, u''),
+    }
+
+    def test_fixtures(self):
+        for name in self.fixtures:
+            _width_test_factory(*self.fixtures[name])(self)
+
diff --git a/tox.ini b/tox.ini
index 377842a..18e40f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,4 +5,3 @@ envlist = py27,py3
 deps = nose
        coverage
 commands = make test
-