From b952b44af4d243f1e3ad88bccf4af7d04df3fc81 Mon Sep 17 00:00:00 2001
From: Felix Cheung <felixcheung_m@hotmail.com>
Date: Mon, 8 May 2017 22:49:40 -0700
Subject: [PATCH] [SPARK-20661][SPARKR][TEST][FOLLOWUP] SparkR tableNames()
test fails
## What changes were proposed in this pull request?
Change it to check for relative count like in this test https://github.com/apache/spark/blame/master/R/pkg/inst/tests/testthat/test_sparkSQL.R#L3355 for catalog APIs
## How was this patch tested?
unit tests, this needs to combine with another commit with SQL change to check
Author: Felix Cheung <felixcheung_m@hotmail.com>
Closes #17905 from felixcheung/rtabletests.
---
R/pkg/inst/tests/testthat/test_sparkSQL.R | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/R/pkg/inst/tests/testthat/test_sparkSQL.R b/R/pkg/inst/tests/testthat/test_sparkSQL.R
index ab6888ea34..19aa61e9a5 100644
--- a/R/pkg/inst/tests/testthat/test_sparkSQL.R
+++ b/R/pkg/inst/tests/testthat/test_sparkSQL.R
@@ -677,26 +677,27 @@ test_that("jsonRDD() on a RDD with json string", {
})
test_that("test tableNames and tables", {
- # Making sure there are no registered temp tables from previous tests
- suppressWarnings(sapply(tableNames(), function(tname) { dropTempTable(tname) }))
+ count <- count(listTables())
+
df <- read.json(jsonPath)
createOrReplaceTempView(df, "table1")
- expect_equal(length(tableNames()), 1)
- expect_equal(length(tableNames("default")), 1)
+ expect_equal(length(tableNames()), count + 1)
+ expect_equal(length(tableNames("default")), count + 1)
+
tables <- listTables()
- expect_equal(count(tables), 1)
+ expect_equal(count(tables), count + 1)
expect_equal(count(tables()), count(tables))
expect_true("tableName" %in% colnames(tables()))
expect_true(all(c("tableName", "database", "isTemporary") %in% colnames(tables())))
suppressWarnings(registerTempTable(df, "table2"))
tables <- listTables()
- expect_equal(count(tables), 2)
+ expect_equal(count(tables), count + 2)
suppressWarnings(dropTempTable("table1"))
expect_true(dropTempView("table2"))
tables <- listTables()
- expect_equal(count(tables), 0)
+ expect_equal(count(tables), count + 0)
})
test_that(
--
GitLab