Skip to content

Commit

Permalink
💄 style files
Browse files Browse the repository at this point in the history
  • Loading branch information
RMHogervorst committed Apr 25, 2024
1 parent 3b81984 commit bad3c96
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 39 deletions.
1 change: 0 additions & 1 deletion R/address-provider-en_NZ.R
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ AddressProvider_en_NZ <- R6::R6Class(
pattern <- super$random_element(private$city_formats)
dat <- list(
# , , te_reo_first, te_reo_ending, te_reo_part

first_name = private$pp$first_name(),
last_name = private$pp$last_name(),
city_suffix = super$random_element(private$street_suffixes),
Expand Down
1 change: 0 additions & 1 deletion R/address-provider.R
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,3 @@ AddressProvider <- R6::R6Class(
provider_ = "AddressProvider"
)
)

2 changes: 1 addition & 1 deletion R/isbn-provider.R
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ ISBNProvider <- R6::R6Class(
isbn
},
generate_isbn13_checkdigit = function(first12isbn) {
# first12isbn should be a vector of 12 long.
# first12isbn should be a vector of 12 long.
first_12 <- as.integer(first12isbn)
if (length(first_12) != 12) {
stop("needs exactly 12 tokens")

Check warning on line 73 in R/isbn-provider.R

View check run for this annotation

Codecov / codecov/patch

R/isbn-provider.R#L73

Added line #L73 was not covered by tests
Expand Down
8 changes: 4 additions & 4 deletions R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ locale_mismatch <- function(parent_provider, child_provider) {
}

#' generalized util function for sequence multiplication
#'
#'
#' Util function for ISBN, ean, SSN providers.
#' for cases such as sum(x[4]*5 + x[3]*4 + x[2]*3 + x[1] *2)
#' @keywords internal
checksum_util = function(vector,multiplicationvector){
stopifnot(length(vector)==length(multiplicationvector))
sum(vector * multiplicationvector)
checksum_util <- function(vector, multiplicationvector) {
stopifnot(length(vector) == length(multiplicationvector))
sum(vector * multiplicationvector)
}
32 changes: 16 additions & 16 deletions tests/testthat/test-addresses.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ test_that("every_locale has the same basic functions", {
expect_false(bb$address() == "")
expect_is(bb$city, "function")
expect_type(bb$city(), "character")
expect_false(bb$city() == "",label = sprintf("city - %s", locale))
expect_false(bb$city() == "", label = sprintf("city - %s", locale))
expect_is(bb$street_address, "function")
expect_type(bb$street_address(), "character")
expect_false(bb$street_address() == "",label = sprintf("city - %s", locale))
expect_false(bb$street_address() == "", label = sprintf("city - %s", locale))
expect_is(bb$street_name, "function")
expect_type(bb$street_name(), "character")
expect_false(bb$street_name() == "",label = sprintf("city - %s", locale))
expect_false(bb$street_name() == "", label = sprintf("city - %s", locale))
expect_is(bb$postcode, "function")
expect_type(bb$postcode(), "character")
expect_false(bb$postcode() == "", label = sprintf("postcode - %s", locale))
Expand Down Expand Up @@ -75,18 +75,18 @@ test_that("custom functions from AddressProvider_nl_NL work", {
expect_true(aa$province() %in% aa$.__enclos_env__$private$provinces)
})

test_that("all locales consistently give results -- stresstest",{
skip_on_cran()
skip_on_ci()

aa <- cr_loc_spec_provider("AddressProvider", "en_US")
for (locale in aa$allowed_locales()) {
bb <- cr_loc_spec_provider("AddressProvider", locale)
for (i in 1:50){
expect_false(bb$city() == "",label = sprintf("city - %s", locale))
expect_false(bb$street_address() == "",label = sprintf("city - %s", locale))
expect_false(bb$street_name() == "",label = sprintf("city - %s", locale))
expect_false(bb$postcode() == "", label = sprintf("postcode - %s", locale))
}
test_that("all locales consistently give results -- stresstest", {
skip_on_cran()
skip_on_ci()

aa <- cr_loc_spec_provider("AddressProvider", "en_US")
for (locale in aa$allowed_locales()) {
bb <- cr_loc_spec_provider("AddressProvider", locale)
for (i in 1:50) {
expect_false(bb$city() == "", label = sprintf("city - %s", locale))
expect_false(bb$street_address() == "", label = sprintf("city - %s", locale))
expect_false(bb$street_name() == "", label = sprintf("city - %s", locale))
expect_false(bb$postcode() == "", label = sprintf("postcode - %s", locale))
}
}
})
2 changes: 1 addition & 1 deletion tests/testthat/test-company.R
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ test_that("all locales have `company()` function", {
for (loc in CompanyProvider_en_US$new()$allowed_locales()) {
aa <- cr_loc_spec_provider("CompanyProvider", locale = loc)
expect_gt(nchar(aa$company()), 0)
expect_false(aa$company() == "",label = sprintf("company - %s", loc))
expect_false(aa$company() == "", label = sprintf("company - %s", loc))
expect_type(aa$company, "closure")
}
})
Expand Down
14 changes: 7 additions & 7 deletions tests/testthat/test-isbn.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ test_that("ISBN 13 creates valid ISBN", {
# ISBN version 13
# 978-0-306-40615-? 7
# LOW LEVEL CHECKDIGIT
expect_equal(ISBNP$.__enclos_env__$private$generate_isbn13_checkdigit(c(9,7,8,0,3,0,6,4,0,6,1,5)), 7)
expect_equal(ISBNP$.__enclos_env__$private$generate_isbn13_checkdigit(c(9, 7, 8, 0, 3, 0, 6, 4, 0, 6, 1, 5)), 7)
# UNDERLYING GENERATOR
expect_equal(nchar(ISBNP$.__enclos_env__$private$generate_isbn13()), 13)
# USER FACING FUNCTION
Expand All @@ -17,12 +17,12 @@ test_that("ISBN 10 creates valid ISBN", {

# LOW LEVEL CHECKDIGIT
# 0575055030 men at arms
expect_equal(ISBNP$.__enclos_env__$private$generate_isbn10_checkdigit(c(0,5,7,5,0,5,5,0,3)), "0")
expect_equal(ISBNP$.__enclos_env__$private$generate_isbn10_checkdigit(c(0, 5, 7, 5, 0, 5, 5, 0, 3)), "0")
# 038553826X raising steam
expect_equal(ISBNP$.__enclos_env__$private$generate_isbn10_checkdigit(c(0,3,8,5,5,3,8,2,6)), "X")
# 0062429981 The Shepherd's Crown
expect_equal(ISBNP$.__enclos_env__$private$generate_isbn10_checkdigit(c(0,0,6,2,4,2,9,9,8)), "1")
expect_equal(ISBNP$.__enclos_env__$private$generate_isbn10_checkdigit(c(0, 3, 8, 5, 5, 3, 8, 2, 6)), "X")
# 0062429981 The Shepherd's Crown
expect_equal(ISBNP$.__enclos_env__$private$generate_isbn10_checkdigit(c(0, 0, 6, 2, 4, 2, 9, 9, 8)), "1")

## optional extra checks
# # 0192854259 good omens
# expect_equal(ISBNP$.__enclos_env__$private$generate_isbn10_checkdigit(c(0,1,9,2,8,5,4,2,5)), "9")
Expand All @@ -32,7 +32,7 @@ test_that("ISBN 10 creates valid ISBN", {
# expect_equal(ISBNP$.__enclos_env__$private$generate_isbn10_checkdigit(c(0,5,5,2,1,4,2,3,5)), "2")
# # 0552134635 moving pictures
# expect_equal(ISBNP$.__enclos_env__$private$generate_isbn10_checkdigit(c(0,5,5,2,1,3,4,6,3)), "5")

# UNDERLYING GENERATOR
expect_equal(nchar(ISBNP$.__enclos_env__$private$generate_isbn10()), 10)
# USER FACING FUNCTION
Expand Down
16 changes: 8 additions & 8 deletions tests/testthat/test-zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ test_that("All non-localized providers inherit from BareProvider", {
})


test_that("checksum_util works for our usecases",{
# ISBN 10
expect_equal(checksum_util(c(0,3,0,6,4,0,6,1,5),10:2), 130)
# ISBN 13
expect_equal(checksum_util(c(9,7,8,0,3,0,6,4,0,6,1,5),rep(c(1,3),6)), 93)
#SSN dutch
#111222333 en 123456782
expect_equal(checksum_util(c(1,1,1,2,2,2,3,3),9:2), 69)
test_that("checksum_util works for our usecases", {
# ISBN 10
expect_equal(checksum_util(c(0, 3, 0, 6, 4, 0, 6, 1, 5), 10:2), 130)
# ISBN 13
expect_equal(checksum_util(c(9, 7, 8, 0, 3, 0, 6, 4, 0, 6, 1, 5), rep(c(1, 3), 6)), 93)
# SSN dutch
# 111222333 en 123456782
expect_equal(checksum_util(c(1, 1, 1, 2, 2, 2, 3, 3), 9:2), 69)
})

0 comments on commit bad3c96

Please sign in to comment.