mirror of https://github.com/sbt/sbt.git
Fix sbt-test issues
This commit is contained in:
parent
a66dabcc3b
commit
68bc4f53cf
|
|
@ -14,9 +14,9 @@ TaskKey[Unit]("check") := {
|
||||||
val expectedGraph =
|
val expectedGraph =
|
||||||
"""default:default-dbc48d_2.9.2:0.1-SNAPSHOT [S]
|
"""default:default-dbc48d_2.9.2:0.1-SNAPSHOT [S]
|
||||||
| +-com.codahale:jerkson_2.9.1:0.5.0 [S]
|
| +-com.codahale:jerkson_2.9.1:0.5.0 [S]
|
||||||
| +-org.codehaus.jackson:jackson-core-asl:1.9.13
|
| +-org.codehaus.jackson:jackson-core-asl:1.9.11
|
||||||
| +-org.codehaus.jackson:jackson-mapper-asl:1.9.13
|
| +-org.codehaus.jackson:jackson-mapper-asl:1.9.11
|
||||||
| +-org.codehaus.jackson:jackson-core-asl:1.9.13
|
| +-org.codehaus.jackson:jackson-core-asl:1.9.11
|
||||||
| """.stripMargin
|
| """.stripMargin
|
||||||
IO.writeLines(file("/tmp/blib"), sanitize(graph).split("\n"))
|
IO.writeLines(file("/tmp/blib"), sanitize(graph).split("\n"))
|
||||||
IO.writeLines(file("/tmp/blub"), sanitize(expectedGraph).split("\n"))
|
IO.writeLines(file("/tmp/blub"), sanitize(expectedGraph).split("\n"))
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,65 @@
|
||||||
|
import collection.mutable.ListBuffer
|
||||||
|
|
||||||
|
import net.virtualvoid.sbt.graph.DependencyGraphKeys.dependencyDot
|
||||||
|
|
||||||
|
import scala.collection.mutable.ListBuffer
|
||||||
|
|
||||||
|
def defaultSettings =
|
||||||
|
Seq(scalaVersion := "2.9.2")
|
||||||
|
|
||||||
|
lazy val justATransiviteDependencyEndpointProject =
|
||||||
|
Project("just-a-transitive-dependency-endpoint", file("a"))
|
||||||
|
.settings(defaultSettings: _*)
|
||||||
|
|
||||||
|
lazy val justATransitiveDependencyProject =
|
||||||
|
Project("just-a-transitive-dependency", file("b"))
|
||||||
|
.settings(defaultSettings: _*)
|
||||||
|
.dependsOn(justATransiviteDependencyEndpointProject)
|
||||||
|
|
||||||
|
lazy val justADependencyProject =
|
||||||
|
Project("just-a-dependency", file("c"))
|
||||||
|
.settings(defaultSettings: _*)
|
||||||
|
|
||||||
|
lazy val test_project =
|
||||||
|
Project("test-dot-file-generation", file("d"))
|
||||||
|
.settings(defaultSettings: _*)
|
||||||
|
.settings(
|
||||||
|
TaskKey[Unit]("check") := {
|
||||||
|
val dotFile = (dependencyDot in Compile).value
|
||||||
|
val expectedGraph =
|
||||||
|
"""digraph "dependency-graph" {
|
||||||
|
| graph[rankdir="LR"]
|
||||||
|
| edge [
|
||||||
|
| arrowtail="none"
|
||||||
|
| ]
|
||||||
|
| "test-dot-file-generation:test-dot-file-generation_2.9.2:0.1-SNAPSHOT"[label=<test-dot-file-generation<BR/><B>test-dot-file-generation_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
|
||||||
|
| "just-a-transitive-dependency:just-a-transitive-dependency_2.9.2:0.1-SNAPSHOT"[label=<just-a-transitive-dependency<BR/><B>just-a-transitive-dependency_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
|
||||||
|
| "just-a-transitive-dependency-endpoint:just-a-transitive-dependency-endpoint_2.9.2:0.1-SNAPSHOT"[label=<just-a-transitive-dependency-endpoint<BR/><B>just-a-transitive-dependency-endpoint_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
|
||||||
|
| "just-a-dependency:just-a-dependency_2.9.2:0.1-SNAPSHOT"[label=<just-a-dependency<BR/><B>just-a-dependency_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
|
||||||
|
| "test-dot-file-generation:test-dot-file-generation_2.9.2:0.1-SNAPSHOT" -> "just-a-transitive-dependency:just-a-transitive-dependency_2.9.2:0.1-SNAPSHOT"
|
||||||
|
| "just-a-transitive-dependency:just-a-transitive-dependency_2.9.2:0.1-SNAPSHOT" -> "just-a-transitive-dependency-endpoint:just-a-transitive-dependency-endpoint_2.9.2:0.1-SNAPSHOT"
|
||||||
|
| "test-dot-file-generation:test-dot-file-generation_2.9.2:0.1-SNAPSHOT" -> "just-a-dependency:just-a-dependency_2.9.2:0.1-SNAPSHOT"
|
||||||
|
|}
|
||||||
|
""".stripMargin
|
||||||
|
|
||||||
|
val graph : String = scala.io.Source.fromFile(dotFile.getAbsolutePath).mkString
|
||||||
|
val errors = compareByLine(graph, expectedGraph)
|
||||||
|
require(errors.isEmpty , errors.mkString("\n"))
|
||||||
|
()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
.dependsOn(justADependencyProject, justATransitiveDependencyProject)
|
||||||
|
|
||||||
|
def compareByLine(got : String, expected : String) : Seq[String] = {
|
||||||
|
val errors = ListBuffer[String]()
|
||||||
|
got.split("\n").zip(expected.split("\n").toSeq).zipWithIndex.foreach { case((got_line : String, expected_line : String), i : Int) =>
|
||||||
|
if(got_line != expected_line) {
|
||||||
|
errors.append(
|
||||||
|
"""not matching lines at line %s
|
||||||
|
|expected: %s
|
||||||
|
|got: %s
|
||||||
|
|""".stripMargin.format(i,expected_line, got_line))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
errors
|
||||||
|
}
|
||||||
|
|
@ -1,69 +0,0 @@
|
||||||
import collection.mutable.ListBuffer
|
|
||||||
|
|
||||||
import sbt._
|
|
||||||
import sbt.Keys._
|
|
||||||
|
|
||||||
import net.virtualvoid.sbt.graph.DependencyGraphKeys._
|
|
||||||
|
|
||||||
object Build extends sbt.Build {
|
|
||||||
|
|
||||||
def defaultSettings =
|
|
||||||
Seq(scalaVersion := "2.9.2")
|
|
||||||
|
|
||||||
lazy val justATransiviteDependencyEndpointProject =
|
|
||||||
Project("just-a-transitive-dependency-endpoint", file("a"))
|
|
||||||
.settings(defaultSettings: _*)
|
|
||||||
|
|
||||||
lazy val justATransitiveDependencyProject =
|
|
||||||
Project("just-a-transitive-dependency", file("b"))
|
|
||||||
.settings(defaultSettings: _*)
|
|
||||||
.dependsOn(justATransiviteDependencyEndpointProject)
|
|
||||||
|
|
||||||
lazy val justADependencyProject =
|
|
||||||
Project("just-a-dependency", file("c"))
|
|
||||||
.settings(defaultSettings: _*)
|
|
||||||
|
|
||||||
lazy val test_project =
|
|
||||||
Project("test-dot-file-generation", file("d"))
|
|
||||||
.settings(defaultSettings: _*)
|
|
||||||
.settings(
|
|
||||||
TaskKey[Unit]("check") := {
|
|
||||||
val dotFile = (dependencyDot in Compile).value
|
|
||||||
val expectedGraph =
|
|
||||||
"""digraph "dependency-graph" {
|
|
||||||
| graph[rankdir="LR"]
|
|
||||||
| edge [
|
|
||||||
| arrowtail="none"
|
|
||||||
| ]
|
|
||||||
| "test-dot-file-generation:test-dot-file-generation_2.9.2:0.1-SNAPSHOT"[label=<test-dot-file-generation<BR/><B>test-dot-file-generation_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
|
|
||||||
| "just-a-transitive-dependency:just-a-transitive-dependency_2.9.2:0.1-SNAPSHOT"[label=<just-a-transitive-dependency<BR/><B>just-a-transitive-dependency_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
|
|
||||||
| "just-a-transitive-dependency-endpoint:just-a-transitive-dependency-endpoint_2.9.2:0.1-SNAPSHOT"[label=<just-a-transitive-dependency-endpoint<BR/><B>just-a-transitive-dependency-endpoint_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
|
|
||||||
| "just-a-dependency:just-a-dependency_2.9.2:0.1-SNAPSHOT"[label=<just-a-dependency<BR/><B>just-a-dependency_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
|
|
||||||
| "test-dot-file-generation:test-dot-file-generation_2.9.2:0.1-SNAPSHOT" -> "just-a-transitive-dependency:just-a-transitive-dependency_2.9.2:0.1-SNAPSHOT"
|
|
||||||
| "just-a-transitive-dependency:just-a-transitive-dependency_2.9.2:0.1-SNAPSHOT" -> "just-a-transitive-dependency-endpoint:just-a-transitive-dependency-endpoint_2.9.2:0.1-SNAPSHOT"
|
|
||||||
| "test-dot-file-generation:test-dot-file-generation_2.9.2:0.1-SNAPSHOT" -> "just-a-dependency:just-a-dependency_2.9.2:0.1-SNAPSHOT"
|
|
||||||
|}
|
|
||||||
""".stripMargin
|
|
||||||
|
|
||||||
val graph : String = scala.io.Source.fromFile(dotFile.getAbsolutePath).mkString
|
|
||||||
val errors = compareByLine(graph, expectedGraph)
|
|
||||||
require(errors.isEmpty , errors.mkString("\n"))
|
|
||||||
()
|
|
||||||
}
|
|
||||||
)
|
|
||||||
.dependsOn(justADependencyProject, justATransitiveDependencyProject)
|
|
||||||
|
|
||||||
def compareByLine(got : String, expected : String) : Seq[String] = {
|
|
||||||
val errors = ListBuffer[String]()
|
|
||||||
got.split("\n").zip(expected.split("\n").toSeq).zipWithIndex.foreach { case((got_line : String, expected_line : String), i : Int) =>
|
|
||||||
if(got_line != expected_line) {
|
|
||||||
errors.append(
|
|
||||||
"""not matching lines at line %s
|
|
||||||
|expected: %s
|
|
||||||
|got: %s
|
|
||||||
|""".stripMargin.format(i,expected_line, got_line))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
errors
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue