From 4eafda7891e97def82969253480e8ae9ac7bab62 Mon Sep 17 00:00:00 2001 From: Dan Sanduleac Date: Tue, 20 May 2014 08:34:28 +0100 Subject: [PATCH] Don't allow generated strings (key names) to be empty --- util/collection/src/test/scala/SettingsTest.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/util/collection/src/test/scala/SettingsTest.scala b/util/collection/src/test/scala/SettingsTest.scala index f8c99a735..fb5511c99 100644 --- a/util/collection/src/test/scala/SettingsTest.scala +++ b/util/collection/src/test/scala/SettingsTest.scala @@ -61,9 +61,12 @@ object SettingsTest extends Properties("settings") { private def mkAttrKeys[T](nr: Int)(implicit mf: Manifest[T]): Gen[List[AttributeKey[T]]] = { - val alphaStr = Gen.alphaStr + import Gen._ + val nonEmptyAlphaStr = + nonEmptyListOf(alphaChar).map(_.mkString).suchThat(_.forall(_.isLetter)) + for { - list <- Gen.listOfN(nr, alphaStr) suchThat (l => l.size == l.distinct.size) + list <- Gen.listOfN(nr, nonEmptyAlphaStr) suchThat (l => l.size == l.distinct.size) item <- list } yield AttributeKey[T](item) }