From 7cbab175eb489dfdb344eeef35f2dcdabdfc8191 Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.fr> Date: Tue, 13 Apr 2021 17:01:19 +0200 Subject: [PATCH] refactor(test): manage with case sensitivity of the QupstrUnit argument in CreateInputsModel and fix test Refs #110 --- R/CreateInputsModel.R | 3 ++- tests/testthat/test-RunModel_Lag.R | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/R/CreateInputsModel.R b/R/CreateInputsModel.R index 9ee5d4c6..e025c851 100644 --- a/R/CreateInputsModel.R +++ b/R/CreateInputsModel.R @@ -216,7 +216,8 @@ CreateInputsModel <- function(FUN_MOD, if(any(LengthHydro > 1000)) { warning("The unit of 'LengthHydro' has changed from m to km in v1.7 of airGR: values superior to 1000 km seem unrealistic") } - QupstrUnit <- match.arg(arg = QupstrUnit, choices = c("mm", "m3", "m3/s", "l/s", "L/s")) + QupstrUnit <- tolower(QupstrUnit) + QupstrUnit <- match.arg(arg = QupstrUnit, choices = c("mm", "m3", "m3/s", "l/s")) } ##check_NA_values diff --git a/tests/testthat/test-RunModel_Lag.R b/tests/testthat/test-RunModel_Lag.R index 3a7ed26e..d5ec5ff5 100644 --- a/tests/testthat/test-RunModel_Lag.R +++ b/tests/testthat/test-RunModel_Lag.R @@ -51,7 +51,7 @@ test_that("'QupstrUnit' must correspond to one possible value", { BasinAreas = BasinAreas, QupstrUnit = "m3/h" ), - regexp = "'QupstrUnit' must be one of these values: 'mm', 'm3', 'm3/s', 'L/s' or 'l/s'" + regexp = "'arg' should be one of “mmâ€, “m3â€, “m3/sâ€, “l/sâ€" ) }) -- GitLab