tidying code

- updating incidence to use component modules - adding characterization UI tests - fixing R check issues in char incidence - updating resultTableServer manual
OHDSI · Aug 31, 2023 · c032db2 · c032db2
1 parent 7572855
commit c032db2
Show file tree

Hide file tree

Showing 9 changed files with 263 additions and 287 deletions.
diff --git a/R/characterization-incidence.R b/R/characterization-incidence.R
diff --git a/R/sccs-results-full.R b/R/sccs-results-full.R
@@ -96,6 +96,7 @@ sccsFullResultViewer <- function(id) {
 
 }
 
+
 sccsFullResultServer <- function(
     id,
     connectionHandler,
@@ -122,7 +123,6 @@ sccsFullResultServer <- function(
             "databaseName"
           ) %>%
           dplyr::rename(
-            #'Target' = .data$covariateName,
             'Outcome' = .data$outcome,
             'Analysis' = .data$description,
             'Database' = .data$databaseName

diff --git a/man/resultTableServer.Rd b/man/resultTableServer.Rd
diff --git a/tests/testthat/test-characterization-aggregate-features.R b/tests/testthat/test-characterization-aggregate-features.R
@@ -26,3 +26,10 @@ shiny::testServer(
     testthat::expect_true(!is.null(allData))
 
   })
+
+
+test_that("Test characterizationAggregateFeatures ui", {
+  # Test ui
+  ui <- characterizationAggregateFeaturesViewer(id = 'viewer')
+  checkmate::expect_list(ui)
+})
diff --git a/tests/testthat/test-characterization-cohorts.R b/tests/testthat/test-characterization-cohorts.R
@@ -27,3 +27,9 @@ shiny::testServer(
 
 
   })
+
+test_that("Test characterizationTable ui", {
+  # Test ui
+  ui <- characterizationTableViewer(id = 'viewer')
+  checkmate::expect_list(ui)
+})
diff --git a/tests/testthat/test-characterization-dechallengeRechallenge.R b/tests/testthat/test-characterization-dechallengeRechallenge.R
@@ -25,3 +25,9 @@ shiny::testServer(
     ##testthat::expect_true(!is.null(allData()))
 
   })
+
+test_that("Test characterizationDechallengeRechallenge ui", {
+  # Test ui
+  ui <- characterizationDechallengeRechallengeViewer(id = 'viewer')
+  checkmate::expect_list(ui)
+})
diff --git a/tests/testthat/test-characterization-incidence.R b/tests/testthat/test-characterization-incidence.R
@@ -15,8 +15,17 @@ shiny::testServer(
     testthat::expect_true(!is.null(cohorts$outcomeIds))
 
     # check input$generate does not crash app
-    session$setInputs(targetId = 1)
-    session$setInputs(outcomeId = 3)
-    session$setInputs(generate = T)
+    session$setInputs(`input-selection_targetId` = 1)
+    session$setInputs(`input-selection_outcomeId` = 3)
+    session$setInputs(`input-selection_generate` = T)
 
   })
+
+
+
+test_that("Test characterizationIncidence ui", {
+  # Test ui
+  ui <- characterizationIncidenceViewer(id = 'viewer')
+  checkmate::expect_list(ui)
+})
+
diff --git a/tests/testthat/test-characterization-main.R b/tests/testthat/test-characterization-main.R
@@ -18,6 +18,6 @@ shiny::testServer(
 
 test_that("Test characterization ui", {
   # Test ui
-  ui <- characterizationViewer()
+  ui <- characterizationViewer(id = 'viewer')
   checkmate::expect_list(ui)
 })
diff --git a/tests/testthat/test-characterization-timeToEvent.R b/tests/testthat/test-characterization-timeToEvent.R
@@ -23,3 +23,10 @@ shiny::testServer(
 
 
   })
+
+
+test_that("Test characterizationTimeToEvent ui", {
+  # Test ui
+  ui <- characterizationTimeToEventViewer(id = 'viewer')
+  checkmate::expect_list(ui)
+})