From 31ef3f2cf76aabf4888831afe4c7fe302759fafe Mon Sep 17 00:00:00 2001
From: Greg Freedman Ellis <greg@crunch.io>
Date: Tue, 6 Aug 2024 09:52:08 -0500
Subject: [PATCH] [188037693]: fixes for integration tests

---
 R/as-data-frame.R                   |  2 +-
 tests/testthat/test-as-data-frame.R | 27 ++++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/R/as-data-frame.R b/R/as-data-frame.R
index c3bc7042a..6075371d9 100644
--- a/R/as-data-frame.R
+++ b/R/as-data-frame.R
@@ -162,7 +162,7 @@ csvColInfo <- function(ds, verbose = TRUE) {
             alias_info <- paste0(out$orig_alias[msg_rows], " -> ", out$cond_qualified_alias[msg_rows])
             message(
                 "Some column names are qualified because there were duplicate aliases ",
-                "in dataset: ", paste0(alias_info, collapse = ", ")
+                "in dataset:\n", paste0(alias_info, collapse = ", ")
             )
         }
     }
diff --git a/tests/testthat/test-as-data-frame.R b/tests/testthat/test-as-data-frame.R
index fea5aca2b..289d9eb2a 100644
--- a/tests/testthat/test-as-data-frame.R
+++ b/tests/testthat/test-as-data-frame.R
@@ -379,16 +379,10 @@ with_test_authentication({
         df <- as.data.frame(ds, force = TRUE, include.hidden = FALSE)
         expect_equal(names(df), c("v1", "v2", "v3", "v4", "v5", "vee six !"))
 
-        expect_warning(
-            df <- as.data.frame(ds, force = TRUE, include.hidden = TRUE),
-            "Variable hidden_var is hidden"
-        )
+        df <- as.data.frame(ds, force = TRUE, include.hidden = TRUE)
         expect_equal(names(df), c("v1", "v2", "v3", "v4", "v5", "vee six !", "hidden_var"))
 
-        expect_warning(
-            df <- as.data.frame(ds[, c("v1", "hidden_var")], force = TRUE),
-            "Variable hidden_var is hidden"
-        )
+        df <- as.data.frame(ds[, c("v1", "hidden_var")], force = TRUE)
         expect_equal(names(df), c("v1", "hidden_var"))
     })
 
@@ -397,13 +391,20 @@ with_test_authentication({
         mrds <- mrdf.setup(newDataset(mrdf, name = "test-mrdfmr"), selections = "1.0")
         mrds$MR2 <- deriveArray(
             list(
-                VarDef(ds$MR$mr_1, name = "dup mr_1", alias = "mr_1"),
-                VarDef(ds$MR$mr_2, name = "dup v4", alias = "v4")
+                VarDef(mrds$MR$mr_1, name = "dup mr_1", alias = "mr_1"),
+                VarDef(mrds$MR$mr_2, name = "dup v4", alias = "v4")
             ),
-            name = "MR 2"
+            name = "MR 2", numeric = FALSE
         )
-        mrds_df <- as.data.frame(mrds, force = TRUE)
-        expect_equal(ncol(mrds_df), 4)
+        expect_message(
+            mrds_df <- as.data.frame(mrds, force = TRUE),
+            paste0(
+                "Some column names are qualified because there were duplicate aliases ",
+                "in dataset:\nmr_1 -> MR[mr_1], mr_1 -> MR2[mr_1], v4 -> MR2[v4]"
+            )
+        )
+
+        expect_equal(ncol(mrds_df), 6)
         expect_equal(names(mrds_df), c("MR[mr_1]", "mr_2", "mr_3", "v4", "MR2[mr_1]", "MR2[v4]"))
         expect_equal(mrds_df[["MR[mr_1]"]], as.vector(mrds$MR$mr_1))
         expect_equal(mrds_df$mr_2, as.vector(mrds$MR$mr_2))