From 4968b642fb462f4738887d09186196e6039fd715 Mon Sep 17 00:00:00 2001
From: LucieContamin <CONTAMIN@pitt.edu>
Date: Mon, 12 May 2025 11:51:22 -0400
Subject: [PATCH 1/2] fix message err

---
 R/imports-hubValidations.R       | 31 ++++++++++++++++---------------
 tests/testthat/test_submission.R |  4 ++--
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/R/imports-hubValidations.R b/R/imports-hubValidations.R
index 7e85c8f..e86234d 100644
--- a/R/imports-hubValidations.R
+++ b/R/imports-hubValidations.R
@@ -131,9 +131,9 @@ compare_values_to_config <- function(tbl, output_type, output_type_config) {
     details <-
       c(details,
         cli::format_inline("{cli::qty(length(invalid_vals))} Value{?s} ",
-                           "{.val {invalid_vals}}\n        cannot be coerced ",
-                           "to expected data type {.val {values_type}}\n      ",
-                           "  for output type {.val {output_type}}."))
+                           "{.val {invalid_vals}} cannot be coerced ",
+                           "to expected data type {.val {values_type}} ",
+                           "for output type {.val {output_type}}."))
     if (length(invalid_vals) > 0) values <- stats::na.omit(values)
     if (length(values) == 0L) return(details)
   }
@@ -144,8 +144,8 @@ compare_values_to_config <- function(tbl, output_type, output_type_config) {
     details <-
       c(details,
         cli::format_inline("{cli::qty(length(invalid_int$vals))} Value{?s} ",
-                           "{.val {invalid_int$vals}}\n        cannot be ",
-                           "coerced to expected data type\n        ",
+                           "{.val {invalid_int$vals}}cannot be ",
+                           "coerced to expected data type ",
                            "{.val {values_type}} for output type ",
                            "{.val {output_type}}."))
   }
@@ -156,11 +156,11 @@ compare_values_to_config <- function(tbl, output_type, output_type_config) {
       details <-
         c(details,
           cli::format_inline("{cli::qty(sum(is_invalid))} Value{?s} ",
-                             "{.val {unique(values[is_invalid])}}\n           ",
-                             "     {cli::qty(sum(is_invalid))}{?is/are}\n     ",
-                             "           greater than allowed maximum value ",
-                             "{.val {value_max}} for output type\n         ",
-                             " {.val {output_type}}."))
+                             "{.val {unique(values[is_invalid])}} ",
+                             "{cli::qty(sum(is_invalid))}{?is/are} ",
+                             "greater than allowed maximum value ",
+                             "{.val {value_max}} for output type ",
+                             "{.val {output_type}}."))
     }
   }
   if (any(names(config) == "minimum")) {
@@ -170,10 +170,10 @@ compare_values_to_config <- function(tbl, output_type, output_type_config) {
       details <-
         c(details,
           cli::format_inline("{cli::qty(sum(is_invalid))} Value{?s} ",
-                             "{.val {unique(values[is_invalid])}}\n           ",
-                             "     {cli::qty(sum(is_invalid))}{?is/are}\n     ",
-                             "           smaller than allowed minimum value ",
-                             "{.val {value_min}} for output type\n          ",
+                             "{.val {unique(values[is_invalid])}} ",
+                             "{cli::qty(sum(is_invalid))}{?is/are} ",
+                             "smaller than allowed minimum value ",
+                             "{.val {value_min}} for output type ",
                              "{.val {output_type}}."))
     }
   }
@@ -222,7 +222,8 @@ check_tbl_value_col <- function(tbl, round_id, file_path, hub_path) {
     msg_subject = "Values in column {.var value}",
     msg_verbs = c("all", "are not all"),
     msg_attribute = "valid with respect to modeling task config.",
-    details = details
+    details = details,
+    error = TRUE
   )
 }
 
diff --git a/tests/testthat/test_submission.R b/tests/testthat/test_submission.R
index 0310b67..fe66f59 100644
--- a/tests/testthat/test_submission.R
+++ b/tests/testthat/test_submission.R
@@ -288,7 +288,7 @@ test_that("Test validation process", {
   check <- validate_submission(path_f, hub_path,
                                merge_sample_col = merge_sample_col)
   expect_contains(attr(check$value_col_valid, "class"),
-                  c("error", "check_failure"))
+                  c("error", "check_error"))
   expect_contains(attr(check$na_value, "class"), c("error", "check_error"))
 
   ### Negative value -----------
@@ -306,7 +306,7 @@ test_that("Test validation process", {
   check <- validate_submission(path_f, hub_path,
                                merge_sample_col = merge_sample_col)
   expect_contains(attr(check$value_col_valid, "class"),
-                  c("error", "check_failure"))
+                  c("error", "check_error"))
 
   ### Greater than population size -----------
   df <-

From 35a821ca12276ac9f0e3e525c0224c104ca5740c Mon Sep 17 00:00:00 2001
From: LucieContamin <CONTAMIN@pitt.edu>
Date: Mon, 12 May 2025 11:52:37 -0400
Subject: [PATCH 2/2] update NEWS

---
 NEWS.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS.md b/NEWS.md
index 9aa0068..15c8429 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -6,6 +6,8 @@
     ignore stopping the validation if any `[valid_vals]` error (#40)
 -   add parameter `store_msg_val()` function to remove valid check (and non 
     compound id check) on output of the function (#44)
+-   fix message output style by removing unnecessary new line and output an 
+    error if a value is incorrect instead of failure (#46)
 
 # SMHvalidation 1.0.0