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.

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

New conjunct_expecation_linter #948

Merged
merged 28 commits into from
Mar 21, 2022
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
66f0ed6
New expect_true_false_and_condition_linter
MichaelChirico Mar 16, 2022
3a86858
Merge branch 'master' into expect_true_false_and_condition
MichaelChirico Mar 16, 2022
a5f91e7
dedup NEWS
MichaelChirico Mar 16, 2022
b61cf27
Merge branch 'master' into expect_true_false_and_condition
MichaelChirico Mar 17, 2022
0378533
rename to conjunct_expectation_linter
MichaelChirico Mar 17, 2022
4a27969
NEWS
MichaelChirico Mar 17, 2022
ae39734
Merge branch 'master' into expect_true_false_and_condition
MichaelChirico Mar 17, 2022
6b61f41
Merge branch 'master' into expect_true_false_and_condition
MichaelChirico Mar 17, 2022
abb9343
Merge branch 'expect_true_false_and_condition' of github.com:r-lib/li…
MichaelChirico Mar 17, 2022
3a48d64
decruft
MichaelChirico Mar 17, 2022
ee2d858
Merge branch 'master' into expect_true_false_and_condition
MichaelChirico Mar 18, 2022
c12e3e7
Merge branch 'master' into expect_true_false_and_condition
MichaelChirico Mar 19, 2022
9a5f0bb
correct logic error re: expect_false(); NEWS
MichaelChirico Mar 19, 2022
caa1f32
Merge branch 'expect_true_false_and_condition' of github.com:r-lib/li…
MichaelChirico Mar 19, 2022
aef39c1
Merge branch 'master' into expect_true_false_and_condition
MichaelChirico Mar 19, 2022
3b34676
NEWS typo
MichaelChirico Mar 20, 2022
edd858a
fix terminology
MichaelChirico Mar 20, 2022
ab5d74c
extend tests
MichaelChirico Mar 20, 2022
3871da6
Merge branch 'expect_true_false_and_condition' of github.com:r-lib/li…
MichaelChirico Mar 20, 2022
6a593e7
Merge branch 'master' into expect_true_false_and_condition
MichaelChirico Mar 20, 2022
2203451
<- not =
MichaelChirico Mar 21, 2022
4206994
add operator precedence tests
MichaelChirico Mar 21, 2022
a9ee374
Merge branch 'expect_true_false_and_condition' of github.com:r-lib/li…
MichaelChirico Mar 21, 2022
977cfb2
Merge branch 'master' into expect_true_false_and_condition
MichaelChirico Mar 21, 2022
bcc1d41
use new xml_nodes_to_lint
MichaelChirico Mar 21, 2022
2865a88
re-document
MichaelChirico Mar 21, 2022
baf7ed7
Merge branch 'master' into expect_true_false_and_condition
AshesITR Mar 21, 2022
295a390
Merge branch 'master' of github.com:r-lib/lintr into expect_true_fals…
MichaelChirico Mar 21, 2022
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 DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Collate:
'commas_linter.R'
'comment_linters.R'
'comments.R'
'conjunct_expectation_linter.R'
'cyclocomp_linter.R'
'declared_functions.R'
'deprecated.R'
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export(clear_cache)
export(closed_curly_linter)
export(commas_linter)
export(commented_code_linter)
export(conjunct_expectation_linter)
export(cyclocomp_linter)
export(default_linters)
export(default_settings)
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ function calls. (#850, #851, @renkun-ken)
+ `expect_type_linter()` Require usage of `expect_type(x, t)` over `expect_equal(typeof(x), t)` and similar
+ `expect_s3_class_linter()` Require usage of `expect_s3_class(x, k)` over `expect_equal(class(x), k)` and similar
+ `expect_s4_class_linter()` Require usage of `expect_s4_class(x, k)` over `expect_true(methods::is(x, k))`
+ `conjunct_expectation_linter()` Require usage of `expect_true(x); expect_true(y)` over `expect_equal(x && y)` and similar
MichaelChirico marked this conversation as resolved.
Show resolved Hide resolved
+ `expect_not_linter()` Require usage of `expect_false(x)` over `expect_true(!x)`, and _vice versa_.
+ `expect_true_false_linter()` Require usage of `expect_true(x)` over `expect_equal(x, TRUE)` and similar
+ `expect_named_linter()` Require usage of `expect_named(x, n)` over `expect_equal(names(x), n)` and similar
Expand Down
42 changes: 42 additions & 0 deletions R/conjunct_expectation_linter.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#' Force && conditions in expect_true(), expect_false() to be written separately
#'
#' For readability of test outputs, testing only one thing per call to
#' [testthat::expect_true()] is preferable, i.e.,
#' `expect_true(A); expect_true(B)` is better than `expect_true(A && B)`, and
#' `expect_false(A); expect_false(B)` is better than `expect_false(A || B)`.
#'
#' @evalRd rd_tags("expect_true_false_and_condition_linter")
#' @seealso [linters] for a complete list of linters available in lintr.
#' @export
conjunct_expectation_linter <- function() {
Linter(function(source_file) {
# need the full file to also catch usages at the top level
if (length(source_file$full_parsed_content) == 0L) {
return(list())
}

xml <- source_file$full_xml_parsed_content

xpath <- "//expr[
(
expr[SYMBOL_FUNCTION_CALL[text() = 'expect_true']]
and expr[2][AND2]
) or (
expr[SYMBOL_FUNCTION_CALL[text() = 'expect_false']]
and expr[2][OR2]
)
]"

bad_expr <- xml2::xml_find_all(xml, xpath)

return(lapply(bad_expr, gen_conjunct_expectation_lint, source_file))
})
}

gen_conjunct_expectation_lint <- function(expr, source_file) {
matched_fun <- xml2::xml_text(xml2::xml_find_first(expr, "expr/SYMBOL_FUNCTION_CALL"))
op = if (matched_fun == "expect_true") "&&" else "||"
MichaelChirico marked this conversation as resolved.
Show resolved Hide resolved
message <- sprintf("Instead of %1$s(A %2$s B), write multiple unit tests like %1$s(A) and %1$s(B)", matched_fun, op)
MichaelChirico marked this conversation as resolved.
Show resolved Hide resolved
message <- paste(message, "The latter will produce better error messages in the case of failure.")
xml_nodes_to_lint(expr, source_file, message, type = "warning", global = TRUE)
}
1 change: 1 addition & 0 deletions inst/lintr/linters.csv
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ backport_linter,robustness configurable package_development
closed_curly_linter,style readability default configurable
commas_linter,style readability default
commented_code_linter,style readability best_practices default
conjunct_expectation_linter,package_development best_practices readability
cyclocomp_linter,style readability best_practices default configurable
duplicate_argument_linter,correctness common_mistakes configurable
equals_na_linter,robustness correctness common_mistakes default
Expand Down
1 change: 1 addition & 0 deletions man/best_practices_linters.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions man/conjunct_expectation_linter.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions man/linters.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions man/package_development_linters.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions man/readability_linters.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 38 additions & 0 deletions tests/testthat/test-conjunct_expectation_linter.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
test_that("conjunct_expectation_linter skips allowed usages", {
expect_lint("expect_true(x)", NULL, conjunct_expectation_linter())
expect_lint("testthat::expect_false(x, y, z)", NULL, conjunct_expectation_linter())

# more complicated expression
expect_lint("expect_true(x || (y && z))", NULL, conjunct_expectation_linter())
# the same by operator precedence, though not obvious a priori
expect_lint("expect_true(x || y && z)", NULL, conjunct_expectation_linter())
expect_lint("expect_true(x && y || z)", NULL, conjunct_expectation_linter())
})

test_that("conjunct_expectation_linter blocks && conditions with expect_true()", {
expect_lint(
"expect_true(x && y)",
rex::rex("Instead of expect_true(A && B), write multiple unit tests"),
conjunct_expectation_linter()
)

expect_lint(
"expect_true(x && y && z)",
rex::rex("Instead of expect_true(A && B), write multiple unit tests"),
conjunct_expectation_linter()
)
})

test_that("conjunct_expectation_linter blocks || conditions with expect_false()", {
expect_lint(
"expect_false(x || y)",
rex::rex("Instead of expect_false(A || B), write multiple unit tests"),
conjunct_expectation_linter()
)

expect_lint(
"expect_false(x || y || z)",
MichaelChirico marked this conversation as resolved.
Show resolved Hide resolved
rex::rex("Instead of expect_false(A || B), write multiple unit tests"),
conjunct_expectation_linter()
)
})