TST Changes assert to pytest style in tests/test_random_projection.py #19846
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thomasjpfan
reviewed
Apr 8, 2021
Comment on lines
60
to
64
| with pytest.raises(ValueError): | ||
| johnson_lindenstrauss_min_dim(100, eps=1.1) | ||
| johnson_lindenstrauss_min_dim(100, eps=0.0) | ||
| johnson_lindenstrauss_min_dim(100, eps=-0.1) | ||
| johnson_lindenstrauss_min_dim(0, eps=0.5) |
There was a problem hiding this comment.
This would only check the first call because it would error first. The other calls to johnson_lindenstrauss_min_dim would not run. Can adjust this test to use pytest.mark.parametrize?:
@pytest.mark.parametrize("n_samples, eps", [
(100, 1.1),
(100, 0.0),
(100, -0.1),
(0, 0.5)
])
def test_invalid_jl_domain(n_samples, eps):
with pytest.raises(ValueError):
johnson_lindenstrauss_min_dim(n_samples, eps=eps)
Comment on lines
68
to
70
| with pytest.raises(ValueError): | ||
| johnson_lindenstrauss_min_dim(3 * [100], eps=2 * [0.9]) | ||
| johnson_lindenstrauss_min_dim(3 * [100], eps=2 * [0.9]) |
There was a problem hiding this comment.
This can use pytest.mark.parametrize as well
thomasjpfan
reviewed
Apr 8, 2021
Comment on lines
83
to
87
| def check_input_size_random_matrix(random_matrix): | ||
| assert_raises(ValueError, random_matrix, 0, 0) | ||
| assert_raises(ValueError, random_matrix, -1, 1) | ||
| assert_raises(ValueError, random_matrix, 1, -1) | ||
| assert_raises(ValueError, random_matrix, 1, 0) | ||
| assert_raises(ValueError, random_matrix, -1, 0) | ||
| @pytest.mark.parametrize("random_matrix", all_random_matrix) | ||
| @pytest.mark.parametrize("n_components, n_features",[(0,0),(-1,1),(1,-1),(1,0),(-1,0)]) | ||
| def test_input_size_random_matrix(random_matrix,n_components,n_features): | ||
| with pytest.raises(ValueError): |
There was a problem hiding this comment.
Sorry, I read this incorrectly and thought it was a test_* function. I think using a for look like check_input_with_sparse_random_matrix would be the more minimal change:
def check_input_size_random_matrix(random_matrix):
inputs = [(0,0), (-1,1), (1,-1), (1,0), (-1,0)]
for n_components, n_features in inputs:
with pytest.raises(ValueError):
random_matrix(n_components, n_features)This way test_basic_property_of_random_matrix does not need to change.
…urtew/scikit-learn into assert_raises_test_random_projection
jeremiedbb
approved these changes
Apr 9, 2021
Comment on lines
71
to
73
| @pytest.mark.parametrize("n_samples, eps", [ | ||
| (3 * [100], 2 * [0.9]), (3 * [100], 2 * [0.9]) | ||
| ]) |
There was a problem hiding this comment.
the 2 sets of parameters are the same. We can remove the parametrization
|
Thanks @LSturtew ! |
thomasjpfan
pushed a commit
to thomasjpfan/scikit-learn
that referenced
this pull request
Apr 19, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reference Issues/PRs
References #14216
What does this implement/fix? Explain your changes.
Changed the
assert_raises,assert_message,assert_warnsin tests/test_random_projection.py topytest.raises()/pytest.warns().Any other comments?