aboutsummaryrefslogtreecommitdiff
path: root/R/pkg/inst/tests/testthat/test_context.R
diff options
context:
space:
mode:
authorFelix Cheung <felixcheung_m@hotmail.com>2016-06-21 13:36:50 -0700
committerShivaram Venkataraman <shivaram@cs.berkeley.edu>2016-06-21 13:36:50 -0700
commitdbfdae4e41a900de01b48639d6554d32edbb2e0b (patch)
treee91108581f7ce883c094deafe26bb1bd3cf7f660 /R/pkg/inst/tests/testthat/test_context.R
parent918c91954fb46400ce2c5ab066d2ec0ae48dda4a (diff)
downloadspark-dbfdae4e41a900de01b48639d6554d32edbb2e0b.tar.gz
spark-dbfdae4e41a900de01b48639d6554d32edbb2e0b.tar.bz2
spark-dbfdae4e41a900de01b48639d6554d32edbb2e0b.zip
[SPARK-16096][SPARKR] add union and deprecate unionAll
## What changes were proposed in this pull request? add union and deprecate unionAll, separate roxygen2 doc for rbind (since their usage and parameter lists are quite different) `explode` is also deprecated - but seems like replacement is a combination of calls; not sure if we should deprecate it in SparkR, yet. ## How was this patch tested? unit tests, manual checks for r doc Author: Felix Cheung <felixcheung_m@hotmail.com> Closes #13805 from felixcheung/runion.
Diffstat (limited to 'R/pkg/inst/tests/testthat/test_context.R')
-rw-r--r--R/pkg/inst/tests/testthat/test_context.R2
1 files changed, 1 insertions, 1 deletions
diff --git a/R/pkg/inst/tests/testthat/test_context.R b/R/pkg/inst/tests/testthat/test_context.R
index b149818ff4..3d232df566 100644
--- a/R/pkg/inst/tests/testthat/test_context.R
+++ b/R/pkg/inst/tests/testthat/test_context.R
@@ -24,7 +24,7 @@ test_that("Check masked functions", {
namesOfMaskedCompletely <- c("cov", "filter", "sample")
namesOfMasked <- c("describe", "cov", "filter", "lag", "na.omit", "predict", "sd", "var",
"colnames", "colnames<-", "intersect", "rank", "rbind", "sample", "subset",
- "summary", "transform", "drop", "window", "as.data.frame")
+ "summary", "transform", "drop", "window", "as.data.frame", "union")
if (as.numeric(R.version$major) >= 3 && as.numeric(R.version$minor) >= 3) {
namesOfMasked <- c("endsWith", "startsWith", namesOfMasked)
}