simplified tests structure

tests/module/loaders/test_file.py → tests/loaders/test_file.py

@@ -6,19 +6,19 @@
 
 import os
 import unittest
-from importlib import import_module
-module = import_module('tabulator.loaders.file')
+
+from tabulator import loaders
 
 
 class TestFile(unittest.TestCase):
 
     # Actions
 
     def setUp(self):
-        basedir = os.path.join(os.path.dirname(__file__), '..', '..', '..')
+        basedir = os.path.join(os.path.dirname(__file__), '..', '..')
         self.source = os.path.join(basedir, 'data', 'table.csv')
         self.encoding = 'utf-8'
-        self.loader = module.FileLoader(self.source, self.encoding)
+        self.loader = loaders.File(self.source, self.encoding)
 
     # Tests
 

tests/module/loaders/test_text.py → tests/loaders/test_text.py

@@ -5,8 +5,8 @@
 from __future__ import unicode_literals
 
 import unittest
-from importlib import import_module
-module = import_module('tabulator.loaders.text')
+
+from tabulator import loaders
 
 
 class TestText(unittest.TestCase):
@@ -16,7 +16,7 @@ class TestText(unittest.TestCase):
     def setUp(self):
         self.source = 'id,name\n1,english\n2,中国人\n'
         self.encoding = 'utf-8'
-        self.loader = module.TextLoader(self.source, self.encoding)
+        self.loader = loaders.Text(self.source, self.encoding)
 
     # Tests
 

tests/module/loaders/test_web.py → tests/loaders/test_web.py

@@ -5,8 +5,8 @@
 from __future__ import unicode_literals
 
 import unittest
-from importlib import import_module
-module = import_module('tabulator.loaders.web')
+
+from tabulator import loaders
 
 
 class TestWeb(unittest.TestCase):
@@ -18,7 +18,7 @@ def setUp(self):
         baseurl += '/okfn/tabulator-py/master/data'
         self.source = baseurl + '/table.csv'
         self.encoding = 'utf-8'
-        self.loader = module.WebLoader(self.source, self.encoding)
+        self.loader = loaders.Web(self.source, self.encoding)
 
     # Tests
 

tests/module/parsers/test_csv.py → tests/parsers/test_csv.py

@@ -8,20 +8,20 @@
 import os
 import unittest
 from mock import Mock
-from importlib import import_module
-module = import_module('tabulator.parsers.csv')
+
+from tabulator import parsers
 
 
 class TestCSV(unittest.TestCase):
 
     # Actions
 
     def setUp(self):
-        basedir = os.path.join(os.path.dirname(__file__), '..', '..', '..')
+        basedir = os.path.join(os.path.dirname(__file__), '..', '..')
         self.source = os.path.join(basedir, 'data', 'table.csv')
         self.loader = Mock()
         self.loader.load = Mock(return_value=io.open(self.source))
-        self.parser = module.CSVParser()
+        self.parser = parsers.CSV()
 
     # Tests
 

tests/module/parsers/test_excel.py → tests/parsers/test_excel.py

@@ -8,20 +8,20 @@
 import os
 import unittest
 from mock import Mock
-from importlib import import_module
-module = import_module('tabulator.parsers.excel')
+
+from tabulator import parsers
 
 
 class TestExcel(unittest.TestCase):
 
     # Actions
 
     def setUp(self):
-        basedir = os.path.join(os.path.dirname(__file__), '..', '..', '..')
+        basedir = os.path.join(os.path.dirname(__file__), '..', '..')
         self.source = os.path.join(basedir, 'data', 'table.xls')
         self.loader = Mock()
         self.loader.load = Mock(return_value=io.open(self.source, 'rb'))
-        self.parser = module.ExcelParser()
+        self.parser = parsers.Excel()
 
     # Tests
 

tests/module/parsers/test_excelx.py → tests/parsers/test_excelx.py

@@ -8,20 +8,20 @@
 import os
 import unittest
 from mock import Mock
-from importlib import import_module
-module = import_module('tabulator.parsers.excelx')
+
+from tabulator import parsers
 
 
 class TestExcelx(unittest.TestCase):
 
     # Actions
 
     def setUp(self):
-        basedir = os.path.join(os.path.dirname(__file__), '..', '..', '..')
+        basedir = os.path.join(os.path.dirname(__file__), '..', '..')
         self.source = os.path.join(basedir, 'data', 'table.xlsx')
         self.loader = Mock()
         self.loader.load = Mock(return_value=io.open(self.source, 'rb'))
-        self.parser = module.ExcelxParser()
+        self.parser = parsers.Excelx()
 
     # Tests
 

tests/module/parsers/test_json.py → tests/parsers/test_json.py

@@ -8,20 +8,20 @@
 import os
 import unittest
 from mock import Mock
-from importlib import import_module
-module = import_module('tabulator.parsers.json')
+
+from tabulator import parsers
 
 
 class TestJSON(unittest.TestCase):
 
     # Actions
 
     def setUp(self):
-        basedir = os.path.join(os.path.dirname(__file__), '..', '..', '..')
+        basedir = os.path.join(os.path.dirname(__file__), '..', '..')
         self.source = os.path.join(basedir, 'data', 'table-dicts.json')
         self.loader = Mock()
         self.loader.load = Mock(return_value=io.open(self.source, 'rb'))
-        self.parser = module.JSONParser()
+        self.parser = parsers.JSON()
 
     # Tests
 

tests/module/processors/test_headers.py → tests/processors/test_headers.py

@@ -5,13 +5,13 @@
 from __future__ import unicode_literals
 
 import unittest
-from importlib import import_module
-module = import_module('tabulator.processors.headers')
+
+from tabulator import processors
 
 
 class TestHeaders(unittest.TestCase):
 
     # Tests
 
     def test(self):
-        self.assertTrue(module.HeadersProcessor)
+        self.assertTrue(processors.Headers)

tests/module/processors/test_schema.py → tests/processors/test_schema.py

@@ -5,13 +5,13 @@
 from __future__ import unicode_literals
 
 import unittest
-from importlib import import_module
-module = import_module('tabulator.processors.schema')
+
+from tabulator import processors
 
 
 class TestSchema(unittest.TestCase):
 
     # Tests
 
     def test(self):
-        self.assertTrue(module.SchemaProcessor)
+        self.assertTrue(processors.Schema)

tests/module/processors/test_strict.py → tests/processors/test_strict.py

@@ -5,13 +5,13 @@
 from __future__ import unicode_literals
 
 import unittest
-from importlib import import_module
-module = import_module('tabulator.processors.strict')
+
+from tabulator import processors
 
 
 class TestStrict(unittest.TestCase):
 
     # Tests
 
     def test(self):
-        self.assertTrue(module.StrictProcessor)
+        self.assertTrue(processors.Strict)

tests/module/test_errors.py → tests/test_errors.py

@@ -5,13 +5,13 @@
 from __future__ import unicode_literals
 
 import unittest
-from importlib import import_module
-module = import_module('tabulator.errors')
+
+from tabulator import errors
 
 
 class Test_errors(unittest.TestCase):
 
     # Tests
 
     def test(self):
-        self.assertTrue(issubclass(module.Error, Exception))
+        self.assertTrue(issubclass(errors.Error, Exception))