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

=all #3837 Make akkaScalaNightly compile on scala 2.11.0-M8

Browse source
This commit is contained in:
Björn Antonsson 2014-01-31 11:14:13 +01:00
parent 85698688e4
commit 179faba453
82 changed files with 651 additions and 643 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,13 +1,15 @@
/**
* Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
*/
package akka.util
import org.scalatest.WordSpec
import org.scalatest.Matchers
import org.scalatest.BeforeAndAfterAll
import org.scalatest.prop.Checkers
import org.scalacheck._
import org.scalacheck.Arbitrary._
import org.scalacheck.Prop._
import org.scalacheck.Gen._
import org.scalacheck.Arbitrary
import org.scalacheck.Arbitrary.arbitrary
import org.scalacheck.Gen
import scala.collection.mutable.Builder
@ -19,17 +21,17 @@ import java.lang.Double.doubleToRawLongBits
class ByteStringSpec extends WordSpec with Matchers with Checkers {
def genSimpleByteString(min: Int, max: Int) = for {
n ← choose(min, max)
n ← Gen.choose(min, max)
b ← Gen.containerOfN[Array, Byte](n, arbitrary[Byte])
from ← choose(0, b.length)
until ← choose(from, b.length)
from ← Gen.choose(0, b.length)
until ← Gen.choose(from, b.length)
} yield ByteString(b).slice(from, until)
implicit val arbitraryByteString: Arbitrary[ByteString] = Arbitrary {
Gen.sized { s ⇒
for {
chunks ← choose(0, s)
bytes ← listOfN(chunks, genSimpleByteString(1, s / (chunks max 1)))
chunks ← Gen.choose(0, s)
bytes ← Gen.listOfN(chunks, genSimpleByteString(1, s / (chunks max 1)))
} yield (ByteString.empty /: bytes)(_ ++ _)
}
}
@ -39,8 +41,8 @@ class ByteStringSpec extends WordSpec with Matchers with Checkers {
implicit val arbitraryByteStringSlice: Arbitrary[ByteStringSlice] = Arbitrary {
for {
xs ← arbitraryByteString.arbitrary
from ← choose(0, xs.length - 1)
until ← choose(from, xs.length)
from ← Gen.choose(0, xs.length - 1)
until ← Gen.choose(from, xs.length)
} yield (xs, from, until)
}
@ -49,8 +51,8 @@ class ByteStringSpec extends WordSpec with Matchers with Checkers {
def arbSlice[A](arbArray: Arbitrary[Array[A]]): Arbitrary[ArraySlice[A]] = Arbitrary {
for {
xs ← arbArray.arbitrary
from ← choose(0, xs.length)
until ← choose(from, xs.length)
from ← Gen.choose(0, xs.length)
until ← Gen.choose(from, xs.length)
} yield (xs, from, until)
}
@ -72,9 +74,9 @@ class ByteStringSpec extends WordSpec with Matchers with Checkers {
implicit val arbitraryLongArrayNumBytes: Arbitrary[ArrayNumBytes[Long]] = Arbitrary {
for {
xs ← arbitraryLongArray.arbitrary
from ← choose(0, xs.length)
until ← choose(from, xs.length)
bytes ← choose(0, 8)
from ← Gen.choose(0, xs.length)
until ← Gen.choose(from, xs.length)
bytes ← Gen.choose(0, 8)
} yield (xs.slice(from, until), bytes)
}