diff --git a/src/main/kotlin/no/iktdev/eventi/tasks/TaskListener.kt b/src/main/kotlin/no/iktdev/eventi/tasks/TaskListener.kt index 81ffca8..cc118ab 100644 --- a/src/main/kotlin/no/iktdev/eventi/tasks/TaskListener.kt +++ b/src/main/kotlin/no/iktdev/eventi/tasks/TaskListener.kt @@ -21,8 +21,7 @@ abstract class TaskListener(val taskType: TaskType = TaskType.CPU_INTENSIVE): Ta TaskListenerRegistry.registerListener(this) } - var reporter: TaskReporter? = null - private set + abstract var reporter: TaskReporter? abstract fun getWorkerId(): String protected var currentJob: Job? = null var currentTask: Task? = null diff --git a/src/test/kotlin/no/iktdev/eventi/tasks/AbstractTaskPollerTest.kt b/src/test/kotlin/no/iktdev/eventi/tasks/AbstractTaskPollerTest.kt index 1c5647b..815a0f6 100644 --- a/src/test/kotlin/no/iktdev/eventi/tasks/AbstractTaskPollerTest.kt +++ b/src/test/kotlin/no/iktdev/eventi/tasks/AbstractTaskPollerTest.kt @@ -1,13 +1,11 @@ package no.iktdev.eventi.tasks -import io.mockk.mockk import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.advanceUntilIdle import kotlinx.coroutines.test.runTest import no.iktdev.eventi.InMemoryTaskStore import no.iktdev.eventi.TestBase -import no.iktdev.eventi.events.EventListener import no.iktdev.eventi.events.EventTypeRegistry import no.iktdev.eventi.models.Event import no.iktdev.eventi.models.Task @@ -60,6 +58,8 @@ class AbstractTaskPollerTest : TestBase() { open class EchoListener : TaskListener(TaskType.MIXED) { var result: Event? = null + override var reporter: TaskReporter? = null + override fun getWorkerId() = this.javaClass.simpleName override fun supports(task: Task): Boolean { @@ -98,7 +98,7 @@ class AbstractTaskPollerTest : TestBase() { advanceUntilIdle() val producedEvent = eventDeferred.await() assertThat(producedEvent).isNotNull - assertThat(producedEvent!!.metadata.derivedFromId).isEqualTo(task.taskId) + assertThat(producedEvent.metadata.derivedFromId).isEqualTo(task.taskId) assertThat((listener.result as EchoEvent).data).isEqualTo("Hello Potetmos") }