From 8cb6055b159c0e334c1716faa13e86216daed363 Mon Sep 17 00:00:00 2001
From: cedricbriandgithub <cedric.briand@eptb-vilaine.fr>
Date: Wed, 15 Mar 2023 11:32:21 +0100
Subject: [PATCH] fix : error vector_to_list_sql when no AGG stage present in
one pass.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Now the error raised is "Pas de données pour ce dispositif de comptage et ce taxon"
---
R/report_silver_eel.R | 4 ++--
tests/testthat/test-08-report_silver_eel.R | 20 +++++++++++++++++++-
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/R/report_silver_eel.R b/R/report_silver_eel.R
index 1aa20b4..51a7ed8 100644
--- a/R/report_silver_eel.R
+++ b/R/report_silver_eel.R
@@ -229,8 +229,8 @@ setMethod(
charge_with_filter(
object = r_silver@par,
r_silver@dc@dc_selected,
- r_silver@taxa@taxa_selected,
- r_silver@stage@stage_selected
+ 2038,
+ 'AGG'
)
r_silver@par <- choice_c(r_silver@par, par, silent = silent)
r_silver@horodatedebut <- choice_c(
diff --git a/tests/testthat/test-08-report_silver_eel.R b/tests/testthat/test-08-report_silver_eel.R
index 476d9b4..d3cadfc 100644
--- a/tests/testthat/test-08-report_silver_eel.R
+++ b/tests/testthat/test-08-report_silver_eel.R
@@ -2,7 +2,7 @@ context("report_silver_eel")
test_that(
- "test creating an instance of report_silver_eel with data loaded (fd80 schema required)",
+ "test creating an instance of report_silver_eel with data loaded",
{
skip_on_cran()
stacomi(database_expected = TRUE, sch ='test')
@@ -30,3 +30,21 @@ test_that(
}
)
+
+test_that(
+ "report silver eel doesn't crashes at choice_c when no silver",
+ {
+ skip_on_cran()
+ stacomi(database_expected = TRUE, sch ='test')
+ env_set_test_stacomi()
+ r_silver <- new("report_silver_eel")
+ expect_error(r_silver <- choice_c(
+ r_silver,
+ dc = 10,
+ horodatedebut = "2012-09-01",
+ horodatefin = "2014-10-04",
+ silent = TRUE
+ ))
+ rm(list = ls(envir = envir_stacomi), envir = envir_stacomi)
+ }
+)
--
GitLab