#1839 checking necessary steps

pharmaverse · Jul 5, 2023 · a059361 · a059361
1 parent 63652b7
commit a059361
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 34 deletions.
diff --git a/R/my_first_fcn.R b/R/my_first_fcn.R
@@ -22,12 +22,11 @@
 #' welcome_fun(anything = 2)
 #' welcome_fun(anything = NULL)
 #' welcome_fun(anything = data.frame(1:10, 2:11))
-welcome_fun <- function(anything = NULL){
-
-  if(is.null(anything)){
-
-    cat("Welcome to the admiral family!")
-
-  } else {cat("Welcome to the admiral family!")}
-
+welcome_fun <- function(anything = NULL) {
+  if (is.null(anything)) {
+    out <- "Welcome to the admiral family!"
+  } else {
+    out <- "Welcome to the admiral family!"
+  }
+  return(out)
 }
diff --git a/man/derive_var_extreme_flag.Rd b/man/derive_var_extreme_flag.Rd
diff --git a/man/derive_var_joined_exist_flag.Rd b/man/derive_var_joined_exist_flag.Rd
diff --git a/man/derive_var_merged_exist_flag.Rd b/man/derive_var_merged_exist_flag.Rd
diff --git a/man/derive_var_merged_summary.Rd b/man/derive_var_merged_summary.Rd
diff --git a/man/derive_var_obs_number.Rd b/man/derive_var_obs_number.Rd
diff --git a/man/derive_var_relative_flag.Rd b/man/derive_var_relative_flag.Rd
diff --git a/man/derive_vars_joined.Rd b/man/derive_vars_joined.Rd
diff --git a/man/derive_vars_merged.Rd b/man/derive_vars_merged.Rd
diff --git a/man/derive_vars_merged_lookup.Rd b/man/derive_vars_merged_lookup.Rd
diff --git a/man/derive_vars_transposed.Rd b/man/derive_vars_transposed.Rd
diff --git a/man/get_summary_records.Rd b/man/get_summary_records.Rd
diff --git a/tests/testthat/test-my_first_fcn.R b/tests/testthat/test-my_first_fcn.R
@@ -1,33 +1,28 @@
 # anything param types ----
-## Test 1: param is NULL ----
-
-test_that("my_new_func Test 1: NULL works as parameter", {
 
+## Test 1: NULL works as parameter ----
+test_that("my_first_fcn Test 1: NULL works as parameter", {
   input <- NULL
 
   expected_output <- "Welcome to the admiral family!"
 
-  expect_dfs_equal(welcome_fun(input), expected_output)
-
+  expect_equal(welcome_fun(input), expected_output)
 })
 
 
-## Test 2: param is double ----
-
-test_that("my_new_func Test 2: double works as parameter", {
 
+## Test 2: double works as parameter ----
+test_that("my_first_fcn Test 2: double works as parameter", {
   input <- 3
 
   expected_output <- "Welcome to the admiral family!"
 
-  expect_dfs_equal(welcome_fun(input), expected_output)
-
+  expect_equal(welcome_fun(input), expected_output)
 })
 
-## Test 3: param is a dataframe ----
-
-test_that("my_new_func Test 3: dataframe works as parameter", {
 
+## Test 3: dataframe works as parameter ----
+test_that("my_first_fcn Test 3: dataframe works as parameter", {
   input <- tibble::tribble(
     ~x,  ~y,
     "a", 1:3,
@@ -36,6 +31,5 @@ test_that("my_new_func Test 3: dataframe works as parameter", {
 
   expected_output <- "Welcome to the admiral family!"
 
-  expect_dfs_equal(welcome_fun(input), expected_output)
-
+  expect_equal(welcome_fun(input), expected_output)
 })