From 0c369df9a0b3cdfef3794ce31868ef18c2fdb5e4 Mon Sep 17 00:00:00 2001 From: Paul Staab Date: Mon, 30 Mar 2015 14:13:56 +0200 Subject: [PATCH 1/2] Add check for assertions of length 0 --- R/assert-that.r | 2 ++ 1 file changed, 2 insertions(+) diff --git a/R/assert-that.r b/R/assert-that.r index 0d883ee..80a5969 100644 --- a/R/assert-that.r +++ b/R/assert-that.r @@ -87,6 +87,8 @@ check_result <- function(x) { stop("assert_that: assertion must return a logical value", call. = FALSE) if (any(is.na(x))) stop("assert_that: missing values present in assertion", call. = FALSE) + if (length(x) == 0) + stop("assert_that: assertion has length 0", call. = FALSE) if (length(x) > 1) { stop("assert_that: assertion has length greater than 1", call. = FALSE) } From 2b3b8b91e50c32e0ff2d8ce1ff9b82f5d2846c6d Mon Sep 17 00:00:00 2001 From: Paul Staab Date: Mon, 30 Mar 2015 15:48:28 +0200 Subject: [PATCH 2/2] Combine checks for assertion length --- R/assert-that.r | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/R/assert-that.r b/R/assert-that.r index 80a5969..eacc0b3 100644 --- a/R/assert-that.r +++ b/R/assert-that.r @@ -87,10 +87,8 @@ check_result <- function(x) { stop("assert_that: assertion must return a logical value", call. = FALSE) if (any(is.na(x))) stop("assert_that: missing values present in assertion", call. = FALSE) - if (length(x) == 0) - stop("assert_that: assertion has length 0", call. = FALSE) - if (length(x) > 1) { - stop("assert_that: assertion has length greater than 1", call. = FALSE) + if (length(x) != 1) { + stop("assert_that: length of assertion is not 1", call. = FALSE) } TRUE