fix tests

Author: mengxr

R/pkg/R/mllib.R

@@ -22,7 +22,7 @@
 #' @export
 setClass("PipelineModel", representation(model = "jobj"))
 
-#' @tile S4 class that represents a NaiveBayesModel
+#' @title S4 class that represents a NaiveBayesModel
 #' @param jobj a Java object reference to the backing Scala NaiveBayesWrapper
 #' @export
 setClass("NaiveBayesModel", representation(jobj = "jobj"))
@@ -66,7 +66,7 @@ setMethod("glm", signature(formula = "formula", family = "ANY", data = "DataFram
             return(new("PipelineModel", model = model))
           })
 
-#' Make predictions from a amodel
+#' Make predictions from a model
 #'
 #' Makes predictions from a model produced by glm(), similarly to R's predict().
 #'
@@ -268,7 +268,6 @@ setMethod("fitted", signature(object = "PipelineModel"),
 #'}
 setMethod("naiveBayes", signature(formula = "formula", data = "DataFrame"),
           function(formula, data, laplace = 0, ...) {
-            data <- na.omit(data)
             formula <- paste(deparse(formula), collapse = "")
             jobj <- callJStatic("org.apache.spark.ml.r.NaiveBayesWrapper", "fit",
                                  formula, data@sdf, laplace)

R/pkg/inst/tests/testthat/test_mllib.R

@@ -186,9 +186,9 @@ test_that("naiveBayes", {
   df <- suppressWarnings(createDataFrame(sqlContext, t1))
   m <- naiveBayes(Survived ~ ., data = df)
   s <- summary(m)
-  expect_equal(s$apriori[1, "Yes"], 0.5833333, tolerance = 1e-6)
+  expect_equal(as.double(s$apriori[1, "Yes"]), 0.5833333, tolerance = 1e-6)
   expect_equal(sum(s$apriori), 1)
-  expect_equal(s$tables["Yes", "Age_Adult"], 0.5714286, tolerance = 1e-6)
+  expect_equal(as.double(s$tables["Yes", "Age_Adult"]), 0.5714286, tolerance = 1e-6)
   p <- collect(select(predict(m, df), "prediction"))
   expect_equal(p$prediction, c("Yes", "Yes", "Yes", "Yes", "No", "No", "Yes", "Yes", "No", "No",
                                "Yes", "Yes", "Yes", "Yes", "Yes", "Yes", "Yes", "Yes", "No", "No",

mllib/src/main/scala/org/apache/spark/ml/r/NaiveBayesWrapper.scala

@@ -18,7 +18,7 @@
 package org.apache.spark.ml.r
 
 import org.apache.spark.ml.{Pipeline, PipelineModel}
-import org.apache.spark.ml.attribute.{AttributeGroup, Attribute, NominalAttribute}
+import org.apache.spark.ml.attribute.{Attribute, AttributeGroup, NominalAttribute}
 import org.apache.spark.ml.classification.{NaiveBayes, NaiveBayesModel}
 import org.apache.spark.ml.feature.{IndexToString, RFormula}
 import org.apache.spark.sql.DataFrame