naming convention

This commit is contained in:
Benoit Marty 2024-11-22 15:45:41 +01:00
parent 41f0278735
commit c1868ebd14
2 changed files with 15 additions and 15 deletions

View file

@ -18,9 +18,9 @@ import io.element.android.libraries.matrix.test.A_TIMESTAMP
import io.element.android.libraries.matrix.ui.components.aMatrixUser import io.element.android.libraries.matrix.ui.components.aMatrixUser
import io.element.android.libraries.matrix.ui.media.AVATAR_THUMBNAIL_SIZE_IN_PIXEL import io.element.android.libraries.matrix.ui.media.AVATAR_THUMBNAIL_SIZE_IN_PIXEL
import io.element.android.libraries.matrix.ui.media.MediaRequestData import io.element.android.libraries.matrix.ui.media.MediaRequestData
import io.element.android.libraries.push.impl.notifications.factories.MARK_AS_READ_ACTION_TITLE
import io.element.android.libraries.push.impl.notifications.factories.QUICK_REPLY_ACTION_TITLE
import io.element.android.libraries.push.impl.notifications.factories.createNotificationCreator import io.element.android.libraries.push.impl.notifications.factories.createNotificationCreator
import io.element.android.libraries.push.impl.notifications.factories.markAsReadActionTitle
import io.element.android.libraries.push.impl.notifications.factories.quickReplyActionTitle
import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
import io.element.android.libraries.push.test.notifications.FakeImageLoader import io.element.android.libraries.push.test.notifications.FakeImageLoader
import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
@ -162,8 +162,8 @@ class DefaultRoomGroupMessageCreatorTest {
val actionTitles = result.actions?.map { it.title } val actionTitles = result.actions?.map { it.title }
assertThat(actionTitles).isEqualTo( assertThat(actionTitles).isEqualTo(
listOfNotNull( listOfNotNull(
markAsReadActionTitle.takeIf { NotificationConfig.SHOW_MARK_AS_READ_ACTION }, MARK_AS_READ_ACTION_TITLE.takeIf { NotificationConfig.SHOW_MARK_AS_READ_ACTION },
quickReplyActionTitle.takeIf { NotificationConfig.SHOW_QUICK_REPLY_ACTION }, QUICK_REPLY_ACTION_TITLE.takeIf { NotificationConfig.SHOW_QUICK_REPLY_ACTION },
) )
) )
assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0) assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)
@ -188,7 +188,7 @@ class DefaultRoomGroupMessageCreatorTest {
val actionTitles = result.actions?.map { it.title } val actionTitles = result.actions?.map { it.title }
assertThat(actionTitles).isEqualTo( assertThat(actionTitles).isEqualTo(
listOfNotNull( listOfNotNull(
markAsReadActionTitle.takeIf { NotificationConfig.SHOW_MARK_AS_READ_ACTION } MARK_AS_READ_ACTION_TITLE.takeIf { NotificationConfig.SHOW_MARK_AS_READ_ACTION }
) )
) )
assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0) assertThat(fakeImageLoader.getCoilRequests().size).isEqualTo(0)

View file

@ -155,8 +155,8 @@ class DefaultNotificationCreatorTest {
val actionTitles = result.actions?.map { it.title } val actionTitles = result.actions?.map { it.title }
assertThat(actionTitles).isEqualTo( assertThat(actionTitles).isEqualTo(
listOfNotNull( listOfNotNull(
rejectInvitationActionTitle.takeIf { NotificationConfig.SHOW_ACCEPT_AND_DECLINE_INVITE_ACTIONS }, REJECT_INVITATION_ACTION_TITLE.takeIf { NotificationConfig.SHOW_ACCEPT_AND_DECLINE_INVITE_ACTIONS },
acceptInvitationActionTitle.takeIf { NotificationConfig.SHOW_ACCEPT_AND_DECLINE_INVITE_ACTIONS }, ACCEPT_INVITATION_ACTION_TITLE.takeIf { NotificationConfig.SHOW_ACCEPT_AND_DECLINE_INVITE_ACTIONS },
) )
) )
} }
@ -279,10 +279,10 @@ class DefaultNotificationCreatorTest {
} }
} }
const val markAsReadActionTitle = "MarkAsReadAction" const val MARK_AS_READ_ACTION_TITLE = "MarkAsReadAction"
const val quickReplyActionTitle = "QuickReplyAction" const val QUICK_REPLY_ACTION_TITLE = "QuickReplyAction"
const val acceptInvitationActionTitle = "AcceptInvitationAction" const val ACCEPT_INVITATION_ACTION_TITLE = "AcceptInvitationAction"
const val rejectInvitationActionTitle = "RejectInvitationAction" const val REJECT_INVITATION_ACTION_TITLE = "RejectInvitationAction"
fun createNotificationCreator( fun createNotificationCreator(
context: Context = RuntimeEnvironment.getApplication(), context: Context = RuntimeEnvironment.getApplication(),
@ -304,26 +304,26 @@ fun createNotificationCreator(
markAsReadActionFactory = MarkAsReadActionFactory( markAsReadActionFactory = MarkAsReadActionFactory(
context = context, context = context,
actionIds = NotificationActionIds(buildMeta), actionIds = NotificationActionIds(buildMeta),
stringProvider = FakeStringProvider(markAsReadActionTitle), stringProvider = FakeStringProvider(MARK_AS_READ_ACTION_TITLE),
clock = FakeSystemClock(), clock = FakeSystemClock(),
), ),
quickReplyActionFactory = QuickReplyActionFactory( quickReplyActionFactory = QuickReplyActionFactory(
context = context, context = context,
actionIds = NotificationActionIds(buildMeta), actionIds = NotificationActionIds(buildMeta),
stringProvider = FakeStringProvider(quickReplyActionTitle), stringProvider = FakeStringProvider(QUICK_REPLY_ACTION_TITLE),
clock = FakeSystemClock(), clock = FakeSystemClock(),
), ),
bitmapLoader = bitmapLoader, bitmapLoader = bitmapLoader,
acceptInvitationActionFactory = AcceptInvitationActionFactory( acceptInvitationActionFactory = AcceptInvitationActionFactory(
context = context, context = context,
actionIds = NotificationActionIds(buildMeta), actionIds = NotificationActionIds(buildMeta),
stringProvider = FakeStringProvider(acceptInvitationActionTitle), stringProvider = FakeStringProvider(ACCEPT_INVITATION_ACTION_TITLE),
clock = FakeSystemClock(), clock = FakeSystemClock(),
), ),
rejectInvitationActionFactory = RejectInvitationActionFactory( rejectInvitationActionFactory = RejectInvitationActionFactory(
context = context, context = context,
actionIds = NotificationActionIds(buildMeta), actionIds = NotificationActionIds(buildMeta),
stringProvider = FakeStringProvider(rejectInvitationActionTitle), stringProvider = FakeStringProvider(REJECT_INVITATION_ACTION_TITLE),
clock = FakeSystemClock(), clock = FakeSystemClock(),
), ),
) )