From 5fed43a991547427a86d6b00ebeba393f9cb1a99 Mon Sep 17 00:00:00 2001
From: Eva Rifa <eva.rifarovira@bsc.es>
Date: Fri, 2 Jun 2023 12:14:40 +0200
Subject: [PATCH] Add config testthat version 3; Remove context

---
 DESCRIPTION                                         | 1 +
 tests/testthat/test-BEI_PDFBest.R                   | 2 +-
 tests/testthat/test-BEI_Weights.R                   | 2 +-
 tests/testthat/test-CST_Analogs.R                   | 2 --
 tests/testthat/test-CST_Anomaly.R                   | 2 --
 tests/testthat/test-CST_BEI_Weighting.R             | 2 +-
 tests/testthat/test-CST_BiasCorrection.R            | 2 --
 tests/testthat/test-CST_Calibration.R               | 2 --
 tests/testthat/test-CST_CategoricalEnsCombination.R | 3 +--
 tests/testthat/test-CST_EnsClustering.R             | 3 +--
 tests/testthat/test-CST_InsertDim.R                 | 2 --
 tests/testthat/test-CST_MergeDims.R                 | 3 ++-
 tests/testthat/test-CST_MultiEOF.R                  | 3 ---
 tests/testthat/test-CST_MultiMetric.R               | 2 --
 tests/testthat/test-CST_MultivarRMSE.R              | 2 +-
 tests/testthat/test-CST_ProxiesAttractor.R          | 2 --
 tests/testthat/test-CST_QuantileMapping.R           | 2 --
 tests/testthat/test-CST_RFSlope.R                   | 3 +--
 tests/testthat/test-CST_RFTemp.R                    | 2 --
 tests/testthat/test-CST_RFWeights.R                 | 3 +--
 tests/testthat/test-CST_RainFARM.R                  | 3 +--
 tests/testthat/test-CST_RegimesAssign.R             | 2 --
 tests/testthat/test-CST_SaveExp.R                   | 1 -
 tests/testthat/test-CST_SplitDim.R                  | 3 ---
 tests/testthat/test-CST_Subset.R                    | 2 --
 tests/testthat/test-CST_WeatherRegimes.R            | 3 +--
 tests/testthat/test-PlotForecastPDF.R               | 3 ++-
 tests/testthat/test-PlotPDFsOLE.R                   | 2 +-
 tests/testthat/test-PlotTriangles4Categories.R      | 3 ++-
 tests/testthat/test-PlotWeeklyClim.R                | 2 --
 tests/testthat/test-as.s2dv_cube.R                  | 2 --
 tests/testthat/test-s2dv_cube.R                     | 2 --
 32 files changed, 18 insertions(+), 55 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 1700491b..0cd270d7 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -92,3 +92,4 @@ License: GPL-3
 Encoding: UTF-8
 LazyData: true
 RoxygenNote: 7.2.0
+Config/testthat/edition: 3
\ No newline at end of file
diff --git a/tests/testthat/test-BEI_PDFBest.R b/tests/testthat/test-BEI_PDFBest.R
index 55070e81..bf27a5aa 100644
--- a/tests/testthat/test-BEI_PDFBest.R
+++ b/tests/testthat/test-BEI_PDFBest.R
@@ -1,4 +1,4 @@
-context("Generic tests")
+##############################################
 test_that("basic use case", {
   index_obs<- c(2, 3, 0.6)
   dim(index_obs) <- c(time = 3)
diff --git a/tests/testthat/test-BEI_Weights.R b/tests/testthat/test-BEI_Weights.R
index 26347eb6..888b231e 100644
--- a/tests/testthat/test-BEI_Weights.R
+++ b/tests/testthat/test-BEI_Weights.R
@@ -1,4 +1,4 @@
-context("Generic tests")
+##############################################
 test_that("basic use case", {
   index_weight <- 1 : (3 * 3)
   dim(index_weight) <- c(sdate = 3, member = 3)
diff --git a/tests/testthat/test-CST_Analogs.R b/tests/testthat/test-CST_Analogs.R
index 66e1c88a..80e5da86 100644
--- a/tests/testthat/test-CST_Analogs.R
+++ b/tests/testthat/test-CST_Analogs.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_Analogs tests")
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-CST_Anomaly.R b/tests/testthat/test-CST_Anomaly.R
index a4c7f3f5..772352aa 100644
--- a/tests/testthat/test-CST_Anomaly.R
+++ b/tests/testthat/test-CST_Anomaly.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_Anomaly tests")
-
 ##############################################
 # dat
 set.seed(1)
diff --git a/tests/testthat/test-CST_BEI_Weighting.R b/tests/testthat/test-CST_BEI_Weighting.R
index 3a70f38a..bf2579c0 100644
--- a/tests/testthat/test-CST_BEI_Weighting.R
+++ b/tests/testthat/test-CST_BEI_Weighting.R
@@ -1,4 +1,4 @@
-context("CSTools::CST_CST_BEI_Weighting tests")
+##############################################
 
 # dat
 var_exp <- array(1:6, dim = c(sdate = 2, member = 3))
diff --git a/tests/testthat/test-CST_BiasCorrection.R b/tests/testthat/test-CST_BiasCorrection.R
index 46f57ace..ec9b596e 100644
--- a/tests/testthat/test-CST_BiasCorrection.R
+++ b/tests/testthat/test-CST_BiasCorrection.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_BiasCorrection tests")
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-CST_Calibration.R b/tests/testthat/test-CST_Calibration.R
index e6aef6f6..64a09e5a 100644
--- a/tests/testthat/test-CST_Calibration.R
+++ b/tests/testthat/test-CST_Calibration.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_Calibration tests")
-
 ##############################################
 
 # dat
diff --git a/tests/testthat/test-CST_CategoricalEnsCombination.R b/tests/testthat/test-CST_CategoricalEnsCombination.R
index 2dfc4a03..a52f822b 100644
--- a/tests/testthat/test-CST_CategoricalEnsCombination.R
+++ b/tests/testthat/test-CST_CategoricalEnsCombination.R
@@ -1,6 +1,5 @@
-context("CSTools::CST_CategoricalEnsCombination tests")
-
 ##############################################
+
 # dat1
 dat_exp <- array(abs(rnorm(4*6*3*4*4))*275, dim = c(dataset = 1, member = 4, sdate = 6, 
                                                     ftime = 3, lat = 4, lon = 4))
diff --git a/tests/testthat/test-CST_EnsClustering.R b/tests/testthat/test-CST_EnsClustering.R
index afbe1598..3415a489 100644
--- a/tests/testthat/test-CST_EnsClustering.R
+++ b/tests/testthat/test-CST_EnsClustering.R
@@ -1,6 +1,5 @@
-context("CSTools::CST_EnsClustering tests")
-
 ##############################################
+
 # dat1
 data <- rnorm(2 * 10 * 4 * 5 * 6 * 7)
 dim(data) <- c(dataset = 2, member = 10,
diff --git a/tests/testthat/test-CST_InsertDim.R b/tests/testthat/test-CST_InsertDim.R
index 39e5ade8..c4f4b1d8 100644
--- a/tests/testthat/test-CST_InsertDim.R
+++ b/tests/testthat/test-CST_InsertDim.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_InsertDim tests")
-
 ##############################################
 exp <- lonlat_temp$exp
 ##############################################
diff --git a/tests/testthat/test-CST_MergeDims.R b/tests/testthat/test-CST_MergeDims.R
index 45bcd8e9..0717a306 100644
--- a/tests/testthat/test-CST_MergeDims.R
+++ b/tests/testthat/test-CST_MergeDims.R
@@ -1,4 +1,5 @@
-context("Generic tests")
+##############################################
+
 test_that("Sanity checks", {
   expect_error(
     CST_MergeDims(data = 1),
diff --git a/tests/testthat/test-CST_MultiEOF.R b/tests/testthat/test-CST_MultiEOF.R
index f4843231..66a63525 100644
--- a/tests/testthat/test-CST_MultiEOF.R
+++ b/tests/testthat/test-CST_MultiEOF.R
@@ -1,6 +1,3 @@
-context("CSTools::CST_MultiEOF tests")
-
-
 ##############################################
 
 # exp1, exp2, exp03
diff --git a/tests/testthat/test-CST_MultiMetric.R b/tests/testthat/test-CST_MultiMetric.R
index 5c45e6a5..952ec5b7 100644
--- a/tests/testthat/test-CST_MultiMetric.R
+++ b/tests/testthat/test-CST_MultiMetric.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_MultiMetric")
-
 ################################################################################
 
 # dat
diff --git a/tests/testthat/test-CST_MultivarRMSE.R b/tests/testthat/test-CST_MultivarRMSE.R
index b9f93f68..f7bc347c 100644
--- a/tests/testthat/test-CST_MultivarRMSE.R
+++ b/tests/testthat/test-CST_MultivarRMSE.R
@@ -1,4 +1,4 @@
-context("CSTools::CST_MultivarRMSE tests")
+##############################################
 
 # dat1
 set.seed(1)
diff --git a/tests/testthat/test-CST_ProxiesAttractor.R b/tests/testthat/test-CST_ProxiesAttractor.R
index 65831b24..ce585e0b 100644
--- a/tests/testthat/test-CST_ProxiesAttractor.R
+++ b/tests/testthat/test-CST_ProxiesAttractor.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_ProxiesAttractor tests")
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-CST_QuantileMapping.R b/tests/testthat/test-CST_QuantileMapping.R
index a086ab93..e12f1d9a 100644
--- a/tests/testthat/test-CST_QuantileMapping.R
+++ b/tests/testthat/test-CST_QuantileMapping.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_QuantileMapping tests")
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-CST_RFSlope.R b/tests/testthat/test-CST_RFSlope.R
index f08d3a59..a4411b4f 100644
--- a/tests/testthat/test-CST_RFSlope.R
+++ b/tests/testthat/test-CST_RFSlope.R
@@ -1,6 +1,5 @@
-context("CSTools::CST_RFSlope tests")
-
 ##############################################
+
 # dat1
 data <- rnorm(2 * 10 * 4 * 5 * 6 * 7)
 dim(data) <- c(dataset = 2, member = 10,
diff --git a/tests/testthat/test-CST_RFTemp.R b/tests/testthat/test-CST_RFTemp.R
index 325b260b..334a8909 100644
--- a/tests/testthat/test-CST_RFTemp.R
+++ b/tests/testthat/test-CST_RFTemp.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_RFTemp tests")
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-CST_RFWeights.R b/tests/testthat/test-CST_RFWeights.R
index 68b45830..bb11f336 100644
--- a/tests/testthat/test-CST_RFWeights.R
+++ b/tests/testthat/test-CST_RFWeights.R
@@ -1,6 +1,5 @@
-context("CSTools::CST_RFTWeights tests")
-
 ##############################################
+
 # dat1
 data <- rnorm(2 * 10 * 4 * 5 * 6 * 6)
 dim(data) <- c(dataset = 2, member = 10,
diff --git a/tests/testthat/test-CST_RainFARM.R b/tests/testthat/test-CST_RainFARM.R
index c014cfdc..dcb7dc6f 100644
--- a/tests/testthat/test-CST_RainFARM.R
+++ b/tests/testthat/test-CST_RainFARM.R
@@ -1,6 +1,5 @@
-context("CSTools::CST_RFSlope tests")
-
 ##############################################
+
 # dat1
 data <- rnorm(2 * 10 * 4 * 5 * 6 * 7)
 dim(data) <- c(dataset = 2, member = 10,
diff --git a/tests/testthat/test-CST_RegimesAssign.R b/tests/testthat/test-CST_RegimesAssign.R
index 456aaf81..f7c835c1 100644
--- a/tests/testthat/test-CST_RegimesAssign.R
+++ b/tests/testthat/test-CST_RegimesAssign.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_RegimesAssign")
-
 ##############################################
 
 test_that("1. Input checks", {
diff --git a/tests/testthat/test-CST_SaveExp.R b/tests/testthat/test-CST_SaveExp.R
index 00630d61..7f633270 100644
--- a/tests/testthat/test-CST_SaveExp.R
+++ b/tests/testthat/test-CST_SaveExp.R
@@ -1,4 +1,3 @@
-context("CSTools::CST_SaveExp tests")
 ##############################################
 
 # cube0
diff --git a/tests/testthat/test-CST_SplitDim.R b/tests/testthat/test-CST_SplitDim.R
index c2652477..0c8f2e01 100644
--- a/tests/testthat/test-CST_SplitDim.R
+++ b/tests/testthat/test-CST_SplitDim.R
@@ -1,6 +1,3 @@
-context("CSTools::CST_SplitDim tests")
-
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-CST_Subset.R b/tests/testthat/test-CST_Subset.R
index 9123000b..2d270e38 100644
--- a/tests/testthat/test-CST_Subset.R
+++ b/tests/testthat/test-CST_Subset.R
@@ -1,5 +1,3 @@
-context("CSTools::CST_Subset tests")
-
 ##############################################
 
 library(startR)
diff --git a/tests/testthat/test-CST_WeatherRegimes.R b/tests/testthat/test-CST_WeatherRegimes.R
index ebf8730d..796c5519 100644
--- a/tests/testthat/test-CST_WeatherRegimes.R
+++ b/tests/testthat/test-CST_WeatherRegimes.R
@@ -1,6 +1,5 @@
-context("Generic tests")
-
 ##############################################
+
 # dat1
 data <- rnorm(2 * 10 * 4 * 5 * 6 * 7)
 dim(data) <- c(dataset = 2, member = 10,
diff --git a/tests/testthat/test-PlotForecastPDF.R b/tests/testthat/test-PlotForecastPDF.R
index f39b9667..9a831ede 100644
--- a/tests/testthat/test-PlotForecastPDF.R
+++ b/tests/testthat/test-PlotForecastPDF.R
@@ -1,4 +1,5 @@
-context("Generic tests")
+##############################################
+
 test_that("Sanity checks", {
   expect_error(
     PlotForecastPDF(fcst, tercile.limits),
diff --git a/tests/testthat/test-PlotPDFsOLE.R b/tests/testthat/test-PlotPDFsOLE.R
index 91e61d08..68f5ada2 100644
--- a/tests/testthat/test-PlotPDFsOLE.R
+++ b/tests/testthat/test-PlotPDFsOLE.R
@@ -1,4 +1,4 @@
-context("Generic tests")
+##############################################
 
 test_that("Sanity checks", {
   pdf_1 <- c(1.1,0.6)
diff --git a/tests/testthat/test-PlotTriangles4Categories.R b/tests/testthat/test-PlotTriangles4Categories.R
index 8105cc91..40a8b25b 100644
--- a/tests/testthat/test-PlotTriangles4Categories.R
+++ b/tests/testthat/test-PlotTriangles4Categories.R
@@ -1,4 +1,5 @@
-context("Generic tests")
+##############################################
+
 test_that("Sanity checks", {
   expect_error(
     PlotTriangles4Categories(data = 1:20),
diff --git a/tests/testthat/test-PlotWeeklyClim.R b/tests/testthat/test-PlotWeeklyClim.R
index e7886fbc..19aae749 100644
--- a/tests/testthat/test-PlotWeeklyClim.R
+++ b/tests/testthat/test-PlotWeeklyClim.R
@@ -1,5 +1,3 @@
-context("CSTools::PlotWeeklyClim tests")
-
 ##############################################
 
 # dat1
diff --git a/tests/testthat/test-as.s2dv_cube.R b/tests/testthat/test-as.s2dv_cube.R
index 4872c9c3..f2343080 100644
--- a/tests/testthat/test-as.s2dv_cube.R
+++ b/tests/testthat/test-as.s2dv_cube.R
@@ -1,5 +1,3 @@
-context("CSTools::as.s2dv_cube tests")
-
 ##############################################
 library(startR)
 library(s2dv)
diff --git a/tests/testthat/test-s2dv_cube.R b/tests/testthat/test-s2dv_cube.R
index a88f6eec..1088b4ce 100644
--- a/tests/testthat/test-s2dv_cube.R
+++ b/tests/testthat/test-s2dv_cube.R
@@ -1,5 +1,3 @@
-context("CSTools::s2dv_cube tests")
-
 ##############################################
 
 # dat1
-- 
GitLab