raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Fix invalid ranges in ByteStringSpec #22389

Browse source
This commit is contained in:
Johan Andrén 2017-02-24 10:26:42 +01:00 • committed by GitHub
parent 4322bb11aa
commit 28d96a2e59
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala
View file

@ -27,14 +27,14 @@ class ByteStringSpec extends WordSpec with Matchers with Checkers {
n ← Gen.choose(min, max)
b ← Gen.containerOfN[Array, Byte](n, arbitrary[Byte])
from ← Gen.choose(0, b.length)
until ← Gen.choose(from, b.length)
until ← Gen.choose(from, from max b.length)
} yield ByteString(b).slice(from, until)
implicit val arbitraryByteString: Arbitrary[ByteString] = Arbitrary {
Gen.sized { s ⇒
for {
chunks ← Gen.choose(0, s)
bytes ← Gen.listOfN(chunks, genSimpleByteString(1, s / (chunks max 1)))
bytes ← Gen.listOfN(chunks, genSimpleByteString(1, 1 max (s / (chunks max 1))))
} yield (ByteString.empty /: bytes)(_ ++ _)
}
}
@ -44,8 +44,11 @@ class ByteStringSpec extends WordSpec with Matchers with Checkers {
implicit val arbitraryByteStringSlice: Arbitrary[ByteStringSlice] = Arbitrary {
for {
xs ← arbitraryByteString.arbitrary
from ← Gen.choose(0, xs.length - 1)
until ← Gen.choose(from, xs.length)
from ← Gen.choose(0, 0 max (xs.length - 1))
until ← {
require(from <= xs.length)
Gen.choose(from, xs.length)
}
} yield (xs, from, until)
}