address lines revealed by codecov

jangorecki · jangorecki · commit 5541e9c52045 · 2020-04-11T17:59:50.000+01:00
diff --git a/R/setkey.R b/R/setkey.R
@@ -284,8 +284,6 @@ setorderv = function(x, cols = colnames(x), order=1L, na.last=FALSE, neworder) {
       warning("Argument order is ignored when neworder argument was provided")
     if (!missing(na.last))
       warning("Argument na.last is ignored when neworder argument was provided")
-    if (length(neworder) != nrow(x))
-      stop("Provided neworder is a different length than nrow of provided data.table")
     if (!is.integer(neworder) && is.numeric(neworder))
       neworder = as.integer(neworder)
     o = neworder
diff --git a/inst/tests/tests.Rraw b/inst/tests/tests.Rraw
@@ -13725,6 +13725,9 @@ test(1967.622, setnames(x, 1:2, c("a",NA)), error = "NA in 'new' at positions [2
 test(1967.63, setcolorder(x, c(1, 1)), error = 'Item 2 of order (1) is either NA, out of range [1,2], or is duplicated. The new order must be a strict permutation of 1:n')
 test(1967.64, setcolorder(x, 1+3i), error = 'must be character or numeric')
 test(1967.65, setcolorder(x, 300), error = 'specify non existing column*.*300')
+d = data.table(1:2, 2:3)
+setattr(d, "names", NULL)
+test(1967.651, setcolorder(d, 2:1), error="dt passed to setcolorder has no names")
 
 test(1967.66, rbindlist(list(x), idcol = FALSE), rbindlist(list(x)))
 test(1967.67, rbindlist(list(x), idcol = 1+3i), error = 'idcol must be a logical')
@@ -16859,10 +16862,11 @@ test(2139.03, setorderv(DT, order=1L, neworder = 1:4), d, warning = "Argument or
 test(2139.04, setorderv(DT, na.last=FALSE, neworder = 1:4), d, warning = "Argument na.last is ignored")
 test(2139.05, setorderv(DT, order=1L, na.last=FALSE, neworder = 1:4), d, warning = c("Argument order is ignored","Argument na.last is ignored"))
 test(2139.06, setorderv(DT, cols="id1", neworder = 1:4), error = "Provide either cols or neworder, not both")
-test(2139.07, setorderv(DT, neworder = 1:3), error = "Provided neworder is a different length than nrow of provided data.table")
-test(2139.08, setorderv(DT, neworder = 1:5), error = "Provided neworder is a different length than nrow of provided data.table")
+test(2139.07, setorderv(DT, neworder = 1:3), error = "length must be equal to nrow")
+test(2139.08, setorderv(DT, neworder = 1:5), error = "length must be equal to nrow")
 test(2139.09, setorderv(DT, neworder = c(1L,1L,2L,3L)), error = "duplicated")
 test(2139.10, setorderv(DT, neworder = c(1L,2L,3L,NA_integer_)), error = "NA")
 test(2139.11, setorderv(DT, neworder = c(1L,0L,2L,3L)), error = "out of range")
 test(2139.12, setorderv(DT, neworder = c(1L,5L,2L,3L)), error = "out of range")
 test(2139.13, setorderv(DT, neworder = as.numeric(s)), d[s])
+test(2139.14, setorderv(DT, neworder=c("a","b")), error="must be an integer vector")
diff --git a/src/reorder.c b/src/reorder.c
@@ -34,7 +34,7 @@ SEXP reorder(SEXP x, SEXP order) {
   if (!isInteger(order))
     error(_("order must be an integer vector"));
   if (length(order) != nrow)
-    error(_("nrow(x)[%d]!=length(order)[%d]"),nrow,length(order));
+    error(_("order length must be equal to nrow of x: nrow(x)[%d]!=length(order)[%d]"),nrow,length(order));
   int nprotect = 0;
   if (ALTREP(order)) {
     order=PROTECT(copyAsPlain(order)); nprotect++;
