From 89d86b1f65f5db7044280d916b07d1622b4662a0 Mon Sep 17 00:00:00 2001 From: Josh Rosen Date: Thu, 2 Jul 2015 17:09:15 -0700 Subject: [PATCH] Bump ScalaCheck version. --- pom.xml | 2 +- .../scala/org/apache/spark/sql/RandomDataGenerator.scala | 7 +++---- .../org/apache/spark/sql/types/DataTypeTestUtils.scala | 8 +++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 211da9ee74a3f..6a41aa4f65101 100644 --- a/pom.xml +++ b/pom.xml @@ -689,7 +689,7 @@ org.scalacheck scalacheck_${scala.binary.version} - 1.11.3 + 1.12.4 test diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala index 9479c9b1a0786..ccf171543f8e4 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/RandomDataGenerator.scala @@ -19,13 +19,12 @@ package org.apache.spark.sql import java.sql.Timestamp -import org.apache.spark.sql.types._ import org.scalacheck.{Arbitrary, Gen} +import org.apache.spark.sql.types._ + /** - * Random data generators for Spark SQL DataTypes. These generators do not generate uniformly random - * values; instead, they're biased to return "interesting" values (such as maximum / minimum values) - * with higher probability. + * ScalaCheck random data generators for Spark SQL DataTypes. */ object RandomDataGenerator { diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/types/DataTypeTestUtils.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/types/DataTypeTestUtils.scala index 0b7ed54c681e9..32632b5d6e342 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/types/DataTypeTestUtils.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/types/DataTypeTestUtils.scala @@ -48,7 +48,13 @@ object DataTypeTestUtils { /** * Instances of all [[AtomicType]]s. */ - val atomicTypes: Set[DataType] = Set(BinaryType, StringType, TimestampType) ++ numericTypes + val atomicTypes: Set[DataType] = numericTypes ++ Set( + BinaryType, + BooleanType, + DateType, + StringType, + TimestampType + ) /** * Instances of [[ArrayType]] for all [[AtomicType]]s. Arrays of these types may contain null.