X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Frhynodge%2Fmergers%2FLastStateMergerTest.kt;h=07d2bee42e679ea2c7716da1f337d259768c9ff2;hb=9416428be83fdfefee8f303f2d8c1e1cb9d09a0b;hp=6046bb36906da9c2ef81904e42a12b4624eeb3c3;hpb=7d5181cb9a014360f23d4d3e710210a0a06a29a7;p=rhynodge.git

diff --git a/src/test/kotlin/net/pterodactylus/rhynodge/mergers/LastStateMergerTest.kt b/src/test/kotlin/net/pterodactylus/rhynodge/mergers/LastStateMergerTest.kt
index 6046bb3..07d2bee 100644
--- a/src/test/kotlin/net/pterodactylus/rhynodge/mergers/LastStateMergerTest.kt
+++ b/src/test/kotlin/net/pterodactylus/rhynodge/mergers/LastStateMergerTest.kt
@@ -3,18 +3,27 @@ package net.pterodactylus.rhynodge.mergers
 import net.pterodactylus.rhynodge.State
 import net.pterodactylus.rhynodge.states.StateManagerTest.TestState
 import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.sameInstance
+import org.hamcrest.Matchers.equalTo
 import org.junit.Test
 
 class LastStateMergerTest {
 
 	@Test
 	fun `merging states returns the current state`() {
-		assertThat(merger.mergeStates(previousState, successfulState), sameInstance(successfulState))
+		val mergedState = merger.mergeStates(previousState, successfulState)
+		assertThat(mergedState.time(), equalTo(successfulState.time()))
+		assertThat(mergedState.success(), equalTo(successfulState.success()))
+		assertThat(mergedState.failCount(), equalTo(successfulState.failCount()))
+		assertThat(mergedState.exception(), equalTo(successfulState.exception()))
+	}
+
+	@Test
+	fun `returned state is always triggered`() {
+		assertThat(merger.mergeStates(previousState, successfulState).triggered(), equalTo(true))
 	}
 
 	private val merger = LastStateMerger()
-	private val previousState = TestState()
-	private val successfulState: State = TestState()
+	private val previousState = TestState(false)
+	private val successfulState: State = TestState(true)
 
 }