From d78f1092c8291a34455a715158e3fb61a4427277 Mon Sep 17 00:00:00 2001 From: Michael Sumner Date: Fri, 2 Sep 2016 21:54:52 +1000 Subject: [PATCH] scaffold, tests --- DESCRIPTION | 3 ++- NAMESPACE | 1 - R/spex.R | 3 +-- tests/testthat.R | 4 ++++ tests/testthat/test-spex-any.R | 7 +++++++ tests/testthat/test-spex-extent.R | 10 ++++++++++ 6 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 tests/testthat.R create mode 100644 tests/testthat/test-spex-any.R create mode 100644 tests/testthat/test-spex-extent.R diff --git a/DESCRIPTION b/DESCRIPTION index 5ed87c4..5efb865 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -18,4 +18,5 @@ Imports: RoxygenNote: 5.0.1 URL: https://github.com/mdsumner/spex BugReports: https://github.com/mdsumner/spex/issues -Suggests: covr +Suggests: covr, + testthat diff --git a/NAMESPACE b/NAMESPACE index fe282d2..239fca0 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -9,4 +9,3 @@ importFrom(raster,crs) importFrom(raster,extent) importFrom(sp,SpatialPolygonsDataFrame) importFrom(stats,setNames) -importMethodsFrom(raster,as) diff --git a/R/spex.R b/R/spex.R index 512d646..9ae2962 100644 --- a/R/spex.R +++ b/R/spex.R @@ -19,7 +19,6 @@ #' @param ... arguments for methods #' @param crs a projection string #' @importFrom methods as -#' @importMethodsFrom raster as #' @importFrom raster crs<- crs extent #' @importFrom sp SpatialPolygonsDataFrame #' @importFrom stats setNames @@ -79,5 +78,5 @@ spex.default <- function(x, byid = FALSE, .id, ...) { spex.Extent <- function(x, crs, ...) { p <- as(extent(x), 'SpatialPolygons') crs(p) <- crs - p + spex(p, ...) } diff --git a/tests/testthat.R b/tests/testthat.R new file mode 100644 index 0000000..1176f76 --- /dev/null +++ b/tests/testthat.R @@ -0,0 +1,4 @@ +library(testthat) +library(spex) + +test_check("spex") diff --git a/tests/testthat/test-spex-any.R b/tests/testthat/test-spex-any.R new file mode 100644 index 0000000..a13a2ca --- /dev/null +++ b/tests/testthat/test-spex-any.R @@ -0,0 +1,7 @@ +context("spex-any") +library(testthat) +test_that("it's polygons with crs", { + expect_that(spex(lux), is_a("SpatialPolygonsDataFrame")) + expect_that(sp::is.projected(spex(lux)), is_false()) + expect_that(names(spex(lux, .id = "thing")), equals("thing")) + }) diff --git a/tests/testthat/test-spex-extent.R b/tests/testthat/test-spex-extent.R new file mode 100644 index 0000000..5e3ddf2 --- /dev/null +++ b/tests/testthat/test-spex-extent.R @@ -0,0 +1,10 @@ +context("spex-extent") + +test_that("extent and crs works", { + expect_that(spex(raster::extent(lux), raster::crs(lux)), is_a("SpatialPolygonsDataFrame")) +}) + + +test_that("by id is not implemented", { + expect_that(spex(lux, byid = TRUE), throws_error("implemented")) +})