Enable tests (#669)

* remove line in .lintr

* lint files in tests/

* remove duplication

Author: MichaelChirico

.lintr

@@ -8,7 +8,7 @@ linters: with_defaults( # The following TODOs are part of an effort to have {lin
 exclusions: list(
   "inst/doc/creating_linters.R" = 1,
   "inst/example/bad.R",
-  "tests", # TODO remove this
+  "tests/testthat/default_linter_testcode.R",
   "tests/testthat/dummy_packages",
   "tests/testthat/exclusions-test",
   "tests/testthat/knitr_formats",

tests/testthat/test-T_and_F_symbol_linter.R

@@ -16,4 +16,3 @@ test_that("returns the correct linting", {
               ),
               linter)
 })
-

tests/testthat/test-absolute_path_linter.R

@@ -166,7 +166,7 @@ test_that("returns the correct linting", {
     "./blah",
     encodeString("blah\\file.txt")
   )
-  for(path in non_absolute_path_strings) {
+  for (path in non_absolute_path_strings) {
     expect_lint(single_quote(path), NULL, linter)
     expect_lint(double_quote(path), NULL, linter)
   }

tests/testthat/test-closed_curly_linter.R

@@ -35,18 +35,18 @@ test_that("returns the correct linting", {
       rex("Closing curly-braces should always be on their own line, unless it's followed by an else.")
       ),
     closed_curly_linter())
-  
+
   expect_lint("eval(bquote({...}))",
               NULL,
               closed_curly_linter())
-  
+
   expect_lint("fun({\n  statements\n}, param)",
               NULL,
               closed_curly_linter())
-  
+
   expect_lint("out <- lapply(stuff, function(i) {\n  do_something(i)\n}) %>% unlist",
               NULL,
               closed_curly_linter())
 
-  expect_lint('{{x}}', NULL, closed_curly_linter())
+  expect_lint("{{x}}", NULL, closed_curly_linter())
 })

tests/testthat/test-defaults.R

@@ -18,7 +18,7 @@ test_that("undesirable functions and operators", {
     expect_is(x, "list")
     expect_gt(length(x), 0L)
     expect_true(all(names(x) != ""))
-    expect_true(all(vapply(x, function(x) {is.na(x) || is.character(x)}, logical(1L))))
+    expect_true(all(vapply(x, function(x) is.na(x) || is.character(x), logical(1L))))
     expect_true(all(vapply(x, length, integer(1L)) == 1L))
   }
 })

tests/testthat/test-extraction_operator_linter.R

@@ -21,5 +21,3 @@ test_that("linter returns the correct linting", {
               ),
               linter)
 })
-
-

tests/testthat/test-get_source_expressions.R

@@ -1,12 +1,10 @@
-context("get_source_expression")
-
-
 with_content_to_parse <- function(content, code) {
   f <- tempfile()
   on.exit(unlink(f))
   writeLines(content, f)
-  pc <- lapply(get_source_expressions(f)[["expressions"]], `[[`, "parsed_content")
-  eval(substitute(code))
+  content_env <- new.env()
+  content_env$pc <- lapply(get_source_expressions(f)[["expressions"]], `[[`, "parsed_content")
+  eval(substitute(code), envir = content_env)
 }
 
 

tests/testthat/test-lint_file.R

@@ -88,7 +88,7 @@ test_that("lint() results do not depend on the position of the .lintr", {
     )
   )
 
-  lints_with_config_in_source_dir <- withr::with_dir(
+  lints_with_config_in_r_dir <- withr::with_dir(
     pkg_path,
     lint_with_config(
       config_path = "R/.lintr",
@@ -102,7 +102,7 @@ test_that("lint() results do not depend on the position of the .lintr", {
   )
   expect_equal(
     as.data.frame(lints_with_config_at_pkg_root),
-    as.data.frame(lints_with_config_in_source_dir),
+    as.data.frame(lints_with_config_in_r_dir),
     info = paste(
       "lints for a source file should be independent of whether the .lintr",
       "file is in the project-root or the source-file-directory"

tests/testthat/test-lint_package.R

@@ -1,13 +1,11 @@
-context("Integration tests for `lint_package`")
-
 # When called from inside a package:
-# lint_package(".")
+# lint_package(".") # nolint
 # .. should give the same results as when called from outside the package
 # with:
-# lint_package(path_to_package)
+# lint_package(path_to_package) # nolint
 
 # Template packages for use in testing are stored in
-# `tests/testthat/dummy_packages/<pkgName>`
+# tests/testthat/dummy_packages/<pkgName>
 # These packages should not have a .lintr file:  Hardcoding a .lintr in a
 # dummy package throws problems during `R CMD check` (they are flagged as
 # hidden files, but can't be added to RBuildIgnore since they should be

tests/testthat/test-open_curly_linter.R

@@ -47,5 +47,5 @@ test_that("returns the correct linting", {
     open_curly_linter()
   )
 
-  expect_lint('{{x}}', NULL, open_curly_linter())
+  expect_lint("{{x}}", NULL, open_curly_linter())
 })

tests/testthat/test-seq_linter.R

@@ -30,7 +30,7 @@ test_that("finds 1:length(...) expressions", {
   expect_lint("function(x) { 1:dim(x)[1L] }",
     rex("dim(...)", anything, "use seq_len"),
     seq_linter)
-  
+
   expect_lint("function(x) { 1L:dim(x)[[1]] }",
     rex("dim(...)", anything, "use seq_len"),
     seq_linter)

tests/testthat/test-spaces_inside_linter.R

@@ -1,5 +1,3 @@
-context("spaces_inside_linter")
-
 test_that("returns the correct linting", {
   msg <- rex::rex("Do not place spaces around code in parentheses or square brackets.")
 
@@ -55,7 +53,7 @@ test_that("returns the correct linting", {
 
   # trailing comments are OK (#636)
   expect_lint("or( #code\n  x, y\n)", NULL, spaces_inside_linter)
-  
+
   expect_lint(trim_some("
     fun(      # this is another comment
       a = 42, # because 42 is always the answer

tests/testthat/test-unneeded_concatenation_linter.R

@@ -1,5 +1,3 @@
-context("unneeded_concatenation_linter")
-
 test_that("returns the correct linting", {
   linter <- unneeded_concatenation_linter
   msg_c <- rex::escape("Unneeded concatenation of a constant. Remove the \"c\" call.")
@@ -23,4 +21,3 @@ test_that("returns the correct linting", {
               ),
               linter)
 })
-