projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eb828be
)
🐛 Fix handler for remote posts
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Mon, 9 Dec 2019 19:47:16 +0000
(20:47 +0100)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 11 Dec 2019 15:59:05 +0000
(16:59 +0100)
src/main/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandler.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandlerTest.kt
patch
|
blob
|
history
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandler.kt
b/src/main/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandler.kt
index
acf9980
..
1127fea
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandler.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandler.kt
@@
-31,9
+31,11
@@
class NewRemotePostHandler(private val notificationManager: NotificationManager,
@Subscribe
fun newPostFound(newPostFoundEvent: NewPostFoundEvent) {
@Subscribe
fun newPostFound(newPostFoundEvent: NewPostFoundEvent) {
- notification.add(newPostFoundEvent.post)
- if (!notificationManager.hasFirstStartNotification()) {
- notificationManager.addNotification(notification)
+ if (!newPostFoundEvent.post.sone.isLocal) {
+ notification.add(newPostFoundEvent.post)
+ if (!notificationManager.hasFirstStartNotification()) {
+ notificationManager.addNotification(notification)
+ }
}
}
}
}
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandlerTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandlerTest.kt
index
a86bbf1
..
5e4e5fc
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandlerTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandlerTest.kt
@@
-20,6
+20,8
@@
package net.pterodactylus.sone.web.notification
import com.google.common.eventbus.*
import net.pterodactylus.sone.core.event.*
import net.pterodactylus.sone.data.*
import com.google.common.eventbus.*
import net.pterodactylus.sone.core.event.*
import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.data.Post.*
+import net.pterodactylus.sone.data.impl.*
import net.pterodactylus.sone.notify.*
import net.pterodactylus.util.notify.*
import net.pterodactylus.util.template.*
import net.pterodactylus.sone.notify.*
import net.pterodactylus.util.notify.*
import net.pterodactylus.util.template.*
@@
-44,26
+46,48
@@
class NewRemotePostHandlerTest {
}
@Test
}
@Test
- fun `handler adds post to new-post notification`() {
- eventBus.post(NewPostFoundEvent(
p
ost))
- assertThat(notification.elements, contains(
p
ost))
+ fun `handler adds
remote
post to new-post notification`() {
+ eventBus.post(NewPostFoundEvent(
remoteP
ost))
+ assertThat(notification.elements, contains(
remoteP
ost))
}
@Test
}
@Test
- fun `handler adds notification to notification manager`() {
- eventBus.post(NewPostFoundEvent(post))
+ fun `handler does not add local post to new-post notification`() {
+ eventBus.post(NewPostFoundEvent(localPost))
+ assertThat(notification.elements, emptyIterable())
+ }
+
+ @Test
+ fun `handler adds notification for remote post to notification manager`() {
+ eventBus.post(NewPostFoundEvent(remotePost))
assertThat(notificationManager.notifications, contains<Notification>(notification))
}
@Test
assertThat(notificationManager.notifications, contains<Notification>(notification))
}
@Test
+ fun `handler does not add notification for local post to notification manager`() {
+ eventBus.post(NewPostFoundEvent(localPost))
+ assertThat(notificationManager.notifications, emptyIterable())
+ }
+
+ @Test
fun `handler does not add notification to notification manager during first start`() {
notificationManager.addNotification(object : AbstractNotification("first-start-notification") {
override fun render(writer: Writer?) = Unit
})
fun `handler does not add notification to notification manager during first start`() {
notificationManager.addNotification(object : AbstractNotification("first-start-notification") {
override fun render(writer: Writer?) = Unit
})
- eventBus.post(NewPostFoundEvent(
p
ost))
+ eventBus.post(NewPostFoundEvent(
remoteP
ost))
assertThat(notificationManager.notifications, not(hasItem(notification)))
}
}
assertThat(notificationManager.notifications, not(hasItem(notification)))
}
}
-private val post: Post = Post.EmptyPost("post")
+private val remoteSone: Sone = IdOnlySone("remote-sone")
+private val remotePost: Post = object : EmptyPost("remote-post") {
+ override fun getSone() = remoteSone
+}
+
+private val localSone: Sone = object : IdOnlySone("local-sone") {
+ override fun isLocal() = true
+}
+private val localPost: Post = object : EmptyPost("local-post") {
+ override fun getSone() = localSone
+}