Use normal output instead of message

Author: hsonne

R/getInspectionRecords_v2.R

@@ -125,39 +125,42 @@ textblockToDataframe <- function(
 }
 
 # getColumnsToRemove -----------------------------------------------------------
+#' @importFrom kwb.utils allAreEqual catIf printIf stringList
 getColumnsToRemove <- function(x, captions, duplicates, dbg = TRUE)
 {
+  catIf <- kwb.utils::catIf
+  
   columnsToRemove <- numeric()
 
   for (duplicate in duplicates) {
 
-    message("Column '", duplicate, "' exists multiple times!")
+    catIf(dbg, sprintf("Column '%s' exists multiple times!\n", duplicate))
 
     columns <- which(captions == duplicate)    
 
     allEqualInRow <- apply(x[, columns], MARGIN = 1, kwb.utils::allAreEqual)
 
     if (all(allEqualInRow)) {
 
-      columnsToRemove <- c(columnsToRemove, columns[-1])
+      columnsToRemove <- c(columnsToRemove, columns[-1L])
 
-      message(
-        "For each row, the values in the duplicated rows are equal ",
-        "-> I removed the duplicated columns!"
+      catIf(
+        dbg, "For each row, the values in the duplicated rows are equal ",
+        "-> I removed the duplicated columns.\n"
       )
 
       if (dbg) {
-        
-        cat("The values in the duplicated columns are:\n")
-        
-        x.output <- x[, columns]
-        
-        print(x.output[! duplicated(x.output), ])
+        x.out <- x[, columns]
+        kwb.utils::printIf(
+          TRUE, 
+          x = x.out[! duplicated(x.out), ], 
+          caption = "The values in the duplicated columns are"
+        )
       }
     }    
 
-    kwb.utils::catIf(
-      dbg && length(columnsToRemove) > 0, 
+    catIf(
+      dbg && length(columnsToRemove), 
       "columnsToRemove:", kwb.utils::stringList(columnsToRemove), "\n"
     )
   }    

tests/testthat/test-function-cleanDuplicatedColumns.R

@@ -1,3 +1,5 @@
+#library(testthat)
+
 test_that("cleanDuplicatedColumns() works", {
 
   f <- kwb.en13508.2:::cleanDuplicatedColumns
@@ -6,7 +8,7 @@ test_that("cleanDuplicatedColumns() works", {
 
   x <- data.frame(a.x = 1:2, a.y = 1:2, id = 1:2)
 
-  expect_output(result <- f(x))
+  expect_message(capture.output(result <- f(x)))
 
   expect_identical(result, stats::setNames(x[, -2L, ], c("a", "id")))
 })