Merge pull request #394 from renkun-ken/testthat-3

randy3k · web-flow · commit 2565f0033850 · 2021-03-22T23:55:36.000-07:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -52,3 +52,4 @@ LazyData: true
 NeedsCompilation: yes
 Roxygen: list(markdown = TRUE, r6 = FALSE)
 RoxygenNote: 7.1.1
+Config/testthat/edition: 3
diff --git a/tests/testthat/helper-utils.R b/tests/testthat/helper-utils.R
@@ -8,6 +8,10 @@ suppressPackageStartupMessages({
 # a hack to make withr::defer_parent to work, see https://github.com/r-lib/withr/issues/123
 defer <- withr::defer
 
+expect_equivalent <- function(x, y) {
+    expect_equal(x, y, ignore_attr = TRUE)
+}
+
 language_client <- function(working_dir = getwd(), diagnostics = FALSE, capabilities = NULL) {
 
     if (nzchar(Sys.getenv("R_LANGSVR_LOG"))) {
diff --git a/tests/testthat/test-call-hierarchy.R b/tests/testthat/test-call-hierarchy.R
@@ -1,5 +1,3 @@
-context("Test call hierarchy")
-
 test_that("Call hierarchy works in single file", {
     skip_on_cran()
     client <- language_client()
@@ -196,7 +194,6 @@ test_that("Call hierarchy outgoing calls works", {
     expect_length(result, 2)
 
     result1 <- result %>% keep(~ .$to$name == "foo")
-    print(result1)
 
     expect_equal(result1[[1]]$to$name, "foo")
     expect_equal(result1[[1]]$to$kind, SymbolKind$Function)
diff --git a/tests/testthat/test-codeunits.R b/tests/testthat/test-codeunits.R
@@ -1,5 +1,3 @@
-context("Test Multi Bytes Characters")
-
 test_that("Code units are correctly calculated", {
     skip_on_os("solaris")
     expect_equal(ncodeunit("a"), 1)
diff --git a/tests/testthat/test-color.R b/tests/testthat/test-color.R
@@ -1,5 +1,3 @@
-context("Test Color")
-
 get_color <- function(color) {
     rgba <- grDevices::col2rgb(color, alpha = TRUE) / 255
     as.list(rgba[, 1])
diff --git a/tests/testthat/test-completion.R b/tests/testthat/test-completion.R
@@ -1,5 +1,3 @@
-context("Test Completion")
-
 test_that("Simple completion works", {
     skip_on_cran()
     client <- language_client()
diff --git a/tests/testthat/test-definition.R b/tests/testthat/test-definition.R
@@ -1,5 +1,3 @@
-context("Test Definition")
-
 test_that("Go to Definition works for functions in files", {
     skip_on_cran()
     client <- language_client()
diff --git a/tests/testthat/test-folding.R b/tests/testthat/test-folding.R
@@ -1,5 +1,3 @@
-context("Test Folding Range")
-
 test_that("Expression folding rage works", {
     skip_on_cran()
     client <- language_client()
@@ -17,8 +15,8 @@ test_that("Expression folding rage works", {
     result <- result[order(sapply(result, "[[", "startLine"))]
 
     expect_equal(length(result), 1)
-    expect_equivalent(result[[1]]$startLine, 0)
-    expect_equivalent(result[[1]]$endLine, 1)
+    expect_equal(result[[1]]$startLine, 0)
+    expect_equal(result[[1]]$endLine, 1)
 })
 
 test_that("Section folding range works", {
diff --git a/tests/testthat/test-formatting.R b/tests/testthat/test-formatting.R
@@ -1,5 +1,3 @@
-context("Test Formatting")
-
 test_that("Formatting document works", {
     skip_on_cran()
     client <- language_client()
diff --git a/tests/testthat/test-highlight.R b/tests/testthat/test-highlight.R
@@ -1,5 +1,3 @@
-context("Test Highlight")
-
 test_that("Document highlight works", {
     skip_on_cran()
     client <- language_client()
diff --git a/tests/testthat/test-hover.R b/tests/testthat/test-hover.R
@@ -1,5 +1,3 @@
-context("Test Hover")
-
 test_that("Simple hover works", {
     skip_on_cran()
     client <- language_client()
diff --git a/tests/testthat/test-langauagecilent.R b/tests/testthat/test-langauagecilent.R
@@ -1,5 +1,3 @@
-context("Test languagecilent")
-
 test_that("read_line and read_char works", {
     cilent <- LanguageClient$new()
     stub(cilent$read_char, "self$read_output", mock("hello", "abc", "def", "pqr\nxyz\n"))
diff --git a/tests/testthat/test-link.R b/tests/testthat/test-link.R
@@ -1,5 +1,3 @@
-context("Test Link")
-
 test_that("Document link works", {
     skip_on_cran()
 
diff --git a/tests/testthat/test-lintr.R b/tests/testthat/test-lintr.R
@@ -1,5 +1,3 @@
-context("Test Diagnostics")
-
 test_that("lintr works", {
     skip_on_cran()
 
diff --git a/tests/testthat/test-null-root.R b/tests/testthat/test-null-root.R
@@ -1,5 +1,3 @@
-context("Test Null-root Workspace")
-
 test_that("Null-root workspace works", {
   skip_on_cran()
   client <- language_client(NULL)
diff --git a/tests/testthat/test-references.R b/tests/testthat/test-references.R
@@ -1,5 +1,3 @@
-context("Test References")
-
 test_that("Find References works for functions in files", {
     skip_on_cran()
     client <- language_client()
diff --git a/tests/testthat/test-rename.R b/tests/testthat/test-rename.R
@@ -1,5 +1,3 @@
-context("Test Rename")
-
 test_that("Rename works for functions in files", {
     skip_on_cran()
     client <- language_client()
diff --git a/tests/testthat/test-search.R b/tests/testthat/test-search.R
@@ -1,5 +1,3 @@
-context("Test Search")
-
 test_that("enclosed_by_quotes works as expected", {
     enclosed <- function(text, col) {
           .Call("enclosed_by_quotes", PACKAGE = "languageserver", text, col)
diff --git a/tests/testthat/test-selection.R b/tests/testthat/test-selection.R
@@ -1,5 +1,3 @@
-context("Test Selection Range")
-
 test_that("Selection range works with single position", {
   skip_on_cran()
   client <- language_client()
diff --git a/tests/testthat/test-signature.R b/tests/testthat/test-signature.R
@@ -1,5 +1,3 @@
-context("Test Signature")
-
 test_that("Simple signature works", {
     skip_on_cran()
     client <- language_client()
diff --git a/tests/testthat/test-stdio.R b/tests/testthat/test-stdio.R
@@ -1,5 +1,3 @@
-context("Test STDIO connection")
-
 test_that("Language Server launches", {
     skip_on_cran()
     client <- language_client()
diff --git a/tests/testthat/test-symbol.R b/tests/testthat/test-symbol.R
@@ -1,5 +1,3 @@
-context("Test Symbol")
-
 test_that("Document Symbol works", {
     skip_on_cran()
     client <- language_client()

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context("Test Multi Bytes Characters")`
`2`		`-`
`3`	`1`	`test_that("Code units are correctly calculated", {`
`4`	`2`	`skip_on_os("solaris")`
`5`	`3`	`expect_equal(ncodeunit("a"), 1)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context("Test Color")`
`2`		`-`
`3`	`1`	`get_color <- function(color) {`
`4`	`2`	`rgba <- grDevices::col2rgb(color, alpha = TRUE) / 255`
`5`	`3`	`as.list(rgba[, 1])`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context("Test Completion")`
`2`		`-`
`3`	`1`	`test_that("Simple completion works", {`
`4`	`2`	`skip_on_cran()`
`5`	`3`	`client <- language_client()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context("Test Definition")`
`2`		`-`
`3`	`1`	`test_that("Go to Definition works for functions in files", {`
`4`	`2`	`skip_on_cran()`
`5`	`3`	`client <- language_client()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context("Test Formatting")`
`2`		`-`
`3`	`1`	`test_that("Formatting document works", {`
`4`	`2`	`skip_on_cran()`
`5`	`3`	`client <- language_client()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context("Test Highlight")`
`2`		`-`
`3`	`1`	`test_that("Document highlight works", {`
`4`	`2`	`skip_on_cran()`
`5`	`3`	`client <- language_client()`