erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Restore the DynamicGraph name.

Browse source
This commit is contained in:
Cedric Beust 2016-04-17 10:29:50 -07:00
parent 63ba0ea63e
commit 408e00c0ae
4 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/test/kotlin/com/beust/kobalt/internal/DynamicGraphTest.kt
View file

@ -8,23 +8,23 @@ import java.util.*
class DynamicGraphTest {
private fun <T> assertFreeNodesEquals(graph: DG<T>, expected: Array<T>) {
private fun <T> assertFreeNodesEquals(graph: DynamicGraph<T>, expected: Array<T>) {
val h = HashSet(graph.freeNodes)
val e = HashSet(expected.toList())
Assert.assertEquals(h, e)
}
private fun <T> createFactory(runNodes: ArrayList<T>, errorFunction: (T) -> Boolean) : IThreadWorkerFactory2<T> {
return object: IThreadWorkerFactory2<T> {
override fun createWorkers(nodes: Collection<T>): List<IWorker2<T>> {
val result = arrayListOf<IWorker2<T>>()
private fun <T> createFactory(runNodes: ArrayList<T>, errorFunction: (T) -> Boolean) : IThreadWorkerFactory<T> {
return object: IThreadWorkerFactory<T> {
override fun createWorkers(nodes: Collection<T>): List<IWorker<T>> {
val result = arrayListOf<IWorker<T>>()
nodes.forEach { result.add(Worker(runNodes, it, errorFunction)) }
return result
}
}
}
class Worker<T>(val runNodes: ArrayList<T>, val n: T, val errorFunction: (T) -> Boolean) : IWorker2<T> {
class Worker<T>(val runNodes: ArrayList<T>, val n: T, val errorFunction: (T) -> Boolean) : IWorker<T> {
override val priority = 0
override fun call() : TaskResult2<T> {
@ -36,14 +36,14 @@ class DynamicGraphTest {
@Test
fun testExecutor() {
val dg = DG<String>();
val dg = DynamicGraph<String>();
dg.addEdge("compile", "runApt")
dg.addEdge("compile", "generateVersion")
val runNodes = arrayListOf<String>()
val factory = createFactory(runNodes, { true })
DGExecutor(dg, factory).run()
DynamicGraphExecutor(dg, factory).run()
Assert.assertEquals(runNodes.size, 3)
}
@ -51,7 +51,7 @@ class DynamicGraphTest {
@Test
private fun testExecutorWithSkip() {
val g = DG<Int>()
val g = DynamicGraph<Int>()
// 2 and 3 depend on 1, 4 depend on 3, 10 depends on 4
// 3 will blow up, which should make 4 and 10 skipped
g.addEdge(2, 1)
@ -61,7 +61,7 @@ class DynamicGraphTest {
g.addEdge(5, 2)
val runNodes = arrayListOf<Int>()
val factory = createFactory(runNodes, { n -> n != 3 })
val ex = DGExecutor(g, factory)
val ex = DynamicGraphExecutor(g, factory)
ex.run()
Thread.`yield`()
Assert.assertTrue(! runNodes.contains(4))
@ -70,7 +70,7 @@ class DynamicGraphTest {
@Test
fun test8() {
DG<String>().apply {
DynamicGraph<String>().apply {
addEdge("b1", "a1")
addEdge("b1", "a2")
addEdge("b2", "a1")
@ -97,7 +97,7 @@ class DynamicGraphTest {
@Test
fun test2() {
DG<String>().apply {
DynamicGraph<String>().apply {
addEdge("b1", "a1")
addEdge("b1", "a2")
addNode("x")
@ -131,7 +131,7 @@ class DynamicGraphTest {
@Test
fun runAfter() {
DG<String>().apply {
DynamicGraph<String>().apply {
// a -> b
// b -> c, d
// e

2
src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt
View file

@ -11,7 +11,7 @@ import org.testng.annotations.Test
@Guice(modules = arrayOf(TestModule::class))
class TaskManagerTest @Inject constructor(val taskManager: TaskManager) {
class DryRunGraphExecutor<T>(val graph: DG<T>) {
class DryRunGraphExecutor<T>(val graph: DynamicGraph<T>) {
fun run() : List<T> {
val result = arrayListOf<T>()
var freeNodes = graph.freeNodes