Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 27 additions & 20 deletions src/reqstool/reqstool_config/reqstool_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,44 @@ class Resources:
software_verification_cases: Optional[str] = field(default=None)
manual_verification_results: Optional[str] = field(default=None)
annotations: Optional[str] = field(default=None)
test_results: List[str] = field(default_factory=lambda: [])
test_results: List[str] = field(default=None)


@dataclass
class ReqstoolConfig:
language: str
build: str
resources: Resources
language: Optional[str] = field(default=None)
build: Optional[str] = field(default=None)
resources: Optional[Resources] = field(default_factory=lambda: Resources())

@staticmethod
def _parse(yaml_data: dict) -> "ReqstoolConfig":
if not yaml_data:
return ReqstoolConfig()

r_language = yaml_data.get("language", None)
r_build = yaml_data.get("build", None)

# Parse resources
resources_data = yaml_data["resources"]
r_resources = Resources(
requirements=(resources_data["requirements"] if "requirements" in resources_data else None),
software_verification_cases=(
resources_data["software_verification_cases"]
if "software_verification_cases" in resources_data
else None
),
manual_verification_results=(
resources_data["manual_verification_results"]
if "manual_verification_results" in resources_data
else None
),
annotations=resources_data["annotations"] if "annotations" in resources_data else None,
test_results=resources_data["test_results"] if "test_results" in resources_data else None,
)
resources_data = yaml_data.get("resources", None)

if not resources_data:
r_resources = Resources()
else:
r_resources = Resources(
requirements=(resources_data["requirements"] if "requirements" in resources_data else None),
software_verification_cases=(
resources_data["software_verification_cases"]
if "software_verification_cases" in resources_data
else None
),
manual_verification_results=(
resources_data["manual_verification_results"]
if "manual_verification_results" in resources_data
else None
),
annotations=resources_data["annotations"] if "annotations" in resources_data else None,
test_results=resources_data["test_results"] if "test_results" in resources_data else None,
)

return ReqstoolConfig(
language=r_language,
Expand Down
9 changes: 2 additions & 7 deletions tests/unit/reqstool/reqstool_config/test_reqstool_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ def rc_yaml_index_all() -> dict:
@fixture
def rc_yaml_index_minimal() -> dict:
YAML_STR = """
resources:
annotations: build/reqstool/annotations.yml
test_results:
- build/junit.xml
"""
yaml = YAML(typ="safe")
data = yaml.load(YAML_STR)
Expand Down Expand Up @@ -60,6 +56,5 @@ def test_minimal(rc_yaml_index_minimal):
assert rc.resources.requirements is None
assert rc.resources.software_verification_cases is None
assert rc.resources.manual_verification_results is None
assert rc.resources.annotations == "build/reqstool/annotations.yml"
assert len(rc.resources.test_results) == 1
assert "build/junit.xml" in rc.resources.test_results
assert rc.resources.annotations is None
assert rc.resources.test_results is None