create a new test collection instead of modifying existing tests

IndrajeetPatil · IndrajeetPatil · commit e843fd5dc65f · 2024-12-03T17:31:16.000+03:00
diff --git a/tests/testthat/line_breaks_and_other/curly-in.R b/tests/testthat/line_breaks_and_other/curly-in.R
@@ -59,12 +59,3 @@ while (TRUE){
 
 while (TRUE){#
  }
-
-
-for (i in 1:10) {}
-
-
-
-
-
-while (TRUE) {}
diff --git a/tests/testthat/line_breaks_and_other/curly-out.R b/tests/testthat/line_breaks_and_other/curly-out.R
@@ -53,9 +53,3 @@ while (TRUE) {
 
 while (TRUE) { #
 }
-
-
-for (i in 1:10) {}
-
-
-while (TRUE) {}
diff --git a/tests/testthat/line_breaks_and_other/pipe_and_comment-in.R b/tests/testthat/line_breaks_and_other/pipe_and_comment-in.R
@@ -1,22 +1,2 @@
 1:10 %>% # sum
   sum()
-
-
-f %>% g()
-
-
-
-
-
-h %>% i()
-
-
-
-
-
-# some comment
-
-
-
-
-j %>% k()
diff --git a/tests/testthat/line_breaks_and_other/pipe_and_comment-out.R b/tests/testthat/line_breaks_and_other/pipe_and_comment-out.R
@@ -1,14 +1,2 @@
 1:10 %>% # sum
   sum()
-
-
-f %>% g()
-
-
-h %>% i()
-
-
-# some comment
-
-
-j %>% k()
diff --git a/tests/testthat/line_breaks_fun_call/blank-non-strict-in.R b/tests/testthat/line_breaks_fun_call/blank-non-strict-in.R
@@ -10,10 +10,6 @@ call(
   1
 )
 
-
-
-
-
 call(
   x = 2,
   1,
diff --git a/tests/testthat/line_breaks_fun_call/blank-non-strict-out.R b/tests/testthat/line_breaks_fun_call/blank-non-strict-out.R
@@ -8,10 +8,6 @@ call(
   1
 )
 
-
-
-
-
 call(
   x = 2,
   1,
diff --git a/tests/testthat/line_breaks_top_level_exprs/braces-in.R b/tests/testthat/line_breaks_top_level_exprs/braces-in.R
@@ -0,0 +1,16 @@
+{
+  1 + 1
+}
+
+
+
+
+
+### some comment
+
+
+
+
+{
+  NULL
+}
diff --git a/tests/testthat/line_breaks_top_level_exprs/braces-out.R b/tests/testthat/line_breaks_top_level_exprs/braces-out.R
@@ -0,0 +1,11 @@
+{
+  1 + 1
+}
+
+
+### some comment
+
+
+{
+  NULL
+}
diff --git a/tests/testthat/line_breaks_top_level_exprs/conditionals-in.R b/tests/testthat/line_breaks_top_level_exprs/conditionals-in.R
@@ -0,0 +1,20 @@
+for (i in 1:10) {}
+
+
+
+
+
+
+# some comment
+
+
+
+
+
+while (TRUE) {}
+
+
+
+
+# some comment
+if (TRUE) NULL
diff --git a/tests/testthat/line_breaks_top_level_exprs/conditionals-out.R b/tests/testthat/line_breaks_top_level_exprs/conditionals-out.R
@@ -0,0 +1,11 @@
+for (i in 1:10) {}
+
+
+# some comment
+
+
+while (TRUE) {}
+
+
+# some comment
+if (TRUE) NULL
diff --git a/tests/testthat/line_breaks_top_level_exprs/function_defs_and_calls-in.R b/tests/testthat/line_breaks_top_level_exprs/function_defs_and_calls-in.R
@@ -0,0 +1,23 @@
+f <- function() NULL
+
+
+
+
+
+
+
+
+g <- function() NULL
+
+
+
+
+f()
+
+# comment
+
+
+
+
+
+g()
diff --git a/tests/testthat/line_breaks_top_level_exprs/function_defs_and_calls-out.R b/tests/testthat/line_breaks_top_level_exprs/function_defs_and_calls-out.R
@@ -0,0 +1,12 @@
+f <- function() NULL
+
+
+g <- function() NULL
+
+
+f()
+
+# comment
+
+
+g()
diff --git a/tests/testthat/line_breaks_top_level_exprs/non_strict-in.R b/tests/testthat/line_breaks_top_level_exprs/non_strict-in.R
@@ -0,0 +1,23 @@
+f <- function() NULL
+
+
+
+
+
+
+
+
+g <- function() NULL
+
+
+
+
+f()
+
+# comment
+
+
+
+
+
+g()
diff --git a/tests/testthat/line_breaks_top_level_exprs/non_strict-out.R b/tests/testthat/line_breaks_top_level_exprs/non_strict-out.R
@@ -0,0 +1,12 @@
+f <- function() NULL
+
+
+g <- function() NULL
+
+
+f()
+
+# comment
+
+
+g()
diff --git a/tests/testthat/line_breaks_top_level_exprs/piped_chains-in.R b/tests/testthat/line_breaks_top_level_exprs/piped_chains-in.R
@@ -0,0 +1,21 @@
+
+
+f %>% g()
+
+
+
+
+
+
+h %>% i()
+
+
+
+
+
+# some comment
+
+
+
+
+j %>% k()
diff --git a/tests/testthat/line_breaks_top_level_exprs/piped_chains-out.R b/tests/testthat/line_breaks_top_level_exprs/piped_chains-out.R
@@ -0,0 +1,10 @@
+f %>% g()
+
+
+h %>% i()
+
+
+# some comment
+
+
+j %>% k()
diff --git a/tests/testthat/test-line_breaks_top_level_exprs.R b/tests/testthat/test-line_breaks_top_level_exprs.R
@@ -0,0 +1,30 @@
+test_that("extra line breaks between conditional statements are removed", {
+  expect_no_warning(
+    test_collection("line_breaks_top_level_exprs", "conditionals", transformer = style_text)
+  )
+})
+
+test_that("extra line breaks between function and definitions and calls are removed", {
+  expect_no_warning(
+    test_collection("line_breaks_top_level_exprs", "function_defs_and_calls", transformer = style_text)
+  )
+})
+
+test_that("extra line breaks between piped chains are removed", {
+  expect_no_warning(
+    test_collection("line_breaks_top_level_exprs", "piped_chains", transformer = style_text)
+  )
+})
+
+test_that("extra line breaks between braced expressions are removed", {
+  expect_no_warning(
+    test_collection("line_breaks_top_level_exprs", "braces", transformer = style_text)
+  )
+})
+
+test_that("extra line breaks are not removed in non-strict mode", {
+  expect_no_warning(
+    test_collection("line_breaks_top_level_exprs", "non_strict", transformer = style_text)
+  )
+})
+
diff --git a/tests/testthat/test-transformers-drop.R b/tests/testthat/test-transformers-drop.R
@@ -72,7 +72,7 @@ test_that("tidyverse transformers are correctly dropped", {
 
   names_line_break <- c(
     "remove_empty_lines_after_opening_and_before_closing_braces",
-    "set_line_breaks_between_top_level_exprs ",
+    "set_line_breaks_between_top_level_exprs",
     "set_line_break_around_comma_and_or",
     "set_line_break_after_assignment",
     "set_line_break_after_opening_if_call_is_multi_line",

Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,3 @@ while (TRUE) {`
`53`	`53`
`54`	`54`	`while (TRUE) { #`
`55`	`55`	`}`
`56`		`-`
`57`		`-`
`58`		`-for (i in 1:10) {}`
`59`		`-`
`60`		`-`
`61`		`-while (TRUE) {}`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,6 @@ call(`
`10`	`10`	`1`
`11`	`11`	`)`
`12`	`12`
`13`		`-`
`14`		`-`
`15`		`-`
`16`		`-`
`17`	`13`	`call(`
`18`	`14`	`x = 2,`
`19`	`15`	`1,`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,6 @@ call(`
`8`	`8`	`1`
`9`	`9`	`)`
`10`	`10`
`11`		`-`
`12`		`-`
`13`		`-`
`14`		`-`
`15`	`11`	`call(`
`16`	`12`	`x = 2,`
`17`	`13`	`1,`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,16 @@ @@
 +{
 +  1 + 1
 +}
++
++
++
++
++
 +### some comment
++
++
++
++
 +{
 +  NULL
 +}