Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-15 18:12:54 +00:00
Code Issues Releases Wiki Activity

[fenix] Refactor messaging middleware Part III

Browse Source
This commit is contained in:
James Hugman 2023-01-16 20:27:22 +00:00 committed by mergify[bot]
parent a666f4313b
commit cf84e3c869
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/gleanplumb/state/MessagingMiddleware.kt
View File

@ -27,12 +27,10 @@ typealias AppStoreMiddlewareContext = MiddlewareContext<AppState, AppAction>
class MessagingMiddleware( class MessagingMiddleware(
private val messagingStorage: NimbusMessagingStorage, private val messagingStorage: NimbusMessagingStorage,
private val controller: NimbusMessagingController = NimbusMessagingController(messagingStorage),
private val coroutineScope: CoroutineScope = CoroutineScope(Dispatchers.IO), private val coroutineScope: CoroutineScope = CoroutineScope(Dispatchers.IO),
clock: () -> Long = { System.currentTimeMillis() },
) : Middleware<AppState, AppAction> { ) : Middleware<AppState, AppAction> {
private val controller = NimbusMessagingController(messagingStorage, clock)
override fun invoke( override fun invoke(
context: AppStoreMiddlewareContext, context: AppStoreMiddlewareContext,
next: (AppAction) -> Unit, next: (AppAction) -> Unit,

13
app/src/test/java/org/mozilla/fenix/gleanplumb/state/MessagingMiddlewareTest.kt
View File

@ -34,6 +34,7 @@ import org.mozilla.fenix.components.appstate.AppAction.MessagingAction.UpdateMes
import org.mozilla.fenix.components.appstate.AppState import org.mozilla.fenix.components.appstate.AppState
import org.mozilla.fenix.gleanplumb.Message import org.mozilla.fenix.gleanplumb.Message
import org.mozilla.fenix.gleanplumb.MessagingState import org.mozilla.fenix.gleanplumb.MessagingState
import org.mozilla.fenix.gleanplumb.NimbusMessagingController
import org.mozilla.fenix.gleanplumb.NimbusMessagingStorage import org.mozilla.fenix.gleanplumb.NimbusMessagingStorage
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.mozilla.fenix.nimbus.MessageData import org.mozilla.fenix.nimbus.MessageData
@ -48,6 +49,7 @@ class MessagingMiddlewareTest {
private lateinit var appStore: AppStore private lateinit var appStore: AppStore
private lateinit var middleware: MessagingMiddleware private lateinit var middleware: MessagingMiddleware
private lateinit var messagingStorage: NimbusMessagingStorage private lateinit var messagingStorage: NimbusMessagingStorage
private lateinit var messagingController: NimbusMessagingController
private lateinit var middlewareContext: MiddlewareContext<AppState, AppAction> private lateinit var middlewareContext: MiddlewareContext<AppState, AppAction>
@get:Rule @get:Rule
@ -57,13 +59,14 @@ class MessagingMiddlewareTest {
fun setUp() { fun setUp() {
appStore = mockk(relaxed = true) appStore = mockk(relaxed = true)
messagingStorage = mockk(relaxed = true) messagingStorage = mockk(relaxed = true)
messagingController = NimbusMessagingController(messagingStorage, clock = { 0L })
middlewareContext = mockk(relaxed = true) middlewareContext = mockk(relaxed = true)
every { middlewareContext.store } returns appStore every { middlewareContext.store } returns appStore
middleware = MessagingMiddleware( middleware = MessagingMiddleware(
messagingStorage, messagingStorage,
messagingController,
coroutineScope, coroutineScope,
clock = { 0L },
) )
} }
@ -113,6 +116,7 @@ class MessagingMiddlewareTest {
middleware.invoke(middlewareContext, {}, MessageClicked(message)) middleware.invoke(middlewareContext, {}, MessageClicked(message))
coVerify { messagingController.onMessageClicked(message) }
coVerify { messagingStorage.updateMetadata(message.metadata.copy(pressed = true)) } coVerify { messagingStorage.updateMetadata(message.metadata.copy(pressed = true)) }
verify { middlewareContext.dispatch(UpdateMessages(emptyList())) } verify { middlewareContext.dispatch(UpdateMessages(emptyList())) }
} }
@ -140,6 +144,7 @@ class MessagingMiddlewareTest {
MessageDismissed(message), MessageDismissed(message),
) )
coVerify { messagingController.onMessageDismissed(message) }
coVerify { messagingStorage.updateMetadata(message.metadata.copy(dismissed = true)) } coVerify { messagingStorage.updateMetadata(message.metadata.copy(dismissed = true)) }
verify { middlewareContext.dispatch(UpdateMessages(emptyList())) } verify { middlewareContext.dispatch(UpdateMessages(emptyList())) }
} }
@ -164,9 +169,9 @@ class MessagingMiddlewareTest {
spiedMiddleware.onMessagedDisplayed(message, middlewareContext) spiedMiddleware.onMessagedDisplayed(message, middlewareContext)
coVerify { messagingController.onMessageDisplayed(message) }
coVerify { messagingStorage.updateMetadata(message.metadata.copy(displayCount = 1)) } coVerify { messagingStorage.updateMetadata(message.metadata.copy(displayCount = 1)) }
verify { middlewareContext.dispatch(UpdateMessages(emptyList())) } verify { middlewareContext.dispatch(UpdateMessages(emptyList())) }
// verify { spiedMiddleware.sendExpiredMessageTelemetry(message.id) }
} }
@Test @Test
@ -187,6 +192,7 @@ class MessagingMiddlewareTest {
spiedMiddleware.onMessageDismissed(middlewareContext, message) spiedMiddleware.onMessageDismissed(middlewareContext, message)
coVerify { messagingController.onMessageDismissed(message) }
coVerify { messagingStorage.updateMetadata(message.metadata.copy(dismissed = true)) } coVerify { messagingStorage.updateMetadata(message.metadata.copy(dismissed = true)) }
verify { middlewareContext.dispatch(UpdateMessages(emptyList())) } verify { middlewareContext.dispatch(UpdateMessages(emptyList())) }
verify { spiedMiddleware.removeMessage(middlewareContext, message) } verify { spiedMiddleware.removeMessage(middlewareContext, message) }
@ -304,6 +310,7 @@ class MessagingMiddlewareTest {
verify { spiedMiddleware.updateMessage(middlewareContext, oldMessage, updatedMessage) } verify { spiedMiddleware.updateMessage(middlewareContext, oldMessage, updatedMessage) }
verify { middlewareContext.dispatch(UpdateMessages(emptyList())) } verify { middlewareContext.dispatch(UpdateMessages(emptyList())) }
coVerify { messagingController.onMessageDisplayed(oldMessage) }
coVerify { messagingStorage.updateMetadata(updatedMessage.metadata) } coVerify { messagingStorage.updateMetadata(updatedMessage.metadata) }
} }
@ -336,7 +343,7 @@ class MessagingMiddlewareTest {
verify { spiedMiddleware.consumeMessageToShowIfNeeded(middlewareContext, oldMessage) } verify { spiedMiddleware.consumeMessageToShowIfNeeded(middlewareContext, oldMessage) }
verify { spiedMiddleware.removeMessage(middlewareContext, oldMessage) } verify { spiedMiddleware.removeMessage(middlewareContext, oldMessage) }
verify { middlewareContext.dispatch(UpdateMessages(emptyList())) } verify { middlewareContext.dispatch(UpdateMessages(emptyList())) }
coVerify { messagingController.onMessageDisplayed(oldMessage) }
coVerify { messagingStorage.updateMetadata(updatedMessage.metadata) } coVerify { messagingStorage.updateMetadata(updatedMessage.metadata) }
// verify { spiedMiddleware.sendShownMessageTelemetry(oldMessage.id) }
} }
} }