X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fnotification%2FSoneLockedOnStartupHandlerTest.kt;h=5ffac8843202d6ac22504577c4d15163b790549a;hp=0b9d1e147019ae05946520e6e203c9f057bca05b;hb=438378deab1514f0f608d975ef65f5b7aea44ccb;hpb=3bc31a49282a7c3737e330e03723aac7464be71e

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/notification/SoneLockedOnStartupHandlerTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/notification/SoneLockedOnStartupHandlerTest.kt
index 0b9d1e1..5ffac88 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/notification/SoneLockedOnStartupHandlerTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/notification/SoneLockedOnStartupHandlerTest.kt
@@ -1,5 +1,5 @@
 /**
- * Sone - SoneLockedOnStartupNotificationTest.kt - Copyright © 2019 David ‘Bombe’ Roden
+ * Sone - SoneLockedOnStartupHandlerTest.kt - Copyright © 2019–2020 David ‘Bombe’ Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,10 +19,11 @@ package net.pterodactylus.sone.web.notification
 
 import com.google.common.eventbus.*
 import net.pterodactylus.sone.core.event.*
+import net.pterodactylus.sone.data.*
 import net.pterodactylus.sone.data.impl.*
 import net.pterodactylus.sone.notify.*
-import net.pterodactylus.sone.utils.*
 import net.pterodactylus.util.notify.*
+import net.pterodactylus.util.template.*
 import org.hamcrest.MatcherAssert.*
 import org.hamcrest.Matchers.*
 import kotlin.test.*
@@ -35,29 +36,24 @@ class SoneLockedOnStartupHandlerTest {
 	@Suppress("UnstableApiUsage")
 	private val eventBus = EventBus()
 	private val manager = NotificationManager()
-	private val notification by lazy { manager.notifications.single() as ListNotification<*> }
+	private val notification = ListNotification<Sone>("", "", Template())
 
 	init {
-		SoneLockedOnStartupHandler(manager, template).also(eventBus::register)
-		eventBus.post(SoneLockedOnStartup(sone))
-	}
-
-	@Test
-	fun `notification has correct id`() {
-		assertThat(notification.id, equalTo("sone-locked-on-startup"))
+		SoneLockedOnStartupHandler(manager, notification).also(eventBus::register)
 	}
 
 	@Test
 	fun `handler adds sone to notification when event is posted`() {
+		eventBus.post(SoneLockedOnStartup(sone))
 		assertThat(notification.elements, contains<Any>(sone))
 	}
 
 	@Test
-	fun `handler creates notification with correct key`() {
-		assertThat(notification.render(), equalTo(listOf(sone).toString()))
+	fun `handler adds notification to manager`() {
+		eventBus.post(SoneLockedOnStartup(sone))
+		assertThat(manager.notifications, contains<Notification>(notification))
 	}
 
 }
 
 private val sone = IdOnlySone("sone-id")
-private val template = "<% sones>".asTemplate()