luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix TagsTest test size generator and properly set Tags.All on tag maps

This commit is contained in:
Mark Harrah 2013-03-03 19:43:37 -05:00
parent 1fdf3fa38c
commit bf1831eb88
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
main/src/test/scala/TagsTest.scala
View File

@ -2,27 +2,36 @@ package sbt
import org.scalacheck._ import org.scalacheck._
import Gen.{listOf} import Gen.{listOf}
import Prop.forAll import Prop._
import Tags._ import Tags._
object TagsTest extends Properties("Tags") object TagsTest extends Properties("Tags")
{ {
final case class Size(value: Int)
def tagMap: Gen[TagMap] = for(ts <- listOf(tagAndFrequency)) yield ts.toMap def tagMap: Gen[TagMap] = for(ts <- listOf(tagAndFrequency)) yield ts.toMap
def tagAndFrequency: Gen[(Tag, Int)] = for(t <- tag; count <- Arbitrary.arbitrary[Int]) yield (t, count) def tagAndFrequency: Gen[(Tag, Int)] = for(t <- tag; count <- Arbitrary.arbitrary[Int]) yield (t, count)
def tag: Gen[Tag] = for(s <- Arbitrary.arbitrary[String]) yield Tag(s) def tag: Gen[Tag] = for(s <- Gen.alphaStr if !s.isEmpty) yield Tag(s)
def size: Gen[Size] = for(i <- Arbitrary.arbitrary[Int] if i != Int.MinValue) yield Size(math.abs(i))
implicit def aTagMap = Arbitrary(tagMap) implicit def aTagMap = Arbitrary(tagMap)
implicit def aTagAndFrequency = Arbitrary(tagAndFrequency) implicit def aTagAndFrequency = Arbitrary(tagAndFrequency)
implicit def aTag = Arbitrary(tag) implicit def aTag = Arbitrary(tag)
implicit def aSize = Arbitrary(size)
property("exclusive allows all groups without the exclusive tag") = forAll { (tm: TagMap, tag: Tag) => property("exclusive allows all groups without the exclusive tag") = forAll { (tm: TagMap, tag: Tag) =>
excl(tag)(tm - tag) excl(tag)(tm - tag)
} }
property("exclusive only allows a group with an excusive tag when the size is one") = forAll { (tm: TagMap, size: Int, etag: Tag) =>
val tm2: TagMap = tm.updated(etag, math.abs(size)) property("exclusive only allows a group with an excusive tag when the size is one") = forAll { (tm: TagMap, size: Size, etag: Tag) =>
excl(etag)(tm2) == (size <= 1) val absSize = size.value
val tm2: TagMap = tm.updated(etag, absSize).updated(Tags.All, tm.getOrElse(Tags.All, 0) + absSize)
(s"TagMap: $tm2") |:
( excl(etag)(tm2) == (absSize <= 1) )
} }
property("exclusive always allows a group of size one") = forAll { (etag: Tag, mapTag: Tag) => property("exclusive always allows a group of size one") = forAll { (etag: Tag, mapTag: Tag) =>
val tm: TagMap = Map(mapTag -> 1) val tm: TagMap = Map(mapTag -> 1, Tags.All -> 1)
excl(etag)(tm) excl(etag)(tm)
} }