Skip to content

Commit 6aca82e

Browse files
committed
sample_dem_data(): upgrade, export and use in tests
1 parent 4f6cfcf commit 6aca82e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+166
-85
lines changed

NAMESPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
export(check_whitebox_binary)
44
export(install_whitebox)
5+
export(sample_dem_data)
56
export(wbt_absolute_value)
67
export(wbt_accumulation_curvature)
78
export(wbt_adaptive_filter)
@@ -539,3 +540,4 @@ export(wbt_z_scores)
539540
export(wbt_zlidar_to_las)
540541
export(wbt_zonal_statistics)
541542
importFrom(utils,browseURL)
543+
importFrom(utils,download.file)

PY2R/automation.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,10 +361,8 @@ def function_example(fun_name):
361361
f.write('test_that("' + desc + '", {\n\n')
362362
f.write(" skip_on_cran()\n")
363363
f.write(" skip_if_not(check_whitebox_binary())\n")
364-
f.write(
365-
' dem <- system.file("extdata", "DEM.tif", package = "whitebox")\n')
366-
f.write(
367-
' ret <- {}(input = dem, output = "output.tif")\n'.format(wbt_fun_name))
364+
f.write(' dem <- sample_dem_data(); skip_if(dem == "")\n')
365+
f.write(' ret <- {}(input = dem, output = "output.tif")\n'.format(wbt_fun_name))
368366
f.write(' expect_match(ret, "Elapsed Time")\n\n')
369367
f.write("})\n")
370368
print(test_file_path)

PY2R/tests/test-wbt_absolute_value.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test_that("Calculates the absolute value of every cell in a raster", {
44

55
skip_on_cran()
66
skip_if_not(check_whitebox_binary())
7-
dem <- system.file("extdata", "DEM.tif", package = "whitebox")
7+
dem <- sample_dem_data(); skip_if(dem == "")
88
ret <- wbt_absolute_value(input = dem, output = "output.tif")
99
expect_match(ret, "Elapsed Time")
1010

PY2R/tests/test-wbt_arc_cos.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test_that("Returns the inverse cosine (arccos) of each values in a raster", {
44

55
skip_on_cran()
66
skip_if_not(check_whitebox_binary())
7-
dem <- system.file("extdata", "DEM.tif", package = "whitebox")
7+
dem <- sample_dem_data(); skip_if(dem == "")
88
ret <- wbt_arc_cos(input = dem, output = "output.tif")
99
expect_match(ret, "Elapsed Time")
1010

PY2R/tests/test-wbt_arc_sin.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test_that("Returns the inverse sine (arcsin) of each values in a raster", {
44

55
skip_on_cran()
66
skip_if_not(check_whitebox_binary())
7-
dem <- system.file("extdata", "DEM.tif", package = "whitebox")
7+
dem <- sample_dem_data(); skip_if(dem == "")
88
ret <- wbt_arc_sin(input = dem, output = "output.tif")
99
expect_match(ret, "Elapsed Time")
1010

PY2R/tests/test-wbt_arc_tan.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test_that("Returns the inverse tangent (arctan) of each values in a raster", {
44

55
skip_on_cran()
66
skip_if_not(check_whitebox_binary())
7-
dem <- system.file("extdata", "DEM.tif", package = "whitebox")
7+
dem <- sample_dem_data(); skip_if(dem == "")
88
ret <- wbt_arc_tan(input = dem, output = "output.tif")
99
expect_match(ret, "Elapsed Time")
1010

PY2R/tests/test-wbt_arcosh.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test_that("Returns the inverse hyperbolic cosine (arcosh) of each values in a ra
44

55
skip_on_cran()
66
skip_if_not(check_whitebox_binary())
7-
dem <- system.file("extdata", "DEM.tif", package = "whitebox")
7+
dem <- sample_dem_data(); skip_if(dem == "")
88
ret <- wbt_arcosh(input = dem, output = "output.tif")
99
expect_match(ret, "Elapsed Time")
1010

PY2R/tests/test-wbt_arsinh.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test_that("Returns the inverse hyperbolic sine (arsinh) of each values in a rast
44

55
skip_on_cran()
66
skip_if_not(check_whitebox_binary())
7-
dem <- system.file("extdata", "DEM.tif", package = "whitebox")
7+
dem <- sample_dem_data(); skip_if(dem == "")
88
ret <- wbt_arsinh(input = dem, output = "output.tif")
99
expect_match(ret, "Elapsed Time")
1010

PY2R/tests/test-wbt_artanh.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test_that("Returns the inverse hyperbolic tangent (arctanh) of each values in a
44

55
skip_on_cran()
66
skip_if_not(check_whitebox_binary())
7-
dem <- system.file("extdata", "DEM.tif", package = "whitebox")
7+
dem <- sample_dem_data(); skip_if(dem == "")
88
ret <- wbt_artanh(input = dem, output = "output.tif")
99
expect_match(ret, "Elapsed Time")
1010

PY2R/tests/test-wbt_ceil.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test_that("Returns the smallest (closest to negative infinity) value that is gre
44

55
skip_on_cran()
66
skip_if_not(check_whitebox_binary())
7-
dem <- system.file("extdata", "DEM.tif", package = "whitebox")
7+
dem <- sample_dem_data(); skip_if(dem == "")
88
ret <- wbt_ceil(input = dem, output = "output.tif")
99
expect_match(ret, "Elapsed Time")
1010

0 commit comments

Comments
 (0)