From 2e84d312e2e4feeed8be3bd3856816078b16480f Mon Sep 17 00:00:00 2001 From: aho Date: Tue, 16 May 2023 18:23:54 +0200 Subject: [PATCH] Use testthat edition 3; remove context() --- DESCRIPTION | 1 + tests/testthat/test-ACC.R | 2 -- tests/testthat/test-AMV.R | 2 -- tests/testthat/test-AbsBiasSS.R | 2 -- tests/testthat/test-Ano.R | 2 -- tests/testthat/test-Ano_CrossValid.R | 2 -- tests/testthat/test-Bias.R | 2 -- tests/testthat/test-BrierScore.R | 2 -- tests/testthat/test-CDORemap.R | 2 -- tests/testthat/test-CRPS.R | 2 -- tests/testthat/test-CRPSS.R | 2 -- tests/testthat/test-Clim.R | 2 -- tests/testthat/test-Cluster.R | 2 -- tests/testthat/test-Composite.R | 2 -- tests/testthat/test-Consist_Trend.R | 2 -- tests/testthat/test-Corr.R | 2 -- tests/testthat/test-DiffCorr.R | 2 -- tests/testthat/test-EOF.R | 2 -- tests/testthat/test-Eno.R | 2 -- tests/testthat/test-EuroAtlanticTC.R | 2 -- tests/testthat/test-Filter.R | 2 -- tests/testthat/test-GMST.R | 2 -- tests/testthat/test-GSAT.R | 2 -- tests/testthat/test-GetProbs.R | 2 -- tests/testthat/test-Histo2Hindcast.R | 2 -- tests/testthat/test-InsertDim.R | 2 -- tests/testthat/test-Load.R | 2 -- tests/testthat/test-MeanDims.R | 2 -- tests/testthat/test-NAO.R | 2 -- tests/testthat/test-Persistence.R | 2 -- tests/testthat/test-ProbBins.R | 2 -- tests/testthat/test-ProjectField.R | 2 -- tests/testthat/test-REOF.R | 2 -- tests/testthat/test-RMS.R | 2 -- tests/testthat/test-RMSSS.R | 2 -- tests/testthat/test-ROCSS.R | 2 -- tests/testthat/test-RPS.R | 2 -- tests/testthat/test-RPSS.R | 2 -- tests/testthat/test-RandomWalkTest.R | 2 -- tests/testthat/test-RatioPredictableComponents.R | 2 -- tests/testthat/test-RatioRMS.R | 2 -- tests/testthat/test-RatioSDRMS.R | 2 -- tests/testthat/test-Regression.R | 2 -- tests/testthat/test-Reorder.R | 2 -- tests/testthat/test-ResidualCorr.R | 2 -- tests/testthat/test-SPOD.R | 2 -- tests/testthat/test-Season.R | 2 -- tests/testthat/test-SignalNoiseRatio.R | 3 --- tests/testthat/test-Smoothing.R | 2 -- tests/testthat/test-Spectrum.R | 2 -- tests/testthat/test-Spread.R | 2 -- tests/testthat/test-StatSeasAtlHurr.R | 2 -- tests/testthat/test-TPI.R | 2 -- tests/testthat/test-Trend.R | 2 -- tests/testthat/test-UltimateBrier.R | 2 -- 55 files changed, 1 insertion(+), 109 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index eee31d4..fe86337 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -51,3 +51,4 @@ LazyData: true SystemRequirements: cdo Encoding: UTF-8 RoxygenNote: 7.2.0 +Config/testthat/edition: 3 diff --git a/tests/testthat/test-ACC.R b/tests/testthat/test-ACC.R index ab5f8be..c9e986d 100644 --- a/tests/testthat/test-ACC.R +++ b/tests/testthat/test-ACC.R @@ -1,5 +1,3 @@ -context("s2dv::ACC tests") - ############################################## ##NOTE: bootstrap is not tested because sample() is used inside. diff --git a/tests/testthat/test-AMV.R b/tests/testthat/test-AMV.R index 9adfaef..f2cc6d0 100644 --- a/tests/testthat/test-AMV.R +++ b/tests/testthat/test-AMV.R @@ -1,5 +1,3 @@ -context("s2dv::AMV tests") - ############################################## lat <- seq(-90, 90, 10) lon <- seq(0, 360, 10) diff --git a/tests/testthat/test-AbsBiasSS.R b/tests/testthat/test-AbsBiasSS.R index 08a4a83..b194ce2 100644 --- a/tests/testthat/test-AbsBiasSS.R +++ b/tests/testthat/test-AbsBiasSS.R @@ -1,5 +1,3 @@ -context("s2dv::AbsBiasSS tests") - ############################################## # dat1 diff --git a/tests/testthat/test-Ano.R b/tests/testthat/test-Ano.R index a74c7c9..bfcf0cb 100644 --- a/tests/testthat/test-Ano.R +++ b/tests/testthat/test-Ano.R @@ -1,5 +1,3 @@ -context("s2dv::Ano test") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-Ano_CrossValid.R b/tests/testthat/test-Ano_CrossValid.R index 2d7c00c..c5eea59 100644 --- a/tests/testthat/test-Ano_CrossValid.R +++ b/tests/testthat/test-Ano_CrossValid.R @@ -1,5 +1,3 @@ -context("s2dv::Ano_CrossValid tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-Bias.R b/tests/testthat/test-Bias.R index 842ecc2..4c6cc99 100644 --- a/tests/testthat/test-Bias.R +++ b/tests/testthat/test-Bias.R @@ -1,5 +1,3 @@ -context("s2dv::Bias tests") - ############################################## # dat1 diff --git a/tests/testthat/test-BrierScore.R b/tests/testthat/test-BrierScore.R index e2c34f9..3f02ac5 100644 --- a/tests/testthat/test-BrierScore.R +++ b/tests/testthat/test-BrierScore.R @@ -1,5 +1,3 @@ -context("s2dv::BrierScore tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-CDORemap.R b/tests/testthat/test-CDORemap.R index 1ace086..5492d51 100644 --- a/tests/testthat/test-CDORemap.R +++ b/tests/testthat/test-CDORemap.R @@ -1,5 +1,3 @@ -context("s2dv::CDORemap tests") - # data1: regular grid data1 <- array(1:360*181*2, dim = c(lon = 360, lat = 181, time = 2)) lons1 <- seq(0, 359) diff --git a/tests/testthat/test-CRPS.R b/tests/testthat/test-CRPS.R index 972eb45..417b3be 100644 --- a/tests/testthat/test-CRPS.R +++ b/tests/testthat/test-CRPS.R @@ -1,5 +1,3 @@ -context("s2dv::CRPS tests") - ############################################## # dat1 diff --git a/tests/testthat/test-CRPSS.R b/tests/testthat/test-CRPSS.R index db0eecd..505f3d4 100644 --- a/tests/testthat/test-CRPSS.R +++ b/tests/testthat/test-CRPSS.R @@ -1,5 +1,3 @@ -context("s2dv::CRPSS tests") - ############################################## # dat1 diff --git a/tests/testthat/test-Clim.R b/tests/testthat/test-Clim.R index f5e288e..1a04437 100644 --- a/tests/testthat/test-Clim.R +++ b/tests/testthat/test-Clim.R @@ -1,5 +1,3 @@ -context("s2dv::Clim tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-Cluster.R b/tests/testthat/test-Cluster.R index 13297d8..b5fe6cf 100644 --- a/tests/testthat/test-Cluster.R +++ b/tests/testthat/test-Cluster.R @@ -1,5 +1,3 @@ -context("s2dv::Cluster tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-Composite.R b/tests/testthat/test-Composite.R index acc7fe6..cb948ef 100644 --- a/tests/testthat/test-Composite.R +++ b/tests/testthat/test-Composite.R @@ -1,5 +1,3 @@ -context("s2dv::Composite tests") - ############################################## # dat1 x1 <- array(0, dim = c(20, 10, 30)) diff --git a/tests/testthat/test-Consist_Trend.R b/tests/testthat/test-Consist_Trend.R index 91dacf7..7f5b5ab 100644 --- a/tests/testthat/test-Consist_Trend.R +++ b/tests/testthat/test-Consist_Trend.R @@ -1,5 +1,3 @@ -context("s2dv::Consist_Trend tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-Corr.R b/tests/testthat/test-Corr.R index f4172be..6732c58 100644 --- a/tests/testthat/test-Corr.R +++ b/tests/testthat/test-Corr.R @@ -1,5 +1,3 @@ -context("s2dv::Corr tests") - ############################################## # dat1: memb_dim is NULL set.seed(1) diff --git a/tests/testthat/test-DiffCorr.R b/tests/testthat/test-DiffCorr.R index f7b771b..32f6625 100644 --- a/tests/testthat/test-DiffCorr.R +++ b/tests/testthat/test-DiffCorr.R @@ -1,5 +1,3 @@ -context("s2dv::DiffCorr tests") - ############################################## # dat1 diff --git a/tests/testthat/test-EOF.R b/tests/testthat/test-EOF.R index 01428e6..4e95aa3 100644 --- a/tests/testthat/test-EOF.R +++ b/tests/testthat/test-EOF.R @@ -1,5 +1,3 @@ -context("s2dv::EOF tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-Eno.R b/tests/testthat/test-Eno.R index 08fda85..b69d11f 100644 --- a/tests/testthat/test-Eno.R +++ b/tests/testthat/test-Eno.R @@ -1,5 +1,3 @@ -context("s2dv::Eno tests") - ############################################## set.seed(1) dat1 <- array(rnorm(800), dim = c(dataset = 1, member = 2, sdate = 4, diff --git a/tests/testthat/test-EuroAtlanticTC.R b/tests/testthat/test-EuroAtlanticTC.R index 6e3ac4b..c689994 100644 --- a/tests/testthat/test-EuroAtlanticTC.R +++ b/tests/testthat/test-EuroAtlanticTC.R @@ -1,5 +1,3 @@ -context("s2dv::EuroAtlanticTC tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-Filter.R b/tests/testthat/test-Filter.R index cf271e1..b387cfc 100644 --- a/tests/testthat/test-Filter.R +++ b/tests/testthat/test-Filter.R @@ -1,5 +1,3 @@ -context("s2dv::Filter tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-GMST.R b/tests/testthat/test-GMST.R index 01ab792..0fbfa41 100644 --- a/tests/testthat/test-GMST.R +++ b/tests/testthat/test-GMST.R @@ -1,5 +1,3 @@ -context("s2dv::GMST tests") - ############################################## lat <- seq(-90, 90, 10) lon <- seq(0, 360, 10) diff --git a/tests/testthat/test-GSAT.R b/tests/testthat/test-GSAT.R index 2d7d7e0..2eb5d68 100644 --- a/tests/testthat/test-GSAT.R +++ b/tests/testthat/test-GSAT.R @@ -1,5 +1,3 @@ -context("s2dv::GSAT tests") - ############################################## lat <- seq(-90, 90, 10) lon <- seq(0, 360, 10) diff --git a/tests/testthat/test-GetProbs.R b/tests/testthat/test-GetProbs.R index 252dd29..f1958dc 100644 --- a/tests/testthat/test-GetProbs.R +++ b/tests/testthat/test-GetProbs.R @@ -1,5 +1,3 @@ -context("s2dv::GetProbs tests") - ############################################## # dat1 diff --git a/tests/testthat/test-Histo2Hindcast.R b/tests/testthat/test-Histo2Hindcast.R index 025f003..1bd69da 100644 --- a/tests/testthat/test-Histo2Hindcast.R +++ b/tests/testthat/test-Histo2Hindcast.R @@ -1,5 +1,3 @@ -context("s2dv::Histo2Hindcast tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-InsertDim.R b/tests/testthat/test-InsertDim.R index 876e7e3..1e401a9 100644 --- a/tests/testthat/test-InsertDim.R +++ b/tests/testthat/test-InsertDim.R @@ -1,5 +1,3 @@ -context("s2dv::InsertDim tests") - ############################################## dat1 <- array(c(1:26), dim = c(dat = 1, sdate = 13, ftime = 2)) dat2 <- array(c(1:24), dim = c(2, 3, c = 4)) diff --git a/tests/testthat/test-Load.R b/tests/testthat/test-Load.R index 8266139..c87beac 100644 --- a/tests/testthat/test-Load.R +++ b/tests/testthat/test-Load.R @@ -1,5 +1,3 @@ -context("s2dv::Load tests") - ############################################## test_that("1-1.", { diff --git a/tests/testthat/test-MeanDims.R b/tests/testthat/test-MeanDims.R index c043c78..502c828 100644 --- a/tests/testthat/test-MeanDims.R +++ b/tests/testthat/test-MeanDims.R @@ -1,5 +1,3 @@ -context("s2dv::MeanDims tests") - ############################################## # dat1 dat1 <- array(c(1:20), diff --git a/tests/testthat/test-NAO.R b/tests/testthat/test-NAO.R index 05fcd22..91b9943 100644 --- a/tests/testthat/test-NAO.R +++ b/tests/testthat/test-NAO.R @@ -1,5 +1,3 @@ -context("s2dv::NAO tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-Persistence.R b/tests/testthat/test-Persistence.R index 4eabe83..a28a2f3 100644 --- a/tests/testthat/test-Persistence.R +++ b/tests/testthat/test-Persistence.R @@ -1,5 +1,3 @@ -context("s2dv::Persistence tests") - ############################################## #dat1: year set.seed(1) diff --git a/tests/testthat/test-ProbBins.R b/tests/testthat/test-ProbBins.R index 4b3d0ec..5b286e0 100644 --- a/tests/testthat/test-ProbBins.R +++ b/tests/testthat/test-ProbBins.R @@ -1,5 +1,3 @@ -context("s2dv::ProbBins tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-ProjectField.R b/tests/testthat/test-ProjectField.R index f3f05ce..8781c08 100644 --- a/tests/testthat/test-ProjectField.R +++ b/tests/testthat/test-ProjectField.R @@ -1,5 +1,3 @@ -context("s2dv::ProjectField tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-REOF.R b/tests/testthat/test-REOF.R index 39747e2..862e10a 100644 --- a/tests/testthat/test-REOF.R +++ b/tests/testthat/test-REOF.R @@ -1,5 +1,3 @@ -context("s2dv::REOF tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-RMS.R b/tests/testthat/test-RMS.R index 2a97466..c24a2a9 100644 --- a/tests/testthat/test-RMS.R +++ b/tests/testthat/test-RMS.R @@ -1,5 +1,3 @@ -context("s2dv::RMS tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-RMSSS.R b/tests/testthat/test-RMSSS.R index 5619f46..7f38373 100644 --- a/tests/testthat/test-RMSSS.R +++ b/tests/testthat/test-RMSSS.R @@ -1,5 +1,3 @@ -context("s2dv::RMSSS tests") - ############################################## # case 1 set.seed(1) diff --git a/tests/testthat/test-ROCSS.R b/tests/testthat/test-ROCSS.R index 130cfa2..5b35246 100644 --- a/tests/testthat/test-ROCSS.R +++ b/tests/testthat/test-ROCSS.R @@ -1,5 +1,3 @@ -context("s2dv::ROCSS tests") - ############################################## # dat1 diff --git a/tests/testthat/test-RPS.R b/tests/testthat/test-RPS.R index 2040c09..624eb37 100644 --- a/tests/testthat/test-RPS.R +++ b/tests/testthat/test-RPS.R @@ -1,5 +1,3 @@ -context("s2dv::RPS tests") - ############################################## # dat1 diff --git a/tests/testthat/test-RPSS.R b/tests/testthat/test-RPSS.R index ce0deb3..f054325 100644 --- a/tests/testthat/test-RPSS.R +++ b/tests/testthat/test-RPSS.R @@ -1,5 +1,3 @@ -context("s2dv::RPSS tests") - ############################################## # dat1 diff --git a/tests/testthat/test-RandomWalkTest.R b/tests/testthat/test-RandomWalkTest.R index a0462c8..7ef24b5 100644 --- a/tests/testthat/test-RandomWalkTest.R +++ b/tests/testthat/test-RandomWalkTest.R @@ -1,5 +1,3 @@ -context("s2dv::RandomWalkTest tests") - ############################################## #dat1 set.seed(1) diff --git a/tests/testthat/test-RatioPredictableComponents.R b/tests/testthat/test-RatioPredictableComponents.R index b6a0808..54609b5 100644 --- a/tests/testthat/test-RatioPredictableComponents.R +++ b/tests/testthat/test-RatioPredictableComponents.R @@ -1,5 +1,3 @@ -context("RatioPredictableComponents test") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-RatioRMS.R b/tests/testthat/test-RatioRMS.R index 11df46c..35bb651 100644 --- a/tests/testthat/test-RatioRMS.R +++ b/tests/testthat/test-RatioRMS.R @@ -1,5 +1,3 @@ -context("s2dv::RatioRMS tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-RatioSDRMS.R b/tests/testthat/test-RatioSDRMS.R index 3086c87..78143cc 100644 --- a/tests/testthat/test-RatioSDRMS.R +++ b/tests/testthat/test-RatioSDRMS.R @@ -1,5 +1,3 @@ -context("s2dv::RatioSDRMS tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-Regression.R b/tests/testthat/test-Regression.R index d0898bf..a94a864 100644 --- a/tests/testthat/test-Regression.R +++ b/tests/testthat/test-Regression.R @@ -1,5 +1,3 @@ -context("s2dv::Regression tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-Reorder.R b/tests/testthat/test-Reorder.R index b17259e..7401b2a 100644 --- a/tests/testthat/test-Reorder.R +++ b/tests/testthat/test-Reorder.R @@ -1,5 +1,3 @@ -context("s2dv::Reorder tests") - ############################################## # dat1 dat1 <- array(c(1:30), dim = c(dat = 1, sdate = 3, ftime = 2, lon = 5)) diff --git a/tests/testthat/test-ResidualCorr.R b/tests/testthat/test-ResidualCorr.R index 61c677e..f4b6a49 100644 --- a/tests/testthat/test-ResidualCorr.R +++ b/tests/testthat/test-ResidualCorr.R @@ -1,5 +1,3 @@ -context("s2dv::ResidualCorr tests") - ############################################## # dat1 diff --git a/tests/testthat/test-SPOD.R b/tests/testthat/test-SPOD.R index 8b56c72..91fe8cc 100644 --- a/tests/testthat/test-SPOD.R +++ b/tests/testthat/test-SPOD.R @@ -1,5 +1,3 @@ -context("s2dv::SPOD tests") - ############################################## lat <- seq(-90, 90, 10) lon <- seq(0, 360, 10) diff --git a/tests/testthat/test-Season.R b/tests/testthat/test-Season.R index f9bfc43..f33a962 100644 --- a/tests/testthat/test-Season.R +++ b/tests/testthat/test-Season.R @@ -1,5 +1,3 @@ -context("s2dv::Season tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-SignalNoiseRatio.R b/tests/testthat/test-SignalNoiseRatio.R index 9fc5ce3..be47492 100644 --- a/tests/testthat/test-SignalNoiseRatio.R +++ b/tests/testthat/test-SignalNoiseRatio.R @@ -1,6 +1,3 @@ - -context("SignalNoiseRatio test") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-Smoothing.R b/tests/testthat/test-Smoothing.R index ad3dcb9..51a956a 100644 --- a/tests/testthat/test-Smoothing.R +++ b/tests/testthat/test-Smoothing.R @@ -1,5 +1,3 @@ -context("s2dv::Smoothing test") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-Spectrum.R b/tests/testthat/test-Spectrum.R index 9c64259..721c9b1 100644 --- a/tests/testthat/test-Spectrum.R +++ b/tests/testthat/test-Spectrum.R @@ -1,5 +1,3 @@ -context("s2dv::Spectrum tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-Spread.R b/tests/testthat/test-Spread.R index d0d55cd..dab8744 100644 --- a/tests/testthat/test-Spread.R +++ b/tests/testthat/test-Spread.R @@ -1,5 +1,3 @@ -context("s2dv::Spread test") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-StatSeasAtlHurr.R b/tests/testthat/test-StatSeasAtlHurr.R index 82ef308..448eadf 100644 --- a/tests/testthat/test-StatSeasAtlHurr.R +++ b/tests/testthat/test-StatSeasAtlHurr.R @@ -1,5 +1,3 @@ -context("s2dv::StatSeaAtlHurr tests") - ############################################## # dat1 set.seed(1) diff --git a/tests/testthat/test-TPI.R b/tests/testthat/test-TPI.R index b663c40..bef5ef6 100644 --- a/tests/testthat/test-TPI.R +++ b/tests/testthat/test-TPI.R @@ -1,5 +1,3 @@ -context("s2dv::TPI tests") - ############################################## lat <- seq(-90, 90, 10) lon <- seq(0, 360, 10) diff --git a/tests/testthat/test-Trend.R b/tests/testthat/test-Trend.R index b47a202..385534b 100644 --- a/tests/testthat/test-Trend.R +++ b/tests/testthat/test-Trend.R @@ -1,5 +1,3 @@ -context("s2dv::Trend tests") - ############################################## # dat1 dat1 <- array(c(-5, -7, -10:10, 12, 11, 7, 16), diff --git a/tests/testthat/test-UltimateBrier.R b/tests/testthat/test-UltimateBrier.R index 6ce8866..28ccb79 100644 --- a/tests/testthat/test-UltimateBrier.R +++ b/tests/testthat/test-UltimateBrier.R @@ -1,5 +1,3 @@ -context("s2dv::UltimateBrier tests") - ############################################## # dat1 set.seed(1) -- GitLab