tryCatch spelling error

nhsbsa-data-analytics · Oct 25, 2023 · 7ac33f9 · 7ac33f9
1 parent a385e35
commit 7ac33f9
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 23 deletions.
diff --git a/R/utils_charts.R b/R/utils_charts.R
@@ -115,7 +115,7 @@ gpg_trend <- function(x,
 
 gpg_pyramid <- function(x, xvar = "afc_band", yvar, yaxis_title) {
   out <- tryCatch(
-    exp = {
+    expr = {
       data <- x
       # Create chart object
       plt <- data |>
@@ -194,7 +194,7 @@ gpg_pyramid <- function(x, xvar = "afc_band", yvar, yaxis_title) {
 
 gpg_stack <- function(x, xvar, yvar, groupvar, yaxis_title) {
   out <- tryCatch(
-    exp = {
+    expr = {
       data <- x
       # Create chart object
       plt <- data |>

diff --git a/man/gpg_data.Rd b/man/gpg_data.Rd
diff --git a/man/paygap.Rd b/man/paygap.Rd
diff --git a/man/quartile.Rd b/man/quartile.Rd
diff --git a/tests/testthat/test-utils_charts.R b/tests/testthat/test-utils_charts.R
@@ -1,7 +1,7 @@
 library(tidyr)
 library(dplyr)
 
-df <- gpg_data(afc_staff)
+df <- gpg_data(nhsbsaGPG::afc_staff)
 x <- df$df_hdcnt_gender |>
   tidyr::pivot_wider(
     names_from = gender,
@@ -11,8 +11,8 @@ x <- df$df_hdcnt_gender |>
 
 y <- nhsbsaGPG::paygap
 
-z <- df$df_hdcnt_afc |>
-  filter(period == "2021/22") |>
+z <- df$df_hdcnt_afc |> 
+  filter(period == '2021/22') |> 
   mutate(headcount = headcount * ifelse(gender == "Male", 1, -1))
 
 testthat::test_that("gpg_trend function runs without errors", {
@@ -47,8 +47,8 @@ testthat::test_that("gpg_trend takes list as an input", {
 
 testthat::test_that("gpg_trend input data frame must contain Female,
                     Male column", {
-                      expect_equal(length(grep("Female|Male", names(x))), 2)
-                    })
+  expect_equal(length(grep("Female|Male", names(x))), 2)
+})
 
 
 testthat::test_that("gpg_trend input data frame must contain period column", {
@@ -69,14 +69,22 @@ testthat::test_that("gpg_trend function runs with paygap dataframe", {
 
 
 testthat::test_that("gpg_pyramid function runs without error", {
-  expect_silent(gpg_pyramid(z, xvar = "afc_band", yvar = "headcount",
-    yaxis_title = "Headcount"
+  expect_silent(gpg_pyramid(z ,
+                          xvar = "afc_band",
+                          yvar = "headcount",
+                          yaxis_title = "Headcount"
   ))
 })
 
 testthat::test_that("gpg_stack function runs without error", {
-  expect_silent(gpg_stack(quartile |> filter(period == "2021/22"),
-    xvar = "quartile", yvar = "percent", groupvar = "ender",
-    yaxis_title = "Males and females in pay quartile"
+  expect_silent(gpg_stack(quartile |> filter(period == "2021/22") ,
+                            xvar = "quartile",
+                            yvar = "percent",
+                            groupvar = "gender",
+                            yaxis_title = "Males and females in pay quartile"
   ))
 })
+
+
+
+