Merge pull request #249 from chroetz/adapt-test

use cs2 instead of cs1 in test-convGDX2mif
pik-piam · May 5, 2022 · 77362f7 · 77362f7
2 parents c97b30f + 2d2c9d3
commit 77362f7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '35668590'
+ValidationKey: '35689572'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

diff --git a/.zenodo.json b/.zenodo.json
@@ -1,6 +1,6 @@
 {
   "title": "remind2: The REMIND R package (2nd generation)",
-  "version": "1.86.6",
+  "version": "1.86.7",
   "description": "<p>Contains the REMIND-specific routines for data and model output manipulation.<\/p>",
   "creators": [
     {

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: remind2
 Type: Package
 Title: The REMIND R package (2nd generation)
-Version: 1.86.6
-Date: 2022-05-03
+Version: 1.86.7
+Date: 2022-05-04
 Authors@R: as.person(c(
     "Renato Rodrigues <[email protected]> [aut,cre]"))
 Description: Contains the REMIND-specific routines for data and model output manipulation.

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # The REMIND R package (2nd generation)
 
-R package **remind2**, version **1.86.6**
+R package **remind2**, version **1.86.7**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2)  [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/ui#builds)
 
@@ -47,7 +47,7 @@ In case of questions / problems please contact Renato Rodrigues <renato.rodrigue
 
 To cite package **remind2** in publications use:
 
-Rodrigues R (2022). _remind2: The REMIND R package (2nd generation)_. R package version 1.86.6, <URL: https://github.com/pik-piam/remind2>.
+Rodrigues R (2022). _remind2: The REMIND R package (2nd generation)_. R package version 1.86.7, <URL: https://github.com/pik-piam/remind2>.
 
 A BibTeX entry for LaTeX users is
 
@@ -56,7 +56,7 @@ A BibTeX entry for LaTeX users is
   title = {remind2: The REMIND R package (2nd generation)},
   author = {Renato Rodrigues},
   year = {2022},
-  note = {R package version 1.86.6},
+  note = {R package version 1.86.7},
   url = {https://github.com/pik-piam/remind2},
 }
 ```
diff --git a/tests/testthat/test-convGDX2mif.R b/tests/testthat/test-convGDX2mif.R
@@ -90,9 +90,15 @@ test_that("Test if REMIND reporting is produced as it should and check data inte
   if (!file.exists(histMif)) {
     utils::download.file("https://rse.pik-potsdam.de/data/example/historical.mif", histMif, quiet = TRUE)
   }
-  scenarioComparisonPath <- file.path(tempdir(), "scenarioComparison.pdf")
-  suppressWarnings(compareScenarios(myMifs, histMif, fileName = scenarioComparisonPath))
-  expect_true(file.exists(scenarioComparisonPath))
+  capture.output( # Do not show stdout text.
+    compareScenarios2(
+      mifScen = myMifs,
+      mifHist = histMif,
+      outputFormat = "pdf",
+      outputFile = "cs2_test",
+      outputDir = tempdir(),
+      sections = 0)) # Render only the info section.
+  expect_true(file.exists(file.path(tempdir(), "cs2_test.pdf")))
   unlink(tempdir(), recursive = TRUE)
   tempdir(TRUE)
 })