From 25da8853ea87eacc16a9a1e89f890ae43ce3b3b0 Mon Sep 17 00:00:00 2001 From: jchopard Date: Mon, 26 Feb 2018 01:17:44 +0100 Subject: [PATCH] corrected tests --- setup.py | 2 +- src/pkglts/option/plugin_project/option.py | 6 +- test/test_option/test_appveyor/test_config.py | 32 ++++++---- test/test_option/test_base/test_config.py | 58 +++++++++++-------- test/test_option/test_coverage/test_config.py | 24 +++++--- .../test_option/test_coveralls/test_config.py | 22 +++++-- test/test_option/test_data/test_config.py | 28 ++++++--- test/test_option/test_doc/test_config.py | 51 ++++++++-------- test/test_option/test_flake8/test_config.py | 22 +++++-- test/test_option/test_git/test_config.py | 30 ++++++---- test/test_option/test_github/test_config.py | 30 ++++++---- test/test_option/test_gitlab/test_config.py | 30 ++++++---- .../test_option/test_landscape/test_config.py | 22 +++++-- test/test_option/test_license/test_config.py | 32 ++++++---- test/test_option/test_notebook/test_config.py | 33 +++++++---- .../test_plugin_project/__init__.py | 0 .../test_plugin_project/test_config.py | 37 ++++++++++++ test/test_option/test_pypi/test_config.py | 30 ++++++---- test/test_option/test_pysetup/test_config.py | 34 +++++++---- .../test_readthedocs/test_config.py | 30 ++++++---- test/test_option/test_requires/test_config.py | 22 +++++-- test/test_option/test_sphinx/test_config.py | 35 +++++++---- test/test_option/test_test/test_config.py | 30 ++++++---- test/test_option/test_tox/test_config.py | 22 +++++-- test/test_option/test_travis/test_config.py | 22 +++++-- test/test_option/test_version/test_config.py | 48 +++++++++------ 26 files changed, 494 insertions(+), 238 deletions(-) create mode 100644 test/test_option/test_plugin_project/__init__.py create mode 100644 test/test_option/test_plugin_project/test_config.py diff --git a/setup.py b/setup.py index a4adf8e2..68087af0 100644 --- a/setup.py +++ b/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', diff --git a/src/pkglts/option/plugin_project/option.py b/src/pkglts/option/plugin_project/option.py index cf01bfc7..0e6ea141 100644 --- a/src/pkglts/option/plugin_project/option.py +++ b/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 diff --git a/test/test_option/test_appveyor/test_config.py b/test/test_option/test_appveyor/test_config.py index 0ba8067e..c8daca06 100644 --- a/test/test_option/test_appveyor/test_config.py +++ b/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 diff --git a/test/test_option/test_base/test_config.py b/test/test_option/test_base/test_config.py index 106c7719..d79e434e 100644 --- a/test/test_option/test_base/test_config.py +++ b/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 diff --git a/test/test_option/test_coverage/test_config.py b/test/test_option/test_coverage/test_config.py index e21b615b..3281969a 100644 --- a/test/test_option/test_coverage/test_config.py +++ b/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 diff --git a/test/test_option/test_coveralls/test_config.py b/test/test_option/test_coveralls/test_config.py index 1c757849..06ffbd7e 100644 --- a/test/test_option/test_coveralls/test_config.py +++ b/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 diff --git a/test/test_option/test_data/test_config.py b/test/test_option/test_data/test_config.py index 3844faa0..c7213820 100644 --- a/test/test_option/test_data/test_config.py +++ b/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 diff --git a/test/test_option/test_doc/test_config.py b/test/test_option/test_doc/test_config.py index 2f9a1ef2..060b8754 100644 --- a/test/test_option/test_doc/test_config.py +++ b/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 diff --git a/test/test_option/test_flake8/test_config.py b/test/test_option/test_flake8/test_config.py index 24afe858..77573f06 100644 --- a/test/test_option/test_flake8/test_config.py +++ b/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 diff --git a/test/test_option/test_git/test_config.py b/test/test_option/test_git/test_config.py index b666ed70..3eb3491a 100644 --- a/test/test_option/test_git/test_config.py +++ b/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 diff --git a/test/test_option/test_github/test_config.py b/test/test_option/test_github/test_config.py index 1759834f..639a8de1 100644 --- a/test/test_option/test_github/test_config.py +++ b/test/test_option/test_github/test_config.py @@ -1,22 +1,32 @@ +import pytest from pkglts.config_management import Config -from pkglts.option.github.config import check, require, update_parameters +from pkglts.option.github.option import OptionGithub -def test_update_parameters(): +@pytest.fixture() +def opt(): + return OptionGithub('github') + + +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['github']) == 3 -def test_config_check_project_exists(): +def test_config_check_project_exists(opt): cfg = Config(dict(github={'owner': "", 'project': "", "url": ""})) - assert 'github.project' in check(cfg) + assert 'github.project' in opt.check(cfg) -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 diff --git a/test/test_option/test_gitlab/test_config.py b/test/test_option/test_gitlab/test_config.py index 9833a712..d43b4193 100644 --- a/test/test_option/test_gitlab/test_config.py +++ b/test/test_option/test_gitlab/test_config.py @@ -1,22 +1,32 @@ +import pytest from pkglts.config_management import Config -from pkglts.option.gitlab.config import check, require, update_parameters +from pkglts.option.gitlab.option import OptionGitlab -def test_update_parameters(): +@pytest.fixture() +def opt(): + return OptionGitlab('gitlab') + + +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['gitlab']) == 4 -def test_config_check_project_exists(): +def test_config_check_project_exists(opt): cfg = Config(dict(gitlab={'owner': "", 'project': "", 'server': "", "url": ""})) - assert 'gitlab.project' in check(cfg) + assert 'gitlab.project' in opt.check(cfg) -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 diff --git a/test/test_option/test_landscape/test_config.py b/test/test_option/test_landscape/test_config.py index 9e78a359..9037e5bd 100644 --- a/test/test_option/test_landscape/test_config.py +++ b/test/test_option/test_landscape/test_config.py @@ -1,11 +1,21 @@ +import pytest from pkglts.config_management import Config -from pkglts.option.landscape.config import require +from pkglts.option.landscape.option import OptionLandscape -def test_require(): +@pytest.fixture() +def opt(): + return OptionLandscape('landscape') + + +def test_root_dir_is_defined(opt): + assert opt.root_dir() is not None + + +def test_require(opt): cfg = Config(dict(landscape={})) - 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)) == 4 + assert len(opt.require('setup', cfg)) == 0 + assert len(opt.require('install', cfg)) == 0 + assert len(opt.require('dvlpt', cfg)) == 0 diff --git a/test/test_option/test_license/test_config.py b/test/test_option/test_license/test_config.py index 263e80b0..aa40face 100644 --- a/test/test_option/test_license/test_config.py +++ b/test/test_option/test_license/test_config.py @@ -1,27 +1,37 @@ +import pytest from pkglts.config_management import Config -from pkglts.option.license.config import check, require, update_parameters +from pkglts.option.license.option import OptionLicense -def test_update_parameters(): +@pytest.fixture() +def opt(): + return OptionLicense('license') + + +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['license']) == 4 -def test_config_check_license_name_exists(): +def test_config_check_license_name_exists(opt): cfg = Config(dict(license={'name': "", 'year': 2015, 'organization': "oa", 'project': "project"})) - assert 'license.name' in check(cfg) + assert 'license.name' in opt.check(cfg) cfg = Config(dict(license={'name': "tugudu", 'year': 2015, 'organization': "oa", 'project': "project"})) - assert 'license.name' in check(cfg) + assert 'license.name' in opt.check(cfg) -def test_require(): +def test_require(opt): cfg = Config(dict(license={})) - 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 diff --git a/test/test_option/test_notebook/test_config.py b/test/test_option/test_notebook/test_config.py index 0323a185..69c8f482 100644 --- a/test/test_option/test_notebook/test_config.py +++ b/test/test_option/test_notebook/test_config.py @@ -1,9 +1,14 @@ from os import mkdir, rmdir from os.path import exists -import pytest +import pytest from pkglts.config_management import Config -from pkglts.option.notebook.config import check, require, update_parameters +from pkglts.option.notebook.option import OptionNotebook + + +@pytest.fixture() +def opt(): + return OptionNotebook('notebook') @pytest.fixture() @@ -17,24 +22,28 @@ def tmp_dir(): rmdir(pth) -def test_update_parameters(): +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['notebook']) == 1 -def test_config_check_src_directory(tmp_dir): +def test_config_check_src_directory(opt, tmp_dir): cfg = Config(dict(notebook={'src_directory': "failed_nb"})) - assert 'notebook.src_directory' in check(cfg) + assert 'notebook.src_directory' in opt.check(cfg) cfg = Config(dict(notebook={'src_directory': tmp_dir})) - assert 'notebook.src_directory' not in check(cfg) + assert 'notebook.src_directory' not in opt.check(cfg) -def test_require(): +def test_require(opt): cfg = Config(dict(notebook={})) - 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 diff --git a/test/test_option/test_plugin_project/__init__.py b/test/test_option/test_plugin_project/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/test/test_option/test_plugin_project/test_config.py b/test/test_option/test_plugin_project/test_config.py new file mode 100644 index 00000000..fbe6f270 --- /dev/null +++ b/test/test_option/test_plugin_project/test_config.py @@ -0,0 +1,37 @@ +import pytest +from pkglts.config_management import Config +from pkglts.option.plugin_project.option import OptionPluginProject + + +@pytest.fixture() +def opt(): + return OptionPluginProject('plugin_project') + + +def test_root_dir_is_defined(opt): + assert opt.root_dir() is not None + + +def test_update_parameters(opt): + cfg = {} + opt.update_parameters(cfg) + assert len(cfg['plugin_project']) == 1 + + +def test_config_check_plugin_names(opt): + cfg = Config(dict(plugin_project={'plugin_name': "walou"})) + assert 'plugin_project.plugin_name' not in opt.check(cfg) + + for pkg in ('1mypkg', ' mypkg', '1', '1.mypkg', + ' .mypkg', '.mypkg', 'None.mypkg', 'oa.o.mypkg'): + cfg = Config(dict(plugin_project={'plugin_name': pkg})) + assert 'plugin_project.plugin_name' in opt.check(cfg) + + +def test_require(opt): + cfg = Config(dict(base={})) + + assert len(opt.require('option', cfg)) == 3 + assert len(opt.require('setup', cfg)) == 0 + assert len(opt.require('install', cfg)) == 1 + assert len(opt.require('dvlpt', cfg)) == 0 diff --git a/test/test_option/test_pypi/test_config.py b/test/test_option/test_pypi/test_config.py index 92914b5e..3f243f8e 100644 --- a/test/test_option/test_pypi/test_config.py +++ b/test/test_option/test_pypi/test_config.py @@ -1,22 +1,32 @@ +import pytest from pkglts.config_management import Config -from pkglts.option.pypi.config import check, require, update_parameters +from pkglts.option.pypi.option import OptionPypi -def test_update_parameters(): +@pytest.fixture() +def opt(): + return OptionPypi('pypi') + + +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['pypi']) == 2 -def test_config_check_classifiers_exists(): +def test_config_check_classifiers_exists(opt): cfg = Config(dict(pypi={'classifiers': []})) - assert 'pypi.classifiers' in check(cfg) + assert 'pypi.classifiers' in opt.check(cfg) -def test_require(): +def test_require(opt): cfg = Config(dict(pypi={})) - 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)) == 2 + assert len(opt.require('setup', cfg)) == 0 + assert len(opt.require('install', cfg)) == 0 + assert len(opt.require('dvlpt', cfg)) == 1 diff --git a/test/test_option/test_pysetup/test_config.py b/test/test_option/test_pysetup/test_config.py index 0dd7f9a9..e5604b60 100644 --- a/test/test_option/test_pysetup/test_config.py +++ b/test/test_option/test_pysetup/test_config.py @@ -1,29 +1,39 @@ +import pytest from pkglts.config_management import Config -from pkglts.option.pysetup.config import check, require, update_parameters +from pkglts.option.pysetup.option import OptionPysetup -def test_update_parameters(): +@pytest.fixture() +def opt(): + return OptionPysetup('pysetup') + + +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['pysetup']) == 2 -def test_config_check_intended_version_exists(): +def test_config_check_intended_version_exists(opt): cfg = Config(dict(pysetup={'intended_versions': [], 'require': []})) - assert 'pysetup.intended_versions' in check(cfg) - assert 'pysetup.require' not in check(cfg) + assert 'pysetup.intended_versions' in opt.check(cfg) + assert 'pysetup.require' not in opt.check(cfg) cfg = Config(dict(pysetup={'intended_versions': ["27"], 'require': [{'pkg_mng': 'walou', 'name': 'numpy'}]})) - assert 'pysetup.require' in check(cfg) + assert 'pysetup.require' in opt.check(cfg) -def test_require(): +def test_require(opt): cfg = Config(dict(test={}, pysetup={'intended_versions': ["27"], 'require': []})) - assert len(require('option', cfg)) == 5 - assert len(require('setup', cfg)) == 0 - assert len(require('install', cfg)) == 0 - assert len(require('dvlpt', cfg)) == 0 + assert len(opt.require('option', cfg)) == 5 + assert len(opt.require('setup', cfg)) == 0 + assert len(opt.require('install', cfg)) == 0 + assert len(opt.require('dvlpt', cfg)) == 0 diff --git a/test/test_option/test_readthedocs/test_config.py b/test/test_option/test_readthedocs/test_config.py index adcd8534..a11de5bd 100644 --- a/test/test_option/test_readthedocs/test_config.py +++ b/test/test_option/test_readthedocs/test_config.py @@ -1,22 +1,32 @@ +import pytest from pkglts.config_management import Config -from pkglts.option.readthedocs.config import check, require, update_parameters +from pkglts.option.readthedocs.option import OptionReadthedocs -def test_update_parameters(): +@pytest.fixture() +def opt(): + return OptionReadthedocs('readthedocs') + + +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['readthedocs']) == 1 -def test_config_check_project_exists(): +def test_config_check_project_exists(opt): cfg = Config(dict(readthedocs={'project': ""})) - assert 'readthedocs.project' in check(cfg) + assert 'readthedocs.project' in opt.check(cfg) -def test_require(): +def test_require(opt): cfg = Config(dict(readthedocs={})) - assert len(require('option', cfg)) == 3 - assert len(require('setup', cfg)) == 0 - assert len(require('install', cfg)) == 0 - assert len(require('dvlpt', cfg)) == 0 + assert len(opt.require('option', cfg)) == 4 + assert len(opt.require('setup', cfg)) == 0 + assert len(opt.require('install', cfg)) == 0 + assert len(opt.require('dvlpt', cfg)) == 0 diff --git a/test/test_option/test_requires/test_config.py b/test/test_option/test_requires/test_config.py index ae4abc0b..a9c57673 100644 --- a/test/test_option/test_requires/test_config.py +++ b/test/test_option/test_requires/test_config.py @@ -1,11 +1,21 @@ +import pytest from pkglts.config_management import Config -from pkglts.option.requires.config import require +from pkglts.option.requires.option import OptionRequires -def test_require(): +@pytest.fixture() +def opt(): + return OptionRequires('requires') + + +def test_root_dir_is_defined(opt): + assert opt.root_dir() is not None + + +def test_require(opt): cfg = Config(dict(requires={})) - 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)) == 2 + assert len(opt.require('setup', cfg)) == 0 + assert len(opt.require('install', cfg)) == 0 + assert len(opt.require('dvlpt', cfg)) == 0 diff --git a/test/test_option/test_sphinx/test_config.py b/test/test_option/test_sphinx/test_config.py index 1d19e5b8..82d2dfef 100644 --- a/test/test_option/test_sphinx/test_config.py +++ b/test/test_option/test_sphinx/test_config.py @@ -1,23 +1,38 @@ +import pytest from pkglts.config_management import Config -from pkglts.option.sphinx.config import check, require, update_parameters +from pkglts.option.sphinx.option import OptionSphinx -def test_update_parameters(): +@pytest.fixture() +def opt(): + return OptionSphinx('sphinx') + + +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['sphinx']) == 3 -def test_config_check_sphinx_theme(): +def test_config_checks_doc_fmt(opt): + cfg = Config(dict(doc={'fmt': 'md'}, sphinx={'theme': "default"})) + assert 'doc.fmt' in opt.check(cfg) + + +def test_config_check_sphinx_theme(opt): for theme in (1, None,): cfg = Config(dict(doc={'fmt': 'rst'}, sphinx={'theme': theme})) - assert 'sphinx.theme' in check(cfg) + assert 'sphinx.theme' in opt.check(cfg) -def test_require(): +def test_require(opt): cfg = Config(dict(sphinx={'theme': "default"})) - assert len(require('option', cfg)) == 3 - 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 diff --git a/test/test_option/test_test/test_config.py b/test/test_option/test_test/test_config.py index 8b7b1a2b..c90de866 100644 --- a/test/test_option/test_test/test_config.py +++ b/test/test_option/test_test/test_config.py @@ -1,24 +1,34 @@ +import pytest from pkglts.config_management import Config -from pkglts.option.test.config import check, require, update_parameters +from pkglts.option.test.option import OptionTest -def test_update_parameters(): +@pytest.fixture() +def opt(): + return OptionTest('test') + + +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['test']) == 1 -def test_config_check_suite_names(): +def test_config_check_suite_names(opt): for name in ('walou', ' nose'): cfg = Config(dict(test={'suite_name': name})) - assert 'test.suite_name' in check(cfg) + assert 'test.suite_name' in opt.check(cfg) -def test_require(): +def test_require(opt): for suite_name in ('pytest', 'nose'): cfg = Config(dict(base={}, test={'suite_name': suite_name})) - 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 diff --git a/test/test_option/test_tox/test_config.py b/test/test_option/test_tox/test_config.py index 2f32dff6..e18fcd6b 100644 --- a/test/test_option/test_tox/test_config.py +++ b/test/test_option/test_tox/test_config.py @@ -1,11 +1,21 @@ +import pytest from pkglts.config_management import Config -from pkglts.option.tox.config import require +from pkglts.option.tox.option import OptionTox -def test_require(): +@pytest.fixture() +def opt(): + return OptionTox('tox') + + +def test_root_dir_is_defined(opt): + assert opt.root_dir() is not None + + +def test_require(opt): cfg = Config(dict(base={}, tox={})) - 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 diff --git a/test/test_option/test_travis/test_config.py b/test/test_option/test_travis/test_config.py index ca8e95f3..266efbe7 100644 --- a/test/test_option/test_travis/test_config.py +++ b/test/test_option/test_travis/test_config.py @@ -1,11 +1,21 @@ +import pytest from pkglts.config_management import Config -from pkglts.option.travis.config import require +from pkglts.option.travis.option import OptionTravis -def test_require(): +@pytest.fixture() +def opt(): + return OptionTravis('travis') + + +def test_root_dir_is_defined(opt): + assert opt.root_dir() is not None + + +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 diff --git a/test/test_option/test_version/test_config.py b/test/test_option/test_version/test_config.py index e374d063..c5a0b791 100644 --- a/test/test_option/test_version/test_config.py +++ b/test/test_option/test_version/test_config.py @@ -1,34 +1,44 @@ +import pytest from pkglts.config_management import Config -from pkglts.option.version.config import check, require, update_parameters +from pkglts.option.version.option import OptionVersion -def test_update_parameters(): +@pytest.fixture() +def opt(): + return OptionVersion('version') + + +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['version']) == 3 -def test_config_check_version_numbers_are_valid(): +def test_config_check_version_numbers_are_valid(opt): cfg = Config(dict(version={'major': "", 'minor': "", 'post': ""})) - assert 'version.major' in check(cfg) - assert 'version.minor' in check(cfg) - assert 'version.post' in check(cfg) + assert 'version.major' in opt.check(cfg) + assert 'version.minor' in opt.check(cfg) + assert 'version.post' in opt.check(cfg) cfg = Config(dict(version={'major': "a", 'minor': "a", 'post': "a"})) - assert 'version.major' in check(cfg) - assert 'version.minor' in check(cfg) - assert 'version.post' in check(cfg) + assert 'version.major' in opt.check(cfg) + assert 'version.minor' in opt.check(cfg) + assert 'version.post' in opt.check(cfg) cfg = Config(dict(version={'major': "1", 'minor': "1", 'post': "1"})) - assert 'version.major' in check(cfg) - assert 'version.minor' in check(cfg) - assert 'version.post' in check(cfg) + assert 'version.major' in opt.check(cfg) + assert 'version.minor' in opt.check(cfg) + assert 'version.post' in opt.check(cfg) cfg = Config(dict(version={'major': 1, 'minor': 0, 'post': "2.dev"})) - assert 'version.post' in check(cfg) + assert 'version.post' in opt.check(cfg) -def test_require(): +def test_require(opt): cfg = Config(dict(base={}, version={})) - 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