corrected tests

setup.py

@@ -104,7 +104,7 @@
     'landscape = pkglts.option.landscape.option:OptionLandscape',
     'license = pkglts.option.license.option:OptionLicense',
     'notebook = pkglts.option.notebook.option:OptionNotebook',
-    'plugin_project = pkglts.option.plugin_project.option:OptionPlugin',
+    'plugin_project = pkglts.option.plugin_project.option:OptionPluginProject',
     'pypi = pkglts.option.pypi.option:OptionPypi',
     'pysetup = pkglts.option.pysetup.option:OptionPysetup',
     'readthedocs = pkglts.option.readthedocs.option:OptionReadthedocs',

src/pkglts/option/plugin_project/option.py

@@ -15,7 +15,7 @@ def is_valid_identifier(name):
         return False
 
 
-class OptionTest(Option):
+class OptionPluginProject(Option):
     def root_dir(self):
         return dirname(__file__)
 
@@ -29,9 +29,9 @@ def check(self, cfg):
         plugin_name = cfg['plugin_project']['plugin_name']
 
         if "." in plugin_name:
-            invalids.append('plugin.plugin_name')
+            invalids.append('plugin_project.plugin_name')
         elif not is_valid_identifier(plugin_name):
-            invalids.append('plugin.plugin_name')
+            invalids.append('plugin_project.plugin_name')
 
         return invalids
 

test/test_option/test_appveyor/test_config.py

@@ -1,22 +1,32 @@
+import pytest
 from pkglts.config_management import Config
-from pkglts.option.appveyor.config import check, require, update_parameters
+from pkglts.option.appveyor.option import OptionAppveyor
 
 
-def test_update_parameters():
+@pytest.fixture()
+def opt():
+    return OptionAppveyor('appveyor')
+
+
+def test_root_dir_is_defined(opt):
+    assert opt.root_dir() is not None
+
+
+def test_update_parameters(opt):
     cfg = {}
-    update_parameters(cfg)
+    opt.update_parameters(cfg)
     assert len(cfg['appveyor']) == 1
 
 
-def test_config_does_nothing():
+def test_config_does_nothing(opt):
     cfg = Config(dict(appveyor={'token': 'toto'}))
-    assert len(check(cfg)) == 0
+    assert len(opt.check(cfg)) == 0
 
 
-def test_require():
+def test_require(opt):
     cfg = Config(dict(base={}, travis={}))
-    
-    assert len(require('option', cfg)) == 2
-    assert len(require('setup', cfg)) == 0
-    assert len(require('install', cfg)) == 0
-    assert len(require('dvlpt', cfg)) == 0
+
+    assert len(opt.require('option', cfg)) == 3
+    assert len(opt.require('setup', cfg)) == 0
+    assert len(opt.require('install', cfg)) == 0
+    assert len(opt.require('dvlpt', cfg)) == 0

test/test_option/test_base/test_config.py

@@ -1,41 +1,51 @@
+import pytest
 from pkglts.config_management import Config
-from pkglts.option.base.config import check, require, update_parameters
+from pkglts.option.base.option import OptionBase
 
 
-def test_update_parameters():
+@pytest.fixture()
+def opt():
+    return OptionBase('base')
+
+
+def test_root_dir_is_defined(opt):
+    assert opt.root_dir() is not None
+
+
+def test_update_parameters(opt):
     cfg = {}
-    update_parameters(cfg)
+    opt.update_parameters(cfg)
     assert len(cfg['base']) == 5
 
 
-def test_config_check_pkg_names():
+def test_config_check_pkg_names(opt):
     for pkg in ('1mypkg', ' mypkg', '1', '1.mypkg',
                 ' .mypkg', '.mypkg', 'None.mypkg', 'oa.o.mypkg'):
         cfg = Config(dict(base={'pkgname': pkg,
-                                    'namespace': None,
-                                    'namespace_method': "pkg_util",
-                                    'owner': 'moi',
-                                    'url': None}))
-        assert 'base.pkgname' in check(cfg)
-        cfg = Config(dict(base={'pkgname': 'toto',
-                                    'namespace': pkg,
-                                    'namespace_method': "pkg_util",
-                                    'owner': 'moi',
-                                    'url': None}))
-        assert 'base.namespace' in check(cfg)
-
-    cfg = Config(dict(base={'pkgname': 'toto',
                                 'namespace': None,
-                                'namespace_method': "toto",
+                                'namespace_method': "pkg_util",
+                                'owner': 'moi',
+                                'url': None}))
+        assert 'base.pkgname' in opt.check(cfg)
+        cfg = Config(dict(base={'pkgname': 'toto',
+                                'namespace': pkg,
+                                'namespace_method': "pkg_util",
                                 'owner': 'moi',
                                 'url': None}))
-    assert 'base.namespace_method' in check(cfg)
+        assert 'base.namespace' in opt.check(cfg)
+
+    cfg = Config(dict(base={'pkgname': 'toto',
+                            'namespace': None,
+                            'namespace_method': "toto",
+                            'owner': 'moi',
+                            'url': None}))
+    assert 'base.namespace_method' in opt.check(cfg)
 
 
-def test_require():
+def test_require(opt):
     cfg = Config(dict(base={}))
 
-    assert len(require('option', cfg)) == 0
-    assert len(require('setup', cfg)) == 0
-    assert len(require('install', cfg)) == 0
-    assert len(require('dvlpt', cfg)) == 0
+    assert len(opt.require('option', cfg)) == 0
+    assert len(opt.require('setup', cfg)) == 0
+    assert len(opt.require('install', cfg)) == 0
+    assert len(opt.require('dvlpt', cfg)) == 0

test/test_option/test_coverage/test_config.py

@@ -1,14 +1,24 @@
+import pytest
 from pkglts.config_management import Config
-from pkglts.option.coverage.config import require
+from pkglts.option.coverage.option import OptionCoverage
 
 
-def test_require():
+@pytest.fixture()
+def opt():
+    return OptionCoverage('coverage')
+
+
+def test_root_dir_is_defined(opt):
+    assert opt.root_dir() is not None
+
+
+def test_require(opt):
     cfg = Config(dict(coverage={}, test={'suite_name': 'pytest'}))
 
-    assert len(require('option', cfg)) == 1
-    assert len(require('setup', cfg)) == 0
-    assert len(require('install', cfg)) == 0
-    assert len(require('dvlpt', cfg)) == 2
+    assert len(opt.require('option', cfg)) == 1
+    assert len(opt.require('setup', cfg)) == 0
+    assert len(opt.require('install', cfg)) == 0
+    assert len(opt.require('dvlpt', cfg)) == 2
 
     cfg = Config(dict(coverage={}, test={'suite_name': 'nose'}))
-    assert len(require('dvlpt', cfg)) == 1
+    assert len(opt.require('dvlpt', cfg)) == 1

test/test_option/test_coveralls/test_config.py

@@ -1,11 +1,21 @@
+import pytest
 from pkglts.config_management import Config
-from pkglts.option.coveralls.config import require
+from pkglts.option.coveralls.option import OptionCoveralls
 
 
-def test_require():
+@pytest.fixture()
+def opt():
+    return OptionCoveralls('coveralls')
+
+
+def test_root_dir_is_defined(opt):
+    assert opt.root_dir() is not None
+
+
+def test_require(opt):
     cfg = Config(dict(coveralls={}))
 
-    assert len(require('option', cfg)) == 2
-    assert len(require('setup', cfg)) == 0
-    assert len(require('install', cfg)) == 0
-    assert len(require('dvlpt', cfg)) == 1
+    assert len(opt.require('option', cfg)) == 3
+    assert len(opt.require('setup', cfg)) == 0
+    assert len(opt.require('install', cfg)) == 0
+    assert len(opt.require('dvlpt', cfg)) == 1

test/test_option/test_data/test_config.py

@@ -1,17 +1,27 @@
+import pytest
 from pkglts.config_management import Config
-from pkglts.option.data.config import require, update_parameters
+from pkglts.option.data.option import OptionData
 
 
-def test_update_parameters():
+@pytest.fixture()
+def opt():
+    return OptionData('data')
+
+
+def test_root_dir_is_defined(opt):
+    assert opt.root_dir() is not None
+
+
+def test_update_parameters(opt):
     cfg = {}
-    update_parameters(cfg)
+    opt.update_parameters(cfg)
     assert len(cfg['data']) == 2
 
 
-def test_require():
+def test_require(opt):
     cfg = Config(dict(base={}, data={}))
-    
-    assert len(require('option', cfg)) == 1
-    assert len(require('setup', cfg)) == 0
-    assert len(require('install', cfg)) == 0
-    assert len(require('dvlpt', cfg)) == 0
+
+    assert len(opt.require('option', cfg)) == 1
+    assert len(opt.require('setup', cfg)) == 0
+    assert len(opt.require('install', cfg)) == 0
+    assert len(opt.require('dvlpt', cfg)) == 0

test/test_option/test_doc/test_config.py

@@ -1,47 +1,52 @@
+import pytest
 from pkglts.config_management import Config
-from pkglts.option.doc.config import check, require, update_parameters
+from pkglts.option.doc.option import OptionDoc
 
 
-def test_update_parameters():
+@pytest.fixture()
+def opt():
+    return OptionDoc('doc')
+
+
+def test_root_dir_is_defined(opt):
+    assert opt.root_dir() is not None
+
+
+def test_update_parameters(opt):
     cfg = {}
-    update_parameters(cfg)
+    opt.update_parameters(cfg)
     assert len(cfg['doc']) == 3
 
 
-def test_config_check_description_exists():
+def test_config_check_description_exists(opt):
     cfg = Config(dict(doc={'description': "mydescr", 'fmt': 'rst', 'keywords': []}))
     assert cfg['doc']['description'] == "mydescr"
-    assert 'doc.description' not in check(cfg)
+    assert 'doc.description' not in opt.check(cfg)
 
 
-def test_config_check_description_valid():
+def test_config_check_description_valid(opt):
     cfg = Config(dict(doc={'description': "", 'fmt': 'rst', 'keywords': []}))
-    assert 'doc.description' in check(cfg)
+    assert 'doc.description' in opt.check(cfg)
 
 
-def test_config_check_keywords_exists():
+def test_config_check_keywords_exists(opt):
     cfg = Config(dict(doc={'description': "mydescr", 'fmt': 'rst', 'keywords': []}))
     assert len(cfg['doc']['keywords']) == 0
-    assert 'doc.keywords' not in check(cfg)
+    assert 'doc.keywords' not in opt.check(cfg)
 
 
-def test_config_check_fmt_valid():
+def test_config_check_fmt_valid(opt):
     cfg = Config(dict(doc={'description': "mydescr", 'fmt': 'walou', 'keywords': []}))
-    assert 'doc.fmt' in check(cfg)
+    assert 'doc.fmt' in opt.check(cfg)
 
 
-def test_config_check_fmt_valid():
-    cfg = Config(dict(doc={'description': "mydescr", 'fmt': 'walou', 'keywords': []}))
-    assert 'doc.fmt' in check(cfg)
-
-
-def test_require():
+def test_require(opt):
     cfg = Config(dict(base={}, doc={'fmt': 'rst'}))
-    
-    assert len(require('option', cfg)) == 1
-    assert len(require('setup', cfg)) == 0
-    assert len(require('install', cfg)) == 0
-    assert len(require('dvlpt', cfg)) == 0
+
+    assert len(opt.require('option', cfg)) == 1
+    assert len(opt.require('setup', cfg)) == 0
+    assert len(opt.require('install', cfg)) == 0
+    assert len(opt.require('dvlpt', cfg)) == 0
 
     cfg = Config(dict(base={}, doc={'fmt': 'md'}))
-    assert len(require('dvlpt', cfg)) == 1
+    assert len(opt.require('dvlpt', cfg)) == 1

test/test_option/test_flake8/test_config.py

@@ -1,11 +1,21 @@
+import pytest
 from pkglts.config_management import Config
-from pkglts.option.flake8.config import require
+from pkglts.option.flake8.option import OptionFlake8
 
 
-def test_require():
+@pytest.fixture()
+def opt():
+    return OptionFlake8('flake8')
+
+
+def test_root_dir_is_defined(opt):
+    assert opt.root_dir() is not None
+
+
+def test_require(opt):
     cfg = Config(dict(base={}, flake8={}))
 
-    assert len(require('option', cfg)) == 1
-    assert len(require('setup', cfg)) == 0
-    assert len(require('install', cfg)) == 0
-    assert len(require('dvlpt', cfg)) == 1
+    assert len(opt.require('option', cfg)) == 1
+    assert len(opt.require('setup', cfg)) == 0
+    assert len(opt.require('install', cfg)) == 0
+    assert len(opt.require('dvlpt', cfg)) == 1

test/test_option/test_git/test_config.py

@@ -1,22 +1,32 @@
+import pytest
 from pkglts.config_management import Config
-from pkglts.option.git.config import check, require, update_parameters
+from pkglts.option.git.option import OptionGit
 
 
-def test_update_parameters():
+@pytest.fixture()
+def opt():
+    return OptionGit('git')
+
+
+def test_root_dir_is_defined(opt):
+    assert opt.root_dir() is not None
+
+
+def test_update_parameters(opt):
     cfg = {}
-    update_parameters(cfg)
+    opt.update_parameters(cfg)
     assert len(cfg['git']) == 0
 
 
-def test_config_check_nothing():
+def test_config_check_nothing(opt):
     cfg = Config(dict(git={}))
-    assert len(check(cfg)) == 0
+    assert len(opt.check(cfg)) == 0
 
 
-def test_require():
+def test_require(opt):
     cfg = Config(dict(base={}, data={}))
 
-    assert len(require('option', cfg)) == 1
-    assert len(require('setup', cfg)) == 0
-    assert len(require('install', cfg)) == 0
-    assert len(require('dvlpt', cfg)) == 0
+    assert len(opt.require('option', cfg)) == 1
+    assert len(opt.require('setup', cfg)) == 0
+    assert len(opt.require('install', cfg)) == 0
+    assert len(opt.require('dvlpt', cfg)) == 0