mirror of
https://github.com/bitwarden/android.git
synced 2026-11-19 17:40:12 -06:00
Add helper method for getting sendView icons (#678)
This commit is contained in:
committed by
Álison Fernandes
parent
cb306a8377
commit
2c749186e1
+28
-12
@@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.tools.feature.send.util
|
||||
import com.bitwarden.core.SendType
|
||||
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView
|
||||
import com.x8bit.bitwarden.data.vault.repository.model.SendData
|
||||
import com.x8bit.bitwarden.ui.platform.components.model.IconRes
|
||||
import com.x8bit.bitwarden.ui.tools.feature.send.SendState
|
||||
import com.x8bit.bitwarden.ui.tools.feature.send.model.SendStatusIcon
|
||||
import io.mockk.every
|
||||
@@ -52,6 +53,8 @@ class SendDataExtensionsTest {
|
||||
val sendData = SendData(list)
|
||||
every { textSendView.toSendUrl(DEFAULT_BASE_URL) } returns textSendViewUrl2
|
||||
every { fileSendView.toSendUrl(DEFAULT_BASE_URL) } returns textSendViewUrl1
|
||||
every { textSendView.toLabelIcons(any()) } returns DEFAULT_SEND_STATUS_ICONS
|
||||
every { fileSendView.toLabelIcons(any()) } returns DEFAULT_SEND_STATUS_ICONS
|
||||
|
||||
val result = sendData.toViewState(DEFAULT_BASE_URL)
|
||||
|
||||
@@ -65,12 +68,7 @@ class SendDataExtensionsTest {
|
||||
name = "mockName-1",
|
||||
deletionDate = "Oct 27, 2023, 12:00 PM",
|
||||
type = SendState.ViewState.Content.SendItem.Type.FILE,
|
||||
iconList = listOf(
|
||||
SendStatusIcon.PASSWORD,
|
||||
SendStatusIcon.MAX_ACCESS_COUNT_REACHED,
|
||||
SendStatusIcon.EXPIRED,
|
||||
SendStatusIcon.PENDING_DELETE,
|
||||
),
|
||||
iconList = DEFAULT_SEND_STATUS_ICONS,
|
||||
shareUrl = "www.test.com/#/send/mockAccessId-1/mockKey-1",
|
||||
hasPassword = true,
|
||||
),
|
||||
@@ -79,12 +77,7 @@ class SendDataExtensionsTest {
|
||||
name = "mockName-2",
|
||||
deletionDate = "Oct 27, 2023, 12:00 PM",
|
||||
type = SendState.ViewState.Content.SendItem.Type.TEXT,
|
||||
iconList = listOf(
|
||||
SendStatusIcon.PASSWORD,
|
||||
SendStatusIcon.MAX_ACCESS_COUNT_REACHED,
|
||||
SendStatusIcon.EXPIRED,
|
||||
SendStatusIcon.PENDING_DELETE,
|
||||
),
|
||||
iconList = DEFAULT_SEND_STATUS_ICONS,
|
||||
shareUrl = "www.test.com/#/send/mockAccessId-2/mockKey-2",
|
||||
hasPassword = true,
|
||||
),
|
||||
@@ -99,3 +92,26 @@ private const val SEND_VIEW_EXTENSIONS_PATH: String =
|
||||
"com.x8bit.bitwarden.ui.tools.feature.send.util.SendViewExtensionsKt"
|
||||
|
||||
private const val DEFAULT_BASE_URL: String = "www.test.com/"
|
||||
|
||||
private val DEFAULT_SEND_STATUS_ICONS: List<IconRes> = listOf(
|
||||
IconRes(
|
||||
iconRes = SendStatusIcon.DISABLED.iconRes,
|
||||
contentDescription = SendStatusIcon.DISABLED.contentDescription,
|
||||
),
|
||||
IconRes(
|
||||
iconRes = SendStatusIcon.PASSWORD.iconRes,
|
||||
contentDescription = SendStatusIcon.PASSWORD.contentDescription,
|
||||
),
|
||||
IconRes(
|
||||
iconRes = SendStatusIcon.MAX_ACCESS_COUNT_REACHED.iconRes,
|
||||
contentDescription = SendStatusIcon.MAX_ACCESS_COUNT_REACHED.contentDescription,
|
||||
),
|
||||
IconRes(
|
||||
iconRes = SendStatusIcon.EXPIRED.iconRes,
|
||||
contentDescription = SendStatusIcon.EXPIRED.contentDescription,
|
||||
),
|
||||
IconRes(
|
||||
iconRes = SendStatusIcon.PENDING_DELETE.iconRes,
|
||||
contentDescription = SendStatusIcon.PENDING_DELETE.contentDescription,
|
||||
),
|
||||
)
|
||||
|
||||
+94
@@ -0,0 +1,94 @@
|
||||
package com.x8bit.bitwarden.ui.tools.feature.send.util
|
||||
|
||||
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView
|
||||
import com.x8bit.bitwarden.ui.platform.components.model.IconRes
|
||||
import com.x8bit.bitwarden.ui.tools.feature.send.model.SendStatusIcon
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.Test
|
||||
import java.time.Clock
|
||||
import java.time.Instant
|
||||
import java.time.ZoneOffset
|
||||
|
||||
class SendViewExtensionsTest {
|
||||
|
||||
private val clock: Clock = Clock.fixed(
|
||||
Instant.parse("2023-10-27T12:00:00Z"),
|
||||
ZoneOffset.UTC,
|
||||
)
|
||||
|
||||
@Test
|
||||
fun `toLabelIcons should return all of the icons when all checks have passed`() {
|
||||
val sendView = createMockSendView(number = 1).copy(
|
||||
// Show the password icon when true
|
||||
hasPassword = true,
|
||||
// Show the disabled icon when true
|
||||
disabled = true,
|
||||
// Show the max access count reached icon when accessCount is greater than or equal to
|
||||
// the maxAccessCount
|
||||
maxAccessCount = 1u,
|
||||
accessCount = 1u,
|
||||
// Show the pending deletion icon when the deletion date is in the past
|
||||
deletionDate = Instant.parse("2023-10-26T12:00:00Z"),
|
||||
// Show the expired icon when the expiration date is in the past
|
||||
expirationDate = Instant.parse("2023-10-26T12:00:00Z"),
|
||||
)
|
||||
|
||||
val result = sendView.toLabelIcons(clock)
|
||||
|
||||
assertEquals(ALL_SEND_STATUS_ICONS, result)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `toLabelIcons should return none of the icons when none of the checks have passed`() {
|
||||
val sendView = createMockSendView(number = 1).copy(
|
||||
// Hide the password icon when false
|
||||
hasPassword = false,
|
||||
// Hide the disabled icon when false
|
||||
disabled = false,
|
||||
// Hide the max access count reached icon when accessCount is less than the
|
||||
// maxAccessCount
|
||||
maxAccessCount = 10u,
|
||||
accessCount = 1u,
|
||||
// Hide the pending deletion icon when the deletion date is in the future
|
||||
deletionDate = Instant.parse("2023-10-28T12:00:00Z"),
|
||||
// Hide the expired icon when the expiration date is in the future
|
||||
expirationDate = Instant.parse("2023-10-28T12:00:00Z"),
|
||||
)
|
||||
|
||||
val result = sendView.toLabelIcons(clock)
|
||||
|
||||
assertEquals(emptyList<IconRes>(), result)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `toSendUrl should create an appropriate url`() {
|
||||
val sendView = createMockSendView(number = 1)
|
||||
|
||||
val result = sendView.toSendUrl(baseWebSendUrl = "www.test.com/")
|
||||
|
||||
assertEquals("www.test.com/mockAccessId-1/mockKey-1", result)
|
||||
}
|
||||
}
|
||||
|
||||
private val ALL_SEND_STATUS_ICONS: List<IconRes> = listOf(
|
||||
IconRes(
|
||||
iconRes = SendStatusIcon.DISABLED.iconRes,
|
||||
contentDescription = SendStatusIcon.DISABLED.contentDescription,
|
||||
),
|
||||
IconRes(
|
||||
iconRes = SendStatusIcon.PASSWORD.iconRes,
|
||||
contentDescription = SendStatusIcon.PASSWORD.contentDescription,
|
||||
),
|
||||
IconRes(
|
||||
iconRes = SendStatusIcon.MAX_ACCESS_COUNT_REACHED.iconRes,
|
||||
contentDescription = SendStatusIcon.MAX_ACCESS_COUNT_REACHED.contentDescription,
|
||||
),
|
||||
IconRes(
|
||||
iconRes = SendStatusIcon.EXPIRED.iconRes,
|
||||
contentDescription = SendStatusIcon.EXPIRED.contentDescription,
|
||||
),
|
||||
IconRes(
|
||||
iconRes = SendStatusIcon.PENDING_DELETE.iconRes,
|
||||
contentDescription = SendStatusIcon.PENDING_DELETE.contentDescription,
|
||||
),
|
||||
)
|
||||
@@ -1,17 +0,0 @@
|
||||
package com.x8bit.bitwarden.ui.tools.feature.send.util
|
||||
|
||||
import com.x8bit.bitwarden.data.vault.datasource.sdk.model.createMockSendView
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.Test
|
||||
|
||||
class SendViewTest {
|
||||
|
||||
@Test
|
||||
fun `toSendUrl should create an appropriate url`() {
|
||||
val sendView = createMockSendView(number = 1)
|
||||
|
||||
val result = sendView.toSendUrl(baseWebSendUrl = "www.test.com/")
|
||||
|
||||
assertEquals("www.test.com/mockAccessId-1/mockKey-1", result)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user