From 97ec031c522fb4a7093545afc61ae66a96a5ed20 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 21 Apr 2016 01:28:14 -0800 Subject: [PATCH] Refactor tests. --- .../beust/kobalt/internal/TaskManagerTest.kt | 51 +++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt b/src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt index b66a2e84..f783f187 100644 --- a/src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt +++ b/src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt @@ -52,9 +52,9 @@ class TaskManagerTest @Inject constructor(val taskManager: TaskManager) { Assert.assertEquals(runCompileTasks(listOf("clean")), listOf("clean", "copyVersion")) Assert.assertEquals(runCompileTasks(listOf("clean", "compile")), listOf("clean", "compile", "copyVersion", "postCompile")) - Assert.assertEquals(runCompileTasks(listOf("assemble")), listOf("compile", "assemble")) + Assert.assertEquals(runCompileTasks(listOf("assemble")), listOf("compile", "assemble", "postCompile")) Assert.assertEquals(runCompileTasks(listOf("clean", "assemble")), listOf("clean", "compile", "assemble", - "copyVersion")) + "copyVersion", "postCompile")) } val EMPTY_MULTI_MAP = ArrayListMultimap.create() @@ -84,58 +84,57 @@ class TaskManagerTest @Inject constructor(val taskManager: TaskManager) { @Test fun exampleInTheDocTest() { - runTasks(listOf("compile"), + Assert.assertEquals(runTasks(listOf("compile"), dependsOn = TreeMultimap.create().apply { put("compile", "clean") }, reverseDependsOn = TreeMultimap.create().apply { put("compile", "example") - }).let { result -> - Assert.assertEquals(result, listOf("clean", "compile", "example")) - } - runTasks(listOf("compile"), + }), + listOf("clean", "compile", "example")) + + Assert.assertEquals(runTasks(listOf("compile"), dependsOn = TreeMultimap.create().apply { put("compile", "clean") put("compile", "example") - }).let { result -> - Assert.assertEquals(result, listOf("clean", "example", "compile")) - } - runTasks(listOf("compile"), + }), + listOf("clean", "example", "compile")) + + Assert.assertEquals(runTasks(listOf("compile"), dependsOn = TreeMultimap.create().apply { put("compile", "clean") }, runAfter = TreeMultimap.create().apply { put("compile", "example") - }).let { result -> - Assert.assertEquals(result, listOf("clean", "compile")) - } - runTasks(listOf("compile"), + }), + listOf("clean", "compile")) + + Assert.assertEquals(runTasks(listOf("compile"), dependsOn = TreeMultimap.create().apply { put("compile", "clean") }, runBefore = TreeMultimap.create().apply { put("compile", "example") - }).let { result -> - Assert.assertEquals(result, listOf("clean", "compile")) - } - runTasks(listOf("compile", "example"), + }), + listOf("clean", "compile")) + + Assert.assertEquals(runTasks(listOf("compile", "example"), dependsOn = TreeMultimap.create().apply { put("compile", "clean") }, runBefore = TreeMultimap.create().apply { put("compile", "example") - }).let { result -> - Assert.assertEquals(result, listOf("clean", "example", "compile")) - } - runTasks(listOf("compile", "example"), + }), + listOf("clean", "example", "compile")) + + Assert.assertEquals(runTasks(listOf("compile", "example"), dependsOn = TreeMultimap.create().apply { put("compile", "clean") }, runAfter = TreeMultimap.create().apply { put("compile", "example") - }).let { result -> - Assert.assertEquals(result, listOf("clean", "compile", "example")) - } + }), + listOf("clean", "compile", "example")) } }