Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix test_handle_nan sort error #12

Merged
merged 3 commits into from
May 11, 2023
Merged

Fix test_handle_nan sort error #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b45ede
Fix test_handle_nan sort error
ly-kolena May 10, 2023
71372e1
fix fr test-suite tests
ly-kolena May 11, 2023
6127ab3
fix generic test-suite tests
ly-kolena May 11, 2023
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
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ sphinx-autodoc-typehints = "^1.16.0"
black = { version = "^22.1.0", allow-prereleases = true }
pytest = "^7"
pytest-cov = "^4.0.0"
pytest-depends = "^1.0.1"

[tool.poetry.scripts]
kolena = 'kolena._utils.cli:run'
Expand Down
26 changes: 15 additions & 11 deletions tests/integration/fr/test_test_suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,10 @@ def test__init__with_version(single_test_case) -> None:
assert test_suite.description == new_description
assert test_suite == TestSuite(name, version=test_suite.version)
assert test_suite == TestSuite(name)
assert test_suite0 == TestSuite(name, version=test_suite0.version)
test_suite0_reloaded = TestSuite(name, version=test_suite0.version)
assert test_suite0.baseline_test_cases == test_suite0_reloaded.baseline_test_cases
assert test_suite0.non_baseline_test_cases == test_suite0_reloaded.non_baseline_test_cases
assert test_suite0_reloaded.description == new_description


def test__init__reset(single_test_case, multi_version_test_case) -> None:
Expand Down Expand Up @@ -157,16 +160,17 @@ def test_load(fr_test_suites: List[TestSuite], fr_test_cases: List[TestCase]) ->

def test_load_with_version(fr_test_suites: List[TestSuite], fr_test_cases: List[TestCase]) -> None:
# the test suite is an older version
test_suite = fr_test_suites[0]
loaded_test_suite = TestSuite.load(test_suite.name, version=test_suite.version)
test_suite_prev = fr_test_suites[0]
test_suite_updated = fr_test_suites[1]
loaded_test_suite = TestSuite.load(test_suite_prev.name, version=test_suite_prev.version)

assert loaded_test_suite.data.id == test_suite._id
assert loaded_test_suite.data.name == test_suite.name
assert loaded_test_suite.data.description == test_suite.description
assert loaded_test_suite.data.version == test_suite.version
assert loaded_test_suite._id == test_suite_prev._id
assert loaded_test_suite.name == test_suite_prev.name
assert loaded_test_suite.description == test_suite_updated.description
assert loaded_test_suite.version == test_suite_prev.version

assert loaded_test_suite.data.baseline_test_cases == [fr_test_cases[0].data]
assert loaded_test_suite.data.non_baseline_test_cases == [fr_test_cases[2].data]
assert loaded_test_suite.baseline_test_cases == [fr_test_cases[0]]
assert loaded_test_suite.non_baseline_test_cases == [fr_test_cases[2]]


def test_load_absent(fr_test_suites: List[TestSuite]) -> None:
Expand Down Expand Up @@ -374,12 +378,12 @@ def test__edit__reset(single_test_case, multi_version_test_case) -> None:

with test_suite.edit(reset=True) as editor:
editor.add(multi_version_test_case[1], True)
assert test_suite.version == 3
assert test_suite.version == 2
assert test_suite.description == new_description # not updated or cleared
assert test_suite.baseline_test_cases == [multi_version_test_case[1]]

with test_suite.edit(reset=True) as editor:
editor.add(multi_version_test_case[2], True)
assert test_suite.version == 4
assert test_suite.version == 3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for fixing these. I'll reconcile the not-quite-equivalent changes I've made on #7 in a rebase

assert test_suite.description == new_description # not updated or cleared
assert test_suite.baseline_test_cases == [multi_version_test_case[2]]
4 changes: 2 additions & 2 deletions tests/integration/generic/test_test_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,9 @@ def compute_test_case_metrics(
test_suite = MyTestSuite(f"{name} suite one", test_cases=[test_case])
# use special values in inferences
dummy_inferences = [MyInference(value=value) for value in values]
dummy_inferences_iter = iter(dummy_inferences)

model = MyModel(f"{name} model", infer=lambda _: next(dummy_inferences_iter))
# match inference to test sample
model = MyModel(f"{name} model", infer=lambda sample: dummy_inferences[int(sample.value)])
evaluator = MyEvaluator()
TestRun(model, test_suite, evaluator).run()

Expand Down
8 changes: 6 additions & 2 deletions tests/integration/generic/test_test_suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def test__init__reset(test_case: TestCase, test_case_versions: List[TestCase]) -
assert test_suite.test_cases == new_test_cases


def test__init__with_version() -> None:
def test__init__with_version(test_case_versions: List[TestCase]) -> None:
name = with_test_prefix(f"{__file__}::test__init__with_version test suite")
description = "test suite description"
test_suite = TestSuite(name, description=description)
Expand All @@ -98,11 +98,15 @@ def test__init__with_version() -> None:
with test_suite.edit() as editor:
new_description = "new description"
editor.description(new_description)
editor.add(test_case_versions[0])

assert test_suite.description == new_description
assert test_suite == TestSuite(name, version=test_suite.version)
assert test_suite == TestSuite(name)
assert test_suite0 == TestSuite(name, version=test_suite0.version)

test_suite0_reloaded = TestSuite(name, version=test_suite0.version)
assert test_suite0.test_cases == test_suite0_reloaded.test_cases
assert test_suite0_reloaded.description == new_description


def test__load__mismatching_workflows() -> None:
Expand Down