refactor: combine test files and reformat styling

pharmaverse · Jan 9, 2025 · 91ff80e · 91ff80e
1 parent 93c0a53
commit 91ff80e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 40 deletions.
diff --git a/inst/shiny/modules/column_mapping.R b/inst/shiny/modules/column_mapping.R
@@ -11,9 +11,7 @@
 #' @examples
 #' column_mapping_widget(ns = NS("example"), id = "STUDYID",
 #' tooltip_text = "Select the study identifier column.")
-#'
-#' @export
-column_mapping_widget <- function(ns, id, tooltip_text) {
+.column_mapping_widget <- function(ns, id, tooltip_text) {
   div(
     class = "column-mapping-row",
     tooltip(
@@ -28,11 +26,11 @@ column_mapping_widget <- function(ns, id, tooltip_text) {
     ),
     div(
       class = "column-mapping-output",
-      span(paste0(id, ":"), style = "color: black; font-size: normal;")
+      span(paste0(id, ":"))
     ),
     div(
       class = "column-mapping-label",
-      span(textOutput(ns(paste0("label_", id))), style = "color: grey;")
+      span(textOutput(ns(paste0("label_", id))))
     )
   )
 }

diff --git a/inst/shiny/www/style.css b/inst/shiny/www/style.css
@@ -29,16 +29,12 @@
 }
 
 .column-mapping-output {
-  margin-left: 0.625rem;
-  margin-top: 1.25rem;
-  margin-bottom: 0;
+  margin: 1.25rem 0 0 0.625rem;
   color: black;
 }
 
 .column-mapping-label {
-  margin-left: 0.625rem;
-  margin-top: 1.25rem;
-  margin-bottom: 0;
+  margin: 1.25rem 0 0 0.625rem;
   color: grey;
 }
 

diff --git a/tests/testthat/test-apply_labels.R b/tests/testthat/test-apply_labels.R
@@ -1,15 +1,17 @@
+LABELS <- data.frame(
+  Variable = c("USUBJID", "AVAL"),
+  Label = c("Unique Subject Identifier", "Analysis Value"),
+  Dataset = c("ADPC", "ADPC")
+)
+
 describe("apply_labels", {
   it("applies labels to matching data", {
     data <- data.frame(
       USUBJID = c(1, 2, 3),
       AVAL = c(4, 5, 6)
     )
-    labels <- data.frame(
-      Variable = c("USUBJID", "AVAL"),
-      Label = c("Unique Subject Identifier", "Analysis Value"),
-      Dataset = c("ADPC", "ADPC")
-    )
-    data <- apply_labels(data, labels, "ADPC")
+
+    data <- apply_labels(data, LABELS, "ADPC")
     expect_equal(attr(data$USUBJID, "label"), "Unique Subject Identifier")
     expect_equal(attr(data$AVAL, "label"), "Analysis Value")
 
@@ -19,13 +21,21 @@ describe("apply_labels", {
       COL1 = c(1, 2, 3),
       COL2 = c(4, 5, 6)
     )
-    labels <- data.frame(
-      Variable = c("USUBJID", "AVAL"),
-      Label = c("Unique Subject Identifier", "Analysis Value"),
-      Dataset = c("ADPC", "ADPC")
-    )
-    data <- apply_labels(data, labels, "ADPC")
+
+    data <- apply_labels(data, LABELS, "ADPC")
     expect_equal(attr(data$COL1, "label"), "COL1")
     expect_equal(attr(data$COL2, "label"), "COL2")
   })
 })
+
+describe("get_label", {
+  it("gets correct label from LABELs dataframe", {
+
+    get_label(LABELS, "USUBJID", "ADPC")
+    get_label(LABELS, "HEIGHT", "ADPC")
+
+    expect_equal(get_label(LABELS, "USUBJID", "ADPC"), "Unique Subject Identifier")
+    expect_equal(get_label(LABELS, "HEIGHT", "ADPC"), "No label available")
+
+  })
+})
diff --git a/tests/testthat/test-get_label.R b/tests/testthat/test-get_label.R
@@ -1,17 +0,0 @@
-LABELS <- data.frame(
-  Variable = c("USUBJID", "AVAL"),
-  Label = c("Unique Subject Identifier", "Analysis Value"),
-  Dataset = c("ADPC", "ADPC")
-)
-
-describe("get_label", {
-  it("gets correct label from LABELs dataframe", {
-
-    get_label(LABELS, "USUBJID", "ADPC")
-    get_label(LABELS, "HEIGHT", "ADPC")
-
-    expect_equal(get_label(LABELS, "USUBJID", "ADPC"), "Unique Subject Identifier")
-    expect_equal(get_label(LABELS, "HEIGHT", "ADPC"), "No label available")
-
-  })
-})