diff options
| author | Adam Izraelevitz | 2016-08-01 17:50:41 -0700 |
|---|---|---|
| committer | GitHub | 2016-08-01 17:50:41 -0700 |
| commit | d8aa0a1a29ba33510299931c8c2b091a39bb9332 (patch) | |
| tree | 3210ed69f3dbd72e239fb7e7d825779ba3ea2e74 /src | |
| parent | 81f631bc87aa22fff8569e96ae5c4e429df9e1d4 (diff) | |
| parent | 3a3ae041f99f4dd8d87cb76ca4dc8360ec474930 (diff) | |
Merge pull request #212 from ucb-bar/fix-validChar
Fix StringSpec generators to only choose from valid values.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/scala/firrtlTests/StringSpec.scala | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/test/scala/firrtlTests/StringSpec.scala b/src/test/scala/firrtlTests/StringSpec.scala index 04bc663e..62634c44 100644 --- a/src/test/scala/firrtlTests/StringSpec.scala +++ b/src/test/scala/firrtlTests/StringSpec.scala @@ -109,13 +109,12 @@ class StringSpec extends FirrtlPropSpec { } // Generators for random testing - val validChar = for (c <- Gen.choose(0x20.toChar, 0x7e.toChar) if c != '\\') yield c + val validChar = Gen.oneOf((0x20.toChar to 0x5b.toChar).toSeq ++ + (0x5e.toChar to 0x7e.toChar).toSeq) // exclude '\\' val validCharSeq = Gen.containerOf[Seq, Char](validChar) val invalidChar = Gen.oneOf(Gen.choose(0x00.toChar, 0x1f.toChar), Gen.choose(0x7f.toChar, 0xff.toChar)) - val invalidEsc = for ( - c <- Gen.choose(0x00.toChar, 0xff.toChar - ) if (!validEsc.contains(c))) yield c + val invalidEsc = Gen.oneOf((0x00.toChar to 0xff.toChar).toSeq diff validEsc) property("Random invalid strings should fail") { forAll(validCharSeq, invalidChar, validCharSeq) { |