Correct the names in the tests

paulnorthrop · Sep 11, 2020 · 776c1f3 · 776c1f3
1 parent adb2717
commit 776c1f3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: revdbayes
 Title: Ratio-of-Uniforms Sampling for Bayesian Extreme Value Analysis
-Version: 1.3.8.9000
-Date: 2020-09-01
+Version: 1.3.9
+Date: 2020-09-11
 Authors@R: c(person(c("Paul", "J."), "Northrop", email = "[email protected]",
   role = c("aut", "cre", "cph")), person(c("Scott", "D."), "Grimshaw", 
   role = c("ctb")))

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,8 @@
-# revdbayes 1.3.8.9000
+# revdbayes 1.3.9
+
+## Bug fixes and minor improvements
+
+* Tests in `test-gp.R`, `test-gev.R` and `test-bingp.R` have been modified to avoid errors in the upcoming new release of the `testthat` package.
 
 # revdbayes 1.3.8
 

diff --git a/tests/testthat/test-bingp.R b/tests/testthat/test-bingp.R
@@ -32,7 +32,7 @@ shape_check <- c(-1, -0.5, -0.1, -ep, 0, ep, 0.1, 0.5, 1)
 par_vals <- cbind(pu_check, loc_check, scale_check, shape_check)
 p_vals <- 1 - pu_check + c(0.01, 0.1, 0.5, 0.9, 0.99) * pu_check
 for (i in 1:nrow(par_vals)) {
-  test_string <- paste("GP shape = ", par_vals[i, ])
+  test_string <- paste("GP shape = ", par_vals[i, 4])
   x <- pqbingp_test_fn(x = par_vals[i, ], p = p_vals)
   test_function(x, test_string)
 }
diff --git a/tests/testthat/test-gev.R b/tests/testthat/test-gev.R
@@ -30,7 +30,7 @@ shape_check <- c(-1, -0.5, -0.1, -ep, 0, ep, 0.1, 0.5, 1)
 par_vals <- cbind(loc_check, scale_check, shape_check)
 p_vals <- c(0.01, 0.1, 0.5, 0.9, 0.99)
 for (i in 1:nrow(par_vals)) {
-  test_string <- paste("gev shape = ", par_vals[i, ])
+  test_string <- paste("gev shape = ", par_vals[i, 3])
   x <- pqgev_test_fn(x = par_vals[i, ], p = p_vals)
   test_function(x, test_string)
 }

diff --git a/tests/testthat/test-gp.R b/tests/testthat/test-gp.R
@@ -30,7 +30,7 @@ shape_check <- c(-1, -0.5, -0.1, -ep, 0, ep, 0.1, 0.5, 1)
 par_vals <- cbind(loc_check, scale_check, shape_check)
 p_vals <- c(0.01, 0.1, 0.5, 0.9, 0.99)
 for (i in 1:nrow(par_vals)) {
-  test_string <- paste("GP shape = ", par_vals[i, ])
+  test_string <- paste("GP shape = ", par_vals[i, 3])
   x <- pqgp_test_fn(x = par_vals[i, ], p = p_vals)
   test_function(x, test_string)
 }