Merge pull request #481 from NOAA-FIMS/317-bug-remove-test-data-from-…

…fims-deterministic-folder

Remove test data from fims deterministic folder

.github/workflows/run-googletest.yml

@@ -16,6 +16,8 @@ jobs:
       matrix:
       # Use windows-2019 instead of windows-latest to avoid using Mingw-w64 
         os: [ubuntu-latest, macos-latest, windows-2019]
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
     - uses: actions/checkout@v3

.gitignore

@@ -97,6 +97,7 @@ src/tmp.def
 
 #Testing files
 tests/test_plan/FIMS_Integration_Test_Plan.log
+tests/integration/FIMS-deterministic-inputs/
 
 #vignettes
 inst/doc

CMakeLists.txt

@@ -76,6 +76,11 @@ EXECUTE_PROCESS(
 
 MESSAGE(STATUS "R_HOME is ${R_HOME}")
 
+EXECUTE_PROCESS(
+		COMMAND R "--slave" "--no-save" "-e" "remotes::install_local(upgrade = 'always')")
+EXECUTE_PROCESS(
+		COMMAND R "--slave" "--no-save" "-e" "FIMS:::setup_gtest()")
+
 # Enable testing for current directory and below
 enable_testing()
 

R/setup_gtest.R

@@ -25,7 +25,7 @@ setup_gtest <- function() {
       # write json file
       outputname <- paste0("C", c_case, "_om_output", i_iter, ".json")
       inputname <- paste0("C", c_case, "_om_input", i_iter, ".json")
-      json_folder <- file.path("tests", "integration", "inputs", "FIMS-deterministic")
+      json_folder <- file.path("tests", "integration", "FIMS-deterministic-inputs")
       if (!dir.exists(json_folder)) dir.create(json_folder)
       jsonlite::write_json(
         x = om_output, path = file.path(json_folder, outputname),

tests/gtest/integration_test_population.cpp

@@ -29,12 +29,12 @@ namespace
                 ss.str("");
                 // GoogleTest operates in the folder with executables "build/tests/gtest"
                 // so we have to go up three directories to get into FIMS folder
-                ss << "../../../tests/integration/inputs/FIMS-deterministic/C" <<c_case <<"_om_input" << i_iter + 1 << ".json";
+                ss << "../../../tests/integration/FIMS-deterministic-inputs/C" <<c_case <<"_om_input" << i_iter + 1 << ".json";
                 t.ReadJson(ss.str(), input_);
                 ss.str("");
 
                 // Read in outputs
-                ss << "../../../tests/integration/inputs/FIMS-deterministic/C" <<c_case <<"_om_output" << i_iter + 1 << ".json";
+                ss << "../../../tests/integration/FIMS-deterministic-inputs/C" <<c_case <<"_om_output" << i_iter + 1 << ".json";
                 t.ReadJson(ss.str(), output_);
                 input = input_.GetObject();
                 output = output_.GetObject();