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

Merge pull request #4488 from eatkins/test-keys 

Rename TestBuild.Keys to TestBuild.TestKeys
This commit is contained in:
eugene yokota 2018-12-15 01:40:11 -05:00 committed by GitHub
parent a9a8513b15 bfffb4f489
commit 4c553835a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main/src/test/scala/Delegates.scala
View File

@ -23,12 +23,12 @@ object Delegates extends Properties("delegates") {
t.nonEmpty
}
property("no duplicate scopes") = forAll { (keys: Keys) =>
property("no duplicate scopes") = forAll { (keys: TestKeys) =>
allDelegates(keys) { (_, ds) =>
ds.distinct.size == ds.size
}
}
property("delegates non-empty") = forAll { (keys: Keys) =>
property("delegates non-empty") = forAll { (keys: TestKeys) =>
allDelegates(keys) { (_, ds) =>
ds.nonEmpty
}
@ -36,7 +36,7 @@ object Delegates extends Properties("delegates") {
property("An initially Zero axis is Zero in all delegates") = allAxes(alwaysZero)
property("Projects precede builds precede Zero") = forAll { (keys: Keys) =>
property("Projects precede builds precede Zero") = forAll { (keys: TestKeys) =>
allDelegates(keys) { (scope, ds) =>
val projectAxes = ds.map(_.project)
val nonProject = projectAxes.dropWhile {
@ -51,19 +51,19 @@ object Delegates extends Properties("delegates") {
(s, ds, _) => globalCombinations(s, ds)
)
property("initial scope first") = forAll { (keys: Keys) =>
property("initial scope first") = forAll { (keys: TestKeys) =>
allDelegates(keys) { (scope, ds) =>
ds.head == scope
}
}
property("global scope last") = forAll { (keys: Keys) =>
property("global scope last") = forAll { (keys: TestKeys) =>
allDelegates(keys) { (_, ds) =>
ds.last == Scope.GlobalScope
}
}
property("Project axis delegates to BuildRef then Zero") = forAll { (keys: Keys) =>
property("Project axis delegates to BuildRef then Zero") = forAll { (keys: TestKeys) =>
allDelegates(keys) { (key, ds) =>
key.project match {
case Zero => true // filtering out of testing
@ -84,7 +84,7 @@ object Delegates extends Properties("delegates") {
}
}
property("Config axis delegates to parent configuration") = forAll { (keys: Keys) =>
property("Config axis delegates to parent configuration") = forAll { (keys: TestKeys) =>
allDelegates(keys) { (key, ds) =>
key.config match {
case Zero => true
@ -109,13 +109,13 @@ object Delegates extends Properties("delegates") {
}
def allAxes(f: (Scope, Seq[Scope], Scope => ScopeAxis[_]) => Prop): Prop = forAll {
(keys: Keys) =>
(keys: TestKeys) =>
allDelegates(keys) { (s, ds) =>
all(f(s, ds, _.project), f(s, ds, _.config), f(s, ds, _.task), f(s, ds, _.extra))
}
}
def allDelegates(keys: Keys)(f: (Scope, Seq[Scope]) => Prop): Prop =
def allDelegates(keys: TestKeys)(f: (Scope, Seq[Scope]) => Prop): Prop =
all(keys.scopes map { scope =>
val delegates = keys.env.delegates(scope)
("Scope: " + Scope.display(scope, "_")) |:

10
main/src/test/scala/sbt/internal/TestBuild.scala
View File

@ -43,7 +43,7 @@ abstract class TestBuild {
implicit val tGen = Arbitrary { genTasks(lowerIDGen, MaxDepsGen, MaxTasksGen) }
val seed = rng.Seed.random
class Keys(val env: Env, val scopes: Seq[Scope]) {
class TestKeys(val env: Env, val scopes: Seq[Scope]) {
override def toString = env + "\n" + scopes.mkString("Scopes:\n\t", "\n\t", "")
lazy val delegated = scopes map env.delegates
}
@ -188,10 +188,10 @@ abstract class TestBuild {
(f(t), t)
} toMap;
implicit lazy val arbKeys: Arbitrary[Keys] = Arbitrary(keysGen)
lazy val keysGen: Gen[Keys] = for (env <- mkEnv; keyCount <- chooseShrinkable(1, KeysPerEnv);
keys <- listOfN(keyCount, scope(env)))
yield new Keys(env, keys)
implicit lazy val arbKeys: Arbitrary[TestKeys] = Arbitrary(keysGen)
lazy val keysGen: Gen[TestKeys] = for (env <- mkEnv; keyCount <- chooseShrinkable(1, KeysPerEnv);
keys <- listOfN(keyCount, scope(env)))
yield new TestKeys(env, keys)
def scope(env: Env): Gen[Scope] =
for {