aboutsummaryrefslogtreecommitdiff
path: root/R/pkg/inst
diff options
context:
space:
mode:
authorShivaram Venkataraman <shivaram@cs.berkeley.edu>2016-07-19 19:28:08 -0700
committerShivaram Venkataraman <shivaram@cs.berkeley.edu>2016-07-19 19:28:08 -0700
commitfc23263623d5dcd1167fa93c094fe41ace77c326 (patch)
tree57ce42fdbaee938b7079ad438ca6513846a73b1a /R/pkg/inst
parent9674af6f6f81066139ea675de724f951bd0d49c9 (diff)
downloadspark-fc23263623d5dcd1167fa93c094fe41ace77c326.tar.gz
spark-fc23263623d5dcd1167fa93c094fe41ace77c326.tar.bz2
spark-fc23263623d5dcd1167fa93c094fe41ace77c326.zip
[SPARK-10683][SPARK-16510][SPARKR] Move SparkR include jar test to SparkSubmitSuite
## What changes were proposed in this pull request? This change moves the include jar test from R to SparkSubmitSuite and uses a dynamically compiled jar. This helps us remove the binary jar from the R package and solves both the CRAN warnings and the lack of source being available for this jar. ## How was this patch tested? SparkR unit tests, SparkSubmitSuite, check-cran.sh Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu> Closes #14243 from shivaram/sparkr-jar-move.
Diffstat (limited to 'R/pkg/inst')
-rw-r--r--R/pkg/inst/test_support/sparktestjar_2.10-1.0.jarbin2886 -> 0 bytes
-rw-r--r--R/pkg/inst/tests/testthat/jarTest.R10
-rw-r--r--R/pkg/inst/tests/testthat/test_includeJAR.R36
3 files changed, 5 insertions, 41 deletions
diff --git a/R/pkg/inst/test_support/sparktestjar_2.10-1.0.jar b/R/pkg/inst/test_support/sparktestjar_2.10-1.0.jar
deleted file mode 100644
index 1d5c2af631..0000000000
--- a/R/pkg/inst/test_support/sparktestjar_2.10-1.0.jar
+++ /dev/null
Binary files differ
diff --git a/R/pkg/inst/tests/testthat/jarTest.R b/R/pkg/inst/tests/testthat/jarTest.R
index 51754a4650..c9615c8d4f 100644
--- a/R/pkg/inst/tests/testthat/jarTest.R
+++ b/R/pkg/inst/tests/testthat/jarTest.R
@@ -16,17 +16,17 @@
#
library(SparkR)
-sparkR.session()
+sc <- sparkR.session()
-helloTest <- SparkR:::callJStatic("sparkR.test.hello",
+helloTest <- SparkR:::callJStatic("sparkrtest.DummyClass",
"helloWorld",
"Dave")
+stopifnot(identical(helloTest, "Hello Dave"))
-basicFunction <- SparkR:::callJStatic("sparkR.test.basicFunction",
+basicFunction <- SparkR:::callJStatic("sparkrtest.DummyClass",
"addStuff",
2L,
2L)
+stopifnot(basicFunction == 4L)
sparkR.session.stop()
-output <- c(helloTest, basicFunction)
-writeLines(output)
diff --git a/R/pkg/inst/tests/testthat/test_includeJAR.R b/R/pkg/inst/tests/testthat/test_includeJAR.R
deleted file mode 100644
index 512dd39cb2..0000000000
--- a/R/pkg/inst/tests/testthat/test_includeJAR.R
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-context("include an external JAR in SparkContext")
-
-runScript <- function() {
- sparkHome <- Sys.getenv("SPARK_HOME")
- sparkTestJarPath <- "R/lib/SparkR/test_support/sparktestjar_2.10-1.0.jar"
- jarPath <- paste("--jars", shQuote(file.path(sparkHome, sparkTestJarPath)))
- scriptPath <- file.path(sparkHome, "R/lib/SparkR/tests/testthat/jarTest.R")
- submitPath <- file.path(sparkHome, paste("bin/", determineSparkSubmitBin(), sep = ""))
- combinedArgs <- paste(jarPath, scriptPath, sep = " ")
- res <- launchScript(submitPath, combinedArgs, capture = TRUE)
- tail(res, 2)
-}
-
-test_that("sparkJars tag in SparkContext", {
- testOutput <- runScript()
- helloTest <- testOutput[1]
- expect_equal(helloTest, "Hello, Dave")
- basicFunction <- testOutput[2]
- expect_equal(basicFunction, "4")
-})