diff --git a/DESCRIPTION b/DESCRIPTION index 0eea5e5..357dd3a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -25,7 +25,7 @@ Imports: tibble, rmarkdown Suggests: - testthat, + testthat (>= 3.0.0), covr, DiagrammeR, dplyr, @@ -41,3 +41,4 @@ RoxygenNote: 7.3.1 VignetteBuilder: knitr URL: https://rapidsurveys.io/oldr/, https://github.com/rapidsurveys/oldr BugReports: https://github.com/rapidsurveys/oldr/issues +Config/testthat/edition: 3 diff --git a/README.Rmd b/README.Rmd index c9f0658..51f5307 100644 --- a/README.Rmd +++ b/README.Rmd @@ -17,15 +17,16 @@ knitr::opts_chunk$set( # oldr: An Implementation of the Rapid Assessment Method for Older People (RAM-OP) - + [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html#stable) [![R-CMD-check](https://github.com/rapidsurveys/oldr/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/rapidsurveys/oldr/actions/workflows/R-CMD-check.yaml) +[![R-hub](https://github.com/rapidsurveys/oldr/actions/workflows/rhub.yaml/badge.svg)](https://github.com/rapidsurveys/oldr/actions/workflows/rhub.yaml) [![test-coverage](https://github.com/rapidsurveys/oldr/actions/workflows/test-coverage.yaml/badge.svg)](https://github.com/rapidsurveys/oldr/actions/workflows/test-coverage.yaml) [![codecov](https://codecov.io/gh/rapidsurveys/oldr/branch/main/graph/badge.svg)](https://codecov.io/gh/rapidsurveys/oldr) [![CodeFactor](https://www.codefactor.io/repository/github/rapidsurveys/oldr/badge)](https://www.codefactor.io/repository/github/rapidsurveys/oldr) [![DOI](https://zenodo.org/badge/105472081.svg)](https://zenodo.org/badge/latestdoi/105472081) - + [HelpAge International](http://www.helpage.org), [VALID International](http://www.validinternational.org), and [Brixton Health](http://www.brixtonhealth.com), with financial assistance from the [Humanitarian Innovation Fund (HIF)](http://www.elrha.org/hif/home/), have developed a **Rapid Assessment Method for Older People (RAM-OP)** that provides accurate and reliable estimates of the needs of older people. The method uses simple procedures, in a short time frame (i.e. about two weeks including training, data collection, data entry, and data analysis), and at considerably lower cost than other methods. The **RAM-OP** method is based on the following principles: diff --git a/README.md b/README.md index e84b313..2654f0d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # oldr: An Implementation of the Rapid Assessment Method for Older People (RAM-OP) - + [![Project Status: Active – The project has reached a stable, usable state and is being actively @@ -11,11 +11,12 @@ developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.re [![Lifecycle: stable](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html#stable) [![R-CMD-check](https://github.com/rapidsurveys/oldr/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/rapidsurveys/oldr/actions/workflows/R-CMD-check.yaml) +[![R-hub](https://github.com/rapidsurveys/oldr/actions/workflows/rhub.yaml/badge.svg)](https://github.com/rapidsurveys/oldr/actions/workflows/rhub.yaml) [![test-coverage](https://github.com/rapidsurveys/oldr/actions/workflows/test-coverage.yaml/badge.svg)](https://github.com/rapidsurveys/oldr/actions/workflows/test-coverage.yaml) [![codecov](https://codecov.io/gh/rapidsurveys/oldr/branch/main/graph/badge.svg)](https://codecov.io/gh/rapidsurveys/oldr) [![CodeFactor](https://www.codefactor.io/repository/github/rapidsurveys/oldr/badge)](https://www.codefactor.io/repository/github/rapidsurveys/oldr) [![DOI](https://zenodo.org/badge/105472081.svg)](https://zenodo.org/badge/latestdoi/105472081) - + [HelpAge International](http://www.helpage.org), [VALID International](http://www.validinternational.org), and [Brixton diff --git a/tests/testthat.R b/tests/testthat.R index 5cb0e76..ac3f4a5 100644 --- a/tests/testthat.R +++ b/tests/testthat.R @@ -1,3 +1,11 @@ +# This file is part of the standard setup for testthat. +# It is recommended that you do not modify it. +# +# Where should you do additional test configuration? +# Learn more about the roles of various files in: +# * https://r-pkgs.org/testing-design.html#sec-tests-files-overview +# * https://testthat.r-lib.org/articles/special-files.html + library(testthat) library(oldr) diff --git a/vignettes/figures/htmlReport.png b/vignettes/figures/htmlReport.png new file mode 100644 index 0000000..0582261 Binary files /dev/null and b/vignettes/figures/htmlReport.png differ diff --git a/vignettes/figures/ramOPworkflow.png b/vignettes/figures/ramOPworkflow.png new file mode 100644 index 0000000..881420c Binary files /dev/null and b/vignettes/figures/ramOPworkflow.png differ diff --git a/vignettes/figures/test.ADL.png b/vignettes/figures/test.ADL.png new file mode 100644 index 0000000..c0311a2 Binary files /dev/null and b/vignettes/figures/test.ADL.png differ diff --git a/vignettes/ram_op_workflow.Rmd b/vignettes/ram_op_workflow.Rmd index 991b27a..f334474 100644 --- a/vignettes/ram_op_workflow.Rmd +++ b/vignettes/ram_op_workflow.Rmd @@ -134,7 +134,7 @@ DiagrammeR::grViz(" ``` ```{r workflow, echo = FALSE, eval = TRUE, out.width = "80%"} -knitr::include_graphics("../man/figures/ramOPworkflow.png") +knitr::include_graphics("figures/ramOPworkflow.png") ``` The `oldr` package provides functions to use for all steps after data collection. These functions were developed specifically for the data structure created by the [EpiData](https://www.dropbox.com/s/2kudlxjqcqn8wph/RAMOP%20data%20entry%20files%20%28English%29.zip?dl=0) or the [Open Data Kit](https://ona.io/helpage/75817/368135/form.xls) collection tools. The data structure produced by these collection tools is shown by the dataset `testSVY` included in the `oldr` package. @@ -402,5 +402,5 @@ testSVY %>% which results in an HTML file saved in the specified output directory that looks something like this: ```{r estimateReport2, echo = FALSE, eval = TRUE} -knitr::include_graphics("../man/figures/htmlReport.png") +knitr::include_graphics("figures/htmlReport.png") ```