Support 'testthat' package version 0.11.0.

apache · sun-rui · Nov 29, 2015 · Nov 29, 2015 · Nov 29, 2015 · Dec 7, 2015
commit 3d2f3a67fd7f4e4aa87f9ca804d63ba9342802d3
diff --git a/R/pkg/inst/tests/jarTest.R → R/pkg/inst/tests/testthat/jarTest.R b/R/pkg/inst/tests/jarTest.R → R/pkg/inst/tests/testthat/jarTest.R
diff --git a/R/pkg/inst/tests/packageInAJarTest.R → ...g/inst/tests/testthat/packageInAJarTest.R b/R/pkg/inst/tests/packageInAJarTest.R → ...g/inst/tests/testthat/packageInAJarTest.R
diff --git a/R/pkg/inst/tests/test_Serde.R → R/pkg/inst/tests/testthat/test_Serde.R b/R/pkg/inst/tests/test_Serde.R → R/pkg/inst/tests/testthat/test_Serde.R
diff --git a/R/pkg/inst/tests/test_binaryFile.R → R/pkg/inst/tests/testthat/test_binaryFile.R b/R/pkg/inst/tests/test_binaryFile.R → R/pkg/inst/tests/testthat/test_binaryFile.R
diff --git a/R/pkg/inst/tests/test_binary_function.R → ...nst/tests/testthat/test_binary_function.R b/R/pkg/inst/tests/test_binary_function.R → ...nst/tests/testthat/test_binary_function.R
diff --git a/R/pkg/inst/tests/test_broadcast.R → R/pkg/inst/tests/testthat/test_broadcast.R b/R/pkg/inst/tests/test_broadcast.R → R/pkg/inst/tests/testthat/test_broadcast.R
diff --git a/R/pkg/inst/tests/test_client.R → R/pkg/inst/tests/testthat/test_client.R b/R/pkg/inst/tests/test_client.R → R/pkg/inst/tests/testthat/test_client.R
diff --git a/R/pkg/inst/tests/test_context.R → R/pkg/inst/tests/testthat/test_context.R b/R/pkg/inst/tests/test_context.R → R/pkg/inst/tests/testthat/test_context.R
diff --git a/R/pkg/inst/tests/test_includeJAR.R → R/pkg/inst/tests/testthat/test_includeJAR.R b/R/pkg/inst/tests/test_includeJAR.R → R/pkg/inst/tests/testthat/test_includeJAR.R
@@ -20,7 +20,7 @@ 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/jarTest.R")
+  scriptPath <- file.path(sparkHome, "R/lib/SparkR/tests/testthat/jarTest.R")
   submitPath <- file.path(sparkHome, "bin/spark-submit")
   res <- system2(command = submitPath,
                  args = c(jarPath, scriptPath),

diff --git a/R/pkg/inst/tests/test_includePackage.R → ...inst/tests/testthat/test_includePackage.R b/R/pkg/inst/tests/test_includePackage.R → ...inst/tests/testthat/test_includePackage.R
diff --git a/R/pkg/inst/tests/test_mllib.R → R/pkg/inst/tests/testthat/test_mllib.R b/R/pkg/inst/tests/test_mllib.R → R/pkg/inst/tests/testthat/test_mllib.R
diff --git a/R/pkg/inst/tests/test_parallelize_collect.R → ...tests/testthat/test_parallelize_collect.R b/R/pkg/inst/tests/test_parallelize_collect.R → ...tests/testthat/test_parallelize_collect.R
diff --git a/R/pkg/inst/tests/test_rdd.R → R/pkg/inst/tests/testthat/test_rdd.R b/R/pkg/inst/tests/test_rdd.R → R/pkg/inst/tests/testthat/test_rdd.R
diff --git a/R/pkg/inst/tests/test_shuffle.R → R/pkg/inst/tests/testthat/test_shuffle.R b/R/pkg/inst/tests/test_shuffle.R → R/pkg/inst/tests/testthat/test_shuffle.R
diff --git a/R/pkg/inst/tests/test_sparkSQL.R → R/pkg/inst/tests/testthat/test_sparkSQL.R b/R/pkg/inst/tests/test_sparkSQL.R → R/pkg/inst/tests/testthat/test_sparkSQL.R
diff --git a/R/pkg/inst/tests/test_take.R → R/pkg/inst/tests/testthat/test_take.R b/R/pkg/inst/tests/test_take.R → R/pkg/inst/tests/testthat/test_take.R
diff --git a/R/pkg/inst/tests/test_textFile.R → R/pkg/inst/tests/testthat/test_textFile.R b/R/pkg/inst/tests/test_textFile.R → R/pkg/inst/tests/testthat/test_textFile.R
diff --git a/R/pkg/inst/tests/test_utils.R → R/pkg/inst/tests/testthat/test_utils.R b/R/pkg/inst/tests/test_utils.R → R/pkg/inst/tests/testthat/test_utils.R