Update unit test. Address comments

Author: shivaram

R/pkg/R/sparkR.R

@@ -364,12 +364,6 @@ sparkR.session <- function(
 
   sparkConfigMap <- convertNamedListToEnv(sparkConfig)
 
-  # NOTE(shivaram): Set default warehouse dir to tmpdir to meet CRAN requirements
-  # See SPARK-18817 for more details
-  if (!exists("spark.sql.default.warehouse.dir", envir = sparkConfigMap)) {
-    assign("spark.sql.default.warehouse.dir", tempdir(), envir = sparkConfigMap)
-  }
-
   namedParams <- list(...)
   if (length(namedParams) > 0) {
     paramMap <- convertNamedListToEnv(namedParams)
@@ -383,6 +377,12 @@ sparkR.session <- function(
     overrideEnvs(sparkConfigMap, paramMap)
   }
 
+  # NOTE(shivaram): Set default warehouse dir to tmpdir to meet CRAN requirements
+  # See SPARK-18817 for more details
+  if (!exists("spark.sql.default.warehouse.dir", envir = sparkConfigMap)) {
+    assign("spark.sql.default.warehouse.dir", tempdir(), envir = sparkConfigMap)
+  }
+
   deployMode <- ""
   if (exists("spark.submit.deployMode", envir = sparkConfigMap)) {
     deployMode <- sparkConfigMap[["spark.submit.deployMode"]]

R/pkg/inst/tests/testthat/test_context.R

@@ -72,6 +72,20 @@ test_that("repeatedly starting and stopping SparkSession", {
   }
 })
 
+test_that("Default warehouse dir should be set to tempdir", {
+  sparkR.session.stop()
+  sparkR.session(enableHiveSupport = FALSE)
+
+  # Create a temporary table
+  sql("CREATE TABLE people_warehouse_test")
+  # spark-warehouse should be written only tempdir() and not current working directory
+  res <- list.files(path = ".", pattern = ".*spark-warehouse.*",
+                    recursive = TRUE, include.dirs = TRUE)
+  expect_equal(length(res), 0)
+  result <- sql("DROP TABLE people_warehouse_test")
+  sparkR.session.stop()
+})
+
 test_that("rdd GC across sparkR.stop", {
   sc <- sparkR.sparkContext() # sc should get id 0
   rdd1 <- parallelize(sc, 1:20, 2L) # rdd1 should get id 1

R/pkg/inst/tests/testthat/test_sparkSQL.R

@@ -2165,14 +2165,6 @@ test_that("SQL error message is returned from JVM", {
   expect_equal(grepl("blah", retError), TRUE)
 })
 
-test_that("Default warehouse dir should be set to tempdir", {
-  # nothing should be written outside tempdir() without explicit user permission
-  inital_working_directory_files <- list.files()
-  result <- sql("CREATE TABLE warehouse")
-  expect_equal(inital_working_directory_files, list.files())
-  result <- sql("DROP TABLE warehouse")
-})
-
 irisDF <- suppressWarnings(createDataFrame(iris))
 
 test_that("Method as.data.frame as a synonym for collect()", {