Merge pull request #641 from remlapmot/improve-tests

Tweak tests

Author: remlapmot

tests/testthat/test_otherformats.R

@@ -43,12 +43,12 @@ test_that("radial MR dat", {
 
 test_that("radial MR", {
 	w <- dat_to_RadialMR(dat)
-	expect_warning(o <- RadialMR::ivw_radial(w[[1]]))
+	utils::capture.output(expect_warning(o <- RadialMR::ivw_radial(w[[1]])))
 	expect_true(class(o) == "IVW")
 })
 
 
 test_that("radial MR", {
-	w <- mr_ivw_radial(dat$beta.exposure, dat$beta.outcome, dat$se.exposure, dat$se.outcome)
+	utils::capture.output(w <- mr_ivw_radial(dat$beta.exposure, dat$beta.outcome, dat$se.exposure, dat$se.outcome))
 	expect_true(class(w) == "list")
 })

tests/testthat/test_plots.R

@@ -69,12 +69,12 @@ test_that("Forest plot 1 to many", {
     trans = "log2",
     xlab = "OR for CHD per SD increase in risk factor (95% confidence interval)",
     weight = "weight"
-  ), regexp = "Removed 6 rows containing missing values or values outside the scale range *")
+  ), regexp = "Removed 6 rows")
 })
 
 test_that("Forest plot 1 to many test 2", {
   res$pval<-formatC(res$pval, format = "e", digits = 2)
-  expect_warning(p9 <- forest_plot_1_to_many(
+  expect_warning(p9 <- utils::capture.output(forest_plot_1_to_many(
     res,
     b = "b",
     se = "se",
@@ -94,7 +94,7 @@ test_that("Forest plot 1 to many test 2", {
     addcols = c("nsnp", "pval"),
     addcol_widths = c(1.0, 1.0),
     addcol_titles = c("No. SNPs", "P-val")
-  ), regexp = "Removed 6 rows containing missing values or values outside the scale range *")
+  ), regexp = "Removed 6 rows"))
 })
 
 test_that("Forest plot 1 to many test 3 - with subcategory in by argument", {
@@ -121,5 +121,5 @@ test_that("Forest plot 1 to many test 3 - with subcategory in by argument", {
     xlab = "OR for CHD per SD increase in risk factor (95% confidence interval)",
     subheading_size = 14,
     weight = "weight"
-  ), regexp = "Removed 3 rows containing missing values or values outside the scale range *")
+  ), regexp = "Removed 3 rows")
 })