X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fnotification%2FNotificationHandlerModuleTest.kt;h=11e728d55aa0c85e060cbfdcef182577c7abb397;hb=4038d16030a1cb6bb48da2967ee2c9ec9b4aaeb0;hp=d4000b5cf7bf563f03f3bbdc0f246d574e95a8d4;hpb=2a83103aab6254d877c1b5214ca5a3ef19a6fe83;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModuleTest.kt
index d4000b5..11e728d 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModuleTest.kt
@@ -52,21 +52,11 @@ class NotificationHandlerModuleTest {
 	)
 
 	@Test
-	fun `module can create notification handler`() {
-		assertThat(injector.getInstance<NotificationHandler>(), notNullValue())
-	}
-
-	@Test
 	fun `notification handler is created as singleton`() {
 		injector.verifySingletonInstance<NotificationHandler>()
 	}
 
 	@Test
-	fun `module can create mark-post-known-during-first-start handler`() {
-		assertThat(injector.getInstance<MarkPostKnownDuringFirstStartHandler>(), notNullValue())
-	}
-
-	@Test
 	fun `mark-post-known-during-first-start handler is created as singleton`() {
 		injector.verifySingletonInstance<MarkPostKnownDuringFirstStartHandler>()
 	}
@@ -83,11 +73,6 @@ class NotificationHandlerModuleTest {
 	}
 
 	@Test
-	fun `module can create sone-locked-on-startup handler`() {
-		assertThat(injector.getInstance<SoneLockedOnStartupHandler>(), notNullValue())
-	}
-
-	@Test
 	fun `sone-locked-on-startup handler is created as singleton`() {
 		injector.verifySingletonInstance<SoneLockedOnStartupHandler>()
 	}
@@ -120,11 +105,6 @@ class NotificationHandlerModuleTest {
 	}
 
 	@Test
-	fun `new-sone handler can be created`() {
-		assertThat(injector.getInstance<NewSoneHandler>(), notNullValue())
-	}
-
-	@Test
 	fun `new-sone handler is created as singleton`() {
 		injector.verifySingletonInstance<NewSoneHandler>()
 	}
@@ -149,21 +129,11 @@ class NotificationHandlerModuleTest {
 	}
 
 	@Test
-	fun `new-remote-post handler can be created`() {
-		assertThat(injector.getInstance<NewRemotePostHandler>(), notNullValue())
-	}
-
-	@Test
 	fun `new-remote-post handler is created as singleton`() {
 		injector.verifySingletonInstance<NewRemotePostHandler>()
 	}
 
 	@Test
-	fun `new-remote-post notification can be created`() {
-		assertThat(injector.getInstance<ListNotification<Post>>(named("newRemotePost")), notNullValue())
-	}
-
-	@Test
 	fun `new-remote-post notification is created as singleton`() {
 		injector.verifySingletonInstance<ListNotification<Post>>(named("newRemotePost"))
 	}
@@ -188,11 +158,6 @@ class NotificationHandlerModuleTest {
 	}
 
 	@Test
-	fun `sone-locked notification can be created`() {
-		assertThat(injector.getInstance<ListNotification<Sone>>(named("soneLocked")), notNullValue())
-	}
-
-	@Test
 	fun `sone-locked notification is created as singleton`() {
 		injector.verifySingletonInstance<ListNotification<Sone>>(named("soneLocked"))
 	}
@@ -217,21 +182,11 @@ class NotificationHandlerModuleTest {
 	}
 
 	@Test
-	fun `sone-locked handler can be created`() {
-		assertThat(injector.getInstance<SoneLockedHandler>(), notNullValue())
-	}
-
-	@Test
 	fun `sone-locked handler is created as singleton`() {
 		injector.verifySingletonInstance<SoneLockedHandler>()
 	}
 
 	@Test
-	fun `local-post notification can be created`() {
-		assertThat(injector.getInstance<ListNotification<Post>>(named("localPost")), notNullValue())
-	}
-
-	@Test
 	fun `local-post notification is not dismissable`() {
 		assertThat(injector.getInstance<ListNotification<Post>>(named("localPost")).isDismissable, equalTo(false))
 	}
@@ -256,13 +211,35 @@ class NotificationHandlerModuleTest {
 	}
 
 	@Test
-	fun `local-post handler can be created`() {
-		assertThat(injector.getInstance<LocalPostHandler>(), notNullValue())
+	fun `local-post handler is created as singleton`() {
+		injector.verifySingletonInstance<LocalPostHandler>()
 	}
 
 	@Test
-	fun `local-post handler is created as singleton`() {
-		injector.verifySingletonInstance<LocalPostHandler>()
+	fun `new-version notification is created as singleton`() {
+		injector.verifySingletonInstance<TemplateNotification>(named("newVersion"))
+	}
+
+	@Test
+	fun `new-version notification has correct ID`() {
+		assertThat(injector.getInstance<TemplateNotification>(named("newVersion")).id, equalTo("new-version-notification"))
+	}
+
+	@Test
+	fun `new-version notification is dismissable`() {
+		assertThat(injector.getInstance<TemplateNotification>(named("newVersion")).isDismissable, equalTo(true))
+	}
+
+	@Test
+	fun `new-version notification loads correct template`() {
+		loaders.templates += "/templates/notify/newVersionNotification.html" to "1".asTemplate()
+		val notification = injector.getInstance<TemplateNotification>(named("newVersion"))
+		assertThat(notification.render(), equalTo("1"))
+	}
+
+	@Test
+	fun `new-version handler is created as singleton`() {
+		injector.verifySingletonInstance<NewVersionHandler>()
 	}
 
 }