working tests GCAM6.0 and GCAM7.0 15

bc3LC · Aug 19, 2024 · 5a323b0 · 5a323b0
1 parent 7730b2d
commit 5a323b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/testthat/testReporter_v6.0.R b/tests/testthat/testReporter_v6.0.R
@@ -100,9 +100,8 @@ test_that("Test6_v6. load variable and get function", {
   load_variable(vv, GCAM_version = GCAM_version)
 
   testthat::expect(exists("ag_prices_wld"), "Loading variables function is broken.")
-  rm(list = ls())
 
-  get_elec_capital()
+  get_elec_capital(GCAM_version = GCAM_version)
   testthat::expect(exists("elec_capital_clean"), "get_elec_capital() function is broken.")
   testResult <- get(load(file.path(rprojroot::find_root(rprojroot::is_testthat), "testOutputs/v_6.0/result_test6.1.RData")))
   testthat::expect_equal(elec_capital_clean, testResult)

diff --git a/tests/testthat/testReporter_v7.0.R b/tests/testthat/testReporter_v7.0.R
@@ -41,6 +41,7 @@ library(magrittr)
 # })
 
 test_that("Test4_v7. run - dataset saved with output_file specified", {
+  rm(list = ls())
   generate_report(
     prj_name = file.path(rprojroot::find_root(rprojroot::is_testthat), "testInputs/v_7.0/test7.dat"), launch_ui = FALSE,
     output_file = file.path(rprojroot::find_root(rprojroot::is_testthat), "testOutputs/v_7.0/test7_output")