Use public interface to test internal functions: Part-3

Part of #1692

And cleanup to break the tests down into skip vs block blocks.

Author: IndrajeetPatil

tests/testthat/test-commented_code_linter.R

@@ -1,9 +1,27 @@
-test_that("returns the correct linting", {
-  lint_msg <- rex::rex("Commented code should be removed.")
+test_that("commented_code_linter skips allowed usages", {
   linter <- commented_code_linter()
-  expect_s3_class(linter, "linter")
 
   expect_lint("blah", NULL, linter)
+  expect_lint("#' blah <- 1", NULL, linter)
+  expect_lint(c("a <- 1", "# comment without code"), NULL, linter)
+  expect_lint(c("a <- 1", "# comment without code"), NULL, linter)
+  expect_lint(c("a <- 1", "## whatever"), NULL, linter)
+
+  expect_lint("TRUE", NULL, linter)
+  expect_lint("#' @examples", NULL, linter)
+  expect_lint("#' foo(1) # list(1)", NULL, linter) # comment in roxygen block ignored
+  expect_lint("1+1 # gives 2", NULL, linter)
+  expect_lint("# Non-existent:", NULL, linter)
+  expect_lint("# 1-a", NULL, linter) # "-" removed from code operators
+  expect_lint("1+1  # for example cat(\"123\")", NULL, linter)
+
+  # regression test for #451
+  expect_lint("c('#a#' = 1)", NULL, linter)
+})
+
+test_that("commented_code_linter blocks disallowed usages", {
+  lint_msg <- rex::rex("Commented code should be removed.")
+  linter <- commented_code_linter()
 
   expect_lint("# blah <- 1", lint_msg, linter)
 
@@ -30,26 +48,6 @@ test_that("returns the correct linting", {
     linter
   )
 
-  expect_lint("#' blah <- 1", NULL, linter)
-
-  expect_lint(
-    c("a <- 1", "# comment without code"),
-    NULL,
-    linter
-  )
-
-  expect_lint(
-    c("a <- 1", "# comment without code"),
-    NULL,
-    linter
-  )
-
-  expect_lint(
-    c("a <- 1", "## whatever"),
-    NULL,
-    linter
-  )
-
   expect_lint(
     trim_some("
       d <- t.test(
@@ -76,26 +74,23 @@ test_that("returns the correct linting", {
     linter
   )
 
-  test_ops <- append(lintr:::ops[lintr:::ops != "%[^%]*%"], values = c("%>%", "%anything%"))
+  expect_lint("1+1 # cat('123')", lint_msg, linter)
+  expect_lint("#expect_ftype(1e-12 , t)", lint_msg, linter)
+})
+
+test_that("commented_code_linter can detect operators in comments and lint correctly", {
+  linter <- commented_code_linter()
+  lint_msg <- rex::rex("Commented code should be removed.")
+
+  test_ops <- c(
+    "+", "=", "==", "!=", "<=", ">=", "<-", "<<-", "<", ">", "->",
+    "->>", "%%", "/", "^", "*", "**", "|", "||", "&", "&&", "%>%",
+    "%anything%"
+  )
+
   for (op in test_ops) {
     expect_lint(paste("i", op, "1", collapse = ""), NULL, linter)
     expect_lint(paste("# something like i", op, "1", collapse = ""), NULL, linter)
     expect_lint(paste("# i", op, "1", collapse = ""), lint_msg, linter)
   }
-
-  expect_lint("TRUE", NULL, linter)
-  expect_lint("#' @examples", NULL, linter)
-  expect_lint("#' foo(1) # list(1)", NULL, linter) # comment in roxygen block ignored
-  expect_lint("1+1 # gives 2", NULL, linter)
-
-  expect_lint("# Non-existent:", NULL, linter) # "-" removed from code operators
-  expect_lint("# 1-a", NULL, linter)
-
-  expect_lint("1+1  # for example cat(\"123\")", NULL, linter)
-
-  expect_lint("1+1 # cat('123')", lint_msg, linter)
-  expect_lint("#expect_ftype(1e-12 , t)", lint_msg, linter)
-
-  # regression test for #451
-  expect_lint("c('#a#' = 1)", NULL, linter)
 })