Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Package: acro
Title: A Tool for Semi-Automating the Statistical Disclosure Control of
Research Outputs
Version: 1.0.0
Version: 1.1.0
Authors@R: c(
person("Jim", "Smith", , "James.Smith@uwe.ac.uk", role = c("cre", "ctb"),
comment = c(ORCID = "0000-0001-7908-1859")),
person("Maha", "Albashir", , "Maha.Albashir@uwe.ac.uk", role = c("aut", "ctb")),
person("Richard John", "Preen", , "Richard2.Preen@uwe.ac.uk", role = c("aut", "ctb"),
comment = c(ORCID = "0000-0003-3351-8132"))
)
Maintainer: Jim Smith <James.Smith@uwe.ac.uk>
Maintainer: Maha Albashir <Maha.Albashir@uwe.ac.uk>
Description: A Tool for Semi-Automating the Statistical Disclosure Control
of Research Outputs.
License: MIT + file LICENSE
Expand All @@ -28,13 +28,13 @@ Imports:
rlang,
tibble,
tidyselect,
utils,
survival
utils
Suggests:
knitr,
rmarkdown,
spelling,
testthat (>= 3.0.0)
testthat (>= 3.0.0),
survival
VignetteBuilder:
knitr
Config/roxygen2/version: 8.1.1
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#acro 1.1.0
* Added support for Cox Proportional Hazards

# acro 1.0.0
* Added support for tidyverse e.g. piping and the summarise() method
* Added support for rounding as a mitigation strategy for tables
Expand Down
13 changes: 13 additions & 0 deletions tests/testthat/test-acro_coxph.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ test_that("acro_coxph without initialising ACRO object first", {
})

test_that("acro_coxph throws an error with multi-state arguments", {
testthat::skip_on_cran()
acro_init()
expect_error(
acro_coxph(Surv(time, status) ~ age + ph.karno, data = test_data, istate = 1),
Expand All @@ -19,6 +20,7 @@ test_that("acro_coxph throws an error with multi-state arguments", {
})

test_that("acro_coxph validates the left side of the formula uses Surv() function", {
testthat::skip_on_cran()
acro_init()
expect_error(
acro_coxph(time ~ age + ph.karno, data = test_data),
Expand All @@ -27,6 +29,7 @@ test_that("acro_coxph validates the left side of the formula uses Surv() functio
})

test_that("acro_coxph works", {
testthat::skip_on_cran()
acro_init()

# R Survival model
Expand All @@ -50,6 +53,7 @@ test_that("acro_coxph works", {
})

test_that("acro_coxph with subsetting", {
testthat::skip_on_cran()
acro_init()

# R Survival model
Expand All @@ -73,6 +77,7 @@ test_that("acro_coxph with subsetting", {
})

test_that("acro_coxph with na.action", {
testthat::skip_on_cran()
acro_init()

# R Survival model
Expand All @@ -96,6 +101,7 @@ test_that("acro_coxph with na.action", {
})

test_that("acro_coxph with invalid status options(eg. having a status as 4)", {
testthat::skip_on_cran()
acro_init()
test_data$status[test_data$status == 1] <- 4

Expand All @@ -106,6 +112,7 @@ test_that("acro_coxph with invalid status options(eg. having a status as 4)", {
})

test_that("acro_coxph with weights as a column from the dataset", {
testthat::skip_on_cran()
acro_init()

# add a weight column in the dataset
Expand All @@ -131,6 +138,7 @@ test_that("acro_coxph with weights as a column from the dataset", {
})

test_that("acro_coxph with weights as a string column name from the dataset", {
testthat::skip_on_cran()
acro_init()

# add a weight column in the dataset
Expand All @@ -156,6 +164,7 @@ test_that("acro_coxph with weights as a string column name from the dataset", {
})

test_that("acro_coxph with weights provided by the user", {
testthat::skip_on_cran()
acro_init()

# define a vector weight
Expand All @@ -180,6 +189,7 @@ test_that("acro_coxph with weights provided by the user", {
})

test_that("acro_coxph with cluster as a column in the dataset", {
testthat::skip_on_cran()
acro_init()

# R Survival model
Expand All @@ -202,6 +212,7 @@ test_that("acro_coxph with cluster as a column in the dataset", {
})

test_that("acro_coxph with cluster as a quoted column name in the dataset", {
testthat::skip_on_cran()
acro_init()

# R Survival model
Expand All @@ -224,6 +235,7 @@ test_that("acro_coxph with cluster as a quoted column name in the dataset", {
})

test_that("acro_coxph with cluster provided by the user", {
testthat::skip_on_cran()
acro_init()

# define a cluster vector
Expand All @@ -249,6 +261,7 @@ test_that("acro_coxph with cluster provided by the user", {
})

test_that("acro_coxph warns on unused arguments in ...", {
testthat::skip_on_cran()
acro_init()

expect_warning(
Expand Down
Loading