Skip to content

Commit 4a9d775

Browse files
committed
Resolve Data in TmpDirs
1 parent 79a7ce8 commit 4a9d775

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

tests/unit/core/test_resolution.py

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,38 +29,36 @@
2929
ProjectConfiguration,
3030
ProjectData,
3131
)
32+
from cppython.test.schema import Variant
3233
from cppython.utility.utility import TypeName
3334

3435

3536
class TestResolve:
3637
"""Test resolution of data"""
3738

3839
@staticmethod
39-
def test_pep621_resolve() -> None:
40+
def test_pep621_resolve(project_configuration: Variant[ProjectConfiguration]) -> None:
4041
"""Test the PEP621 schema resolve function"""
4142
data = PEP621Configuration(name='pep621-resolve-test', dynamic=['version'])
42-
config = ProjectConfiguration(pyproject_file=Path('pyproject.toml'), version='0.1.0')
43-
resolved = resolve_pep621(data, config, None)
43+
resolved = resolve_pep621(data, project_configuration.configuration, None)
4444

4545
class_variables = vars(resolved)
4646

4747
assert class_variables
4848
assert None not in class_variables.values()
4949

5050
@staticmethod
51-
def test_project_resolve() -> None:
51+
def test_project_resolve(project_configuration: Variant[ProjectConfiguration]) -> None:
5252
"""Tests project configuration resolution"""
53-
config = ProjectConfiguration(pyproject_file=Path('pyproject.toml'), version='0.1.0')
54-
assert resolve_project_configuration(config)
53+
assert resolve_project_configuration(project_configuration.configuration)
5554

5655
@staticmethod
57-
def test_cppython_resolve() -> None:
56+
def test_cppython_resolve(project_configuration: Variant[ProjectConfiguration]) -> None:
5857
"""Tests cppython configuration resolution"""
5958
cppython_local_configuration = CPPythonLocalConfiguration()
6059
cppython_global_configuration = CPPythonGlobalConfiguration()
6160

62-
config = ProjectConfiguration(pyproject_file=Path('pyproject.toml'), version='0.1.0')
63-
project_data = resolve_project_configuration(config)
61+
project_data = resolve_project_configuration(project_configuration.configuration)
6462

6563
plugin_build_data = PluginCPPythonData(
6664
generator_name=TypeName('generator'), provider_name=TypeName('provider'), scm_name=TypeName('scm')
@@ -93,14 +91,13 @@ class MockModel(CPPythonModel):
9391
resolve_model(MockModel, good_data)
9492

9593
@staticmethod
96-
def test_generator_resolve() -> None:
94+
def test_generator_resolve(project_configuration: Variant[ProjectConfiguration]) -> None:
9795
"""Test generator resolution"""
9896
project_data = ProjectData(pyproject_file=Path('pyproject.toml'))
9997
cppython_local_configuration = CPPythonLocalConfiguration()
10098
cppython_global_configuration = CPPythonGlobalConfiguration()
10199

102-
config = ProjectConfiguration(pyproject_file=Path('pyproject.toml'), version='0.1.0')
103-
project_data = resolve_project_configuration(config)
100+
project_data = resolve_project_configuration(project_configuration.configuration)
104101

105102
plugin_build_data = PluginCPPythonData(
106103
generator_name=TypeName('generator'), provider_name=TypeName('provider'), scm_name=TypeName('scm')
@@ -117,14 +114,13 @@ def test_generator_resolve() -> None:
117114
assert resolve_generator(project_data, cppython_plugin_data)
118115

119116
@staticmethod
120-
def test_provider_resolve() -> None:
117+
def test_provider_resolve(project_configuration: Variant[ProjectConfiguration]) -> None:
121118
"""Test provider resolution"""
122119
project_data = ProjectData(pyproject_file=Path('pyproject.toml'))
123120
cppython_local_configuration = CPPythonLocalConfiguration()
124121
cppython_global_configuration = CPPythonGlobalConfiguration()
125122

126-
config = ProjectConfiguration(pyproject_file=Path('pyproject.toml'), version='0.1.0')
127-
project_data = resolve_project_configuration(config)
123+
project_data = resolve_project_configuration(project_configuration.configuration)
128124

129125
plugin_build_data = PluginCPPythonData(
130126
generator_name=TypeName('generator'), provider_name=TypeName('provider'), scm_name=TypeName('scm')
@@ -141,14 +137,13 @@ def test_provider_resolve() -> None:
141137
assert resolve_provider(project_data, cppython_plugin_data)
142138

143139
@staticmethod
144-
def test_scm_resolve() -> None:
140+
def test_scm_resolve(project_configuration: Variant[ProjectConfiguration]) -> None:
145141
"""Test scm resolution"""
146142
project_data = ProjectData(pyproject_file=Path('pyproject.toml'))
147143
cppython_local_configuration = CPPythonLocalConfiguration()
148144
cppython_global_configuration = CPPythonGlobalConfiguration()
149145

150-
config = ProjectConfiguration(pyproject_file=Path('pyproject.toml'), version='0.1.0')
151-
project_data = resolve_project_configuration(config)
146+
project_data = resolve_project_configuration(project_configuration.configuration)
152147

153148
plugin_build_data = PluginCPPythonData(
154149
generator_name=TypeName('generator'), provider_name=TypeName('provider'), scm_name=TypeName('scm')

0 commit comments

Comments
 (0)