tests

Author: MHaringa

cran-comments.md

@@ -4,7 +4,7 @@ This is a resubmission. In this version I have:
 * Updated spatialrisk for failing check. spatialrisk uses dplyr and has problems with the new version of dplyr. See bug join_mutate(x = <sf>) #4917
 
 ## Test environments
-* local OS X install, R 3.6.2
+* local OS X install, R 3.6.3
 * win-builder (devel and release)
 
 ## R CMD check results

tests/testthat/test_concentration.R

@@ -1,5 +1,5 @@
 library(spatialrisk)
-context("Concentration")
+context("concentration")
 
 test_that("value is equal to concentration for small radius", {
   conc <- concentration(Groningen[1,], Groningen, value = amount, radius = 0.00001, display_progress = FALSE)
@@ -10,15 +10,18 @@ test_that("sum of value column obtained from points_in_circle fn is equal to con
 
   # Check first observation
   uit1 <- concentration(Groningen[1,], Groningen, value = amount, radius = 200, display_progress = FALSE)
-  expect_equal(uit1$concentration, sum(points_in_circle(Groningen, lon_center = uit1$lon, lat_center = uit1$lat, radius = 200)$amount))
+  sum1 <- points_in_circle(Groningen, lon_center = uit1$lon, lat_center = uit1$lat, radius = 200)$amount
+  expect_equal(uit1$concentration, sum(sum1))
 
   # Check second observation
   uit2 <- concentration(Groningen[2,], Groningen, value = amount, radius = 200, display_progress = FALSE)
-  expect_equal(uit2$concentration, sum(points_in_circle(Groningen, lon_center = uit2$lon, lat_center = uit2$lat, radius = 200)$amount))
+  sum2 <- points_in_circle(Groningen, lon_center = uit2$lon, lat_center = uit2$lat, radius = 200)$amount
+  expect_equal(uit2$concentration, sum(sum2))
 
   # Check last observation
   uit3 <- concentration(Groningen[nrow(Groningen),], Groningen, value = amount, radius = 200, display_progress = FALSE)
-  expect_equal(uit3$concentration, sum(points_in_circle(Groningen, lon_center = uit3$lon, lat_center = uit3$lat, radius = 200)$amount))
+  sum3 <- points_in_circle(Groningen, lon_center = uit3$lon, lat_center = uit3$lat, radius = 200)$amount
+  expect_equal(uit3$concentration, sum(sum3))
 })
 
 test_that("error should be returned for nonpositive radius", {

tests/testthat/test_haversine.R

@@ -0,0 +1,15 @@
+library(spatialrisk)
+context("haversine")
+
+
+test_that("return correct output", {
+  uit <- haversine(52, 6, 53, 7)
+  expect_equal(round(uit, 0), round(130321.2, 0))
+  })
+
+test_that("return NA for missing coordinates", {
+  uit <- haversine(c(52, 51), c(6, 6.1), c(53,51), c(NA, 6))
+  expect_equal(sum(is.na(uit)), 1)
+})
+
+

tests/testthat/test_pointsincircle.R

@@ -1,5 +1,5 @@
 library(spatialrisk)
-context("Points_in_circle")
+context("points_in_circle")
 
 test_that("distance in output from points in circle is equal to distance from haversine", {