Coverage

HughParsonage · Jul 27, 2018 · 2e316e8 · 2e316e8
1 parent 54ac64b
commit 2e316e8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,8 @@
 
 language: R
 sudo: false
+latex: false
+pandoc: false
 cache: packages
 
 after_success:

diff --git a/R/mutate_geocode.R b/R/mutate_geocode.R
@@ -32,10 +32,7 @@ mutate_geocode <- function(DT,
     setdiff(names(formals(geocode)),
             "attempt_decode_street_abbrev")
 
-  flat_number_not_null <-
-    !missing(flat_number) && !is.null(flat_number)
-
-  if (flat_number_not_null) {
+  if (flat_number_not_null <- !missing(flat_number)) {
     old_flat_number <- as.character(substitute(flat_number))
     setnames(DT, old_flat_number, "flat_number")
   } else if ("flat_number" %notchin% names(DT)) {
@@ -163,10 +160,7 @@ add_geocode <- function(DT,
     setdiff(names(formals(geocode)),
             "attempt_decode_street_abbrev")
 
-  flat_number_not_null <-
-    !missing(flat_number) && !is.null(flat_number)
-
-  if (flat_number_not_null) {
+  if (flat_number_not_null <- !missing(flat_number)) {
     old_flat_number <- as.character(substitute(flat_number))
     setnames(DT, old_flat_number, "flat_number")
   } else if ("flat_number" %notchin% names(DT)) {

diff --git a/tests/testthat/test-add_geocode.R b/tests/testthat/test-add_geocode.R
@@ -71,6 +71,9 @@ test_that("Building names", {
                street_type = "Street",
                postcode = 2602L) %>%
     add_geocode
+
+
+
   dt2 <-
     data.table(flat_number = 3L,
                building_name = "AINSLIE FLATS",
@@ -85,4 +88,8 @@ test_that("Building names", {
   expect_lt(dt[, latitude], -35.2)
   expect_lt(dt[, longitude], 149.15)
   expect_gt(dt[, longitude], 149.14)
+  setnames(dt, "flat_number", "unit_no")
+  dt4 <- add_geocode(dt, flat_number = 'unit_no', overwrite = TRUE)
+  expect_lt(dt[, longitude], 149.15)
+  expect_gt(dt[, longitude], 149.14)
 })
diff --git a/tests/testthat/test-mutate_geocode.R b/tests/testthat/test-mutate_geocode.R
@@ -128,4 +128,11 @@ test_that("Building names", {
   expect_lt(dt[, latitude], -35.2)
   expect_lt(dt[, longitude], 149.15)
   expect_gt(dt[, longitude], 149.14)
+
+  setnames(dt, "flat_number", "unit_no")
+  dt3 <- mutate_geocode(dt, flat_number = unit_no)
+  dt4 <- mutate_geocode(dt, flat_number = 'unit_no', overwrite = TRUE)
+  expect_lt(dt[, longitude], 149.15)
+  expect_gt(dt[, longitude], 149.14)
+
 })