From ecb16cb6eb5015bc3e3bc2a0c379c8ac7025bb18 Mon Sep 17 00:00:00 2001 From: orichters Date: Fri, 21 Jun 2024 09:04:25 +0200 Subject: [PATCH] adjust tests to SSP2EU -> SSP2 rename --- R/loadModeltest.R | 4 ++-- tests/testthat/test-convGDX2mif.R | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/R/loadModeltest.R b/R/loadModeltest.R index 2e05a2e6..a60e9e77 100644 --- a/R/loadModeltest.R +++ b/R/loadModeltest.R @@ -117,14 +117,14 @@ cs2InputPaths <- function(outputDirs) { #' ssp1 <- new.env() #' ssp2eu <- new.env() #' loadModeltest(ssp1, "^SSP1-AMT-") -#' loadModeltest(ssp2eu, "^SSP2EU-.*-AMT$") +#' loadModeltest(ssp2eu, "^SSP2-.*-AMT$") #' ssp1$data #' ssp2eu$data #' } #' @export loadModeltest <- function( envir = globalenv(), - namePattern = "^SSP2EU-.*-AMT$", + namePattern = "^SSP2-.*-AMT$", folder = tempdir() ) { diff --git a/tests/testthat/test-convGDX2mif.R b/tests/testthat/test-convGDX2mif.R index 587b4e9d..77ae6a54 100644 --- a/tests/testthat/test-convGDX2mif.R +++ b/tests/testthat/test-convGDX2mif.R @@ -13,9 +13,9 @@ library(gdx) test_that("Test if REMIND reporting is produced as it should and check data integrity", { skip_if_not(as.logical(gdxrrw::igdx(silent = TRUE)), "gdxrrw is not initialized properly") - # GDXs for comparison. Once the remind2::reportEmi does not report negative gross emissions we will switch to SSP2EU-EU21-PkBudg and SSP2EU-NPi + # GDXs for comparison. Once the remind2::reportEmi does not report negative gross emissions we will switch to SSP2-EU21-PkBudg and SSP2-NPi gdxList <- c("fulldata-release.gdx" = "https://rse.pik-potsdam.de/data/example/remind2_test-convGDX2MIF_SSP2EU-EU21-NPi_2024-03-28_10.23.13.gdx", - "fulldata-AMT.gdx" = "https://rse.pik-potsdam.de/data/example/remind2_test-convGDX2MIF_SSP2EU-PkBudg650-AMT.gdx") + "fulldata-AMT.gdx" = "https://rse.pik-potsdam.de/data/example/remind2_test-convGDX2MIF_SSP2-PkBudg650-AMT.gdx") gdxPaths <- NULL for (i in seq_along(gdxList)) {