-
Notifications
You must be signed in to change notification settings - Fork 950
Chore: Add 'isActive' extension menthods for CipherView and CipherListView #6769
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
app/src/main/kotlin/com/x8bit/bitwarden/data/platform/util/CipherListViewExtensions.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package com.x8bit.bitwarden.data.platform.util | ||
|
|
||
| import com.bitwarden.vault.CipherListView | ||
|
|
||
| /** | ||
| * Indicates if this [CipherListView] is active based on its deleted or archived status. | ||
| */ | ||
| val CipherListView.isActive: Boolean | ||
| get() = this.archivedDate == null && this.deletedDate == null |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
app/src/test/kotlin/com/x8bit/bitwarden/data/platform/util/CipherListViewExtensionsTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package com.x8bit.bitwarden.data.platform.util | ||
|
|
||
| import com.bitwarden.vault.CipherListView | ||
| import io.mockk.every | ||
| import io.mockk.mockk | ||
| import org.junit.jupiter.api.Assertions.assertFalse | ||
| import org.junit.jupiter.api.Assertions.assertTrue | ||
| import org.junit.jupiter.api.Test | ||
| import java.time.Clock | ||
| import java.time.Instant | ||
| import java.time.ZoneOffset | ||
|
|
||
| class CipherListViewExtensionsTest { | ||
|
|
||
| private val clock: Clock = Clock.fixed( | ||
| Instant.parse("2023-10-27T12:00:00Z"), | ||
| ZoneOffset.UTC, | ||
| ) | ||
|
|
||
| @Test | ||
| fun `isActive should return true when item is not archived and not deleted`() { | ||
| val cipherListView = mockk<CipherListView> { | ||
| every { archivedDate } returns null | ||
| every { deletedDate } returns null | ||
| } | ||
|
|
||
| assertTrue(cipherListView.isActive) | ||
| } | ||
|
|
||
| @Test | ||
| fun `isActive should return false when item is archived and not deleted`() { | ||
| val cipherListView = mockk<CipherListView> { | ||
| every { archivedDate } returns clock.instant() | ||
| every { deletedDate } returns null | ||
| } | ||
|
|
||
| assertFalse(cipherListView.isActive) | ||
| } | ||
|
|
||
| @Test | ||
| fun `isActive should return false when item is not archived and is deleted`() { | ||
| val cipherListView = mockk<CipherListView> { | ||
| every { archivedDate } returns null | ||
| every { deletedDate } returns clock.instant() | ||
| } | ||
|
|
||
| assertFalse(cipherListView.isActive) | ||
| } | ||
|
|
||
| @Test | ||
| fun `isActive should return false when item is archived and is deleted`() { | ||
| val cipherListView = mockk<CipherListView> { | ||
| every { archivedDate } returns clock.instant() | ||
| every { deletedDate } returns clock.instant() | ||
| } | ||
|
|
||
| assertFalse(cipherListView.isActive) | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Details and fix
Line 40:
isActive should return true when item is not archived and is deletedassertsassertFalse.Line 50:
isActive should return true when item is archived and is deletedassertsassertFalse.Both test names should say "return false" to match the actual assertions:
Misleading test names cause confusion when reading test reports or debugging failures.