Skip to content

Commit 1152fb9

Browse files
nbradburyclaude
andcommitted
Simplify UpdateResult.Failure to object
The errorMessage parameter was never shown to users, so changed Failure from a data class to an object for simplicity. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent b6bd8c4 commit 1152fb9

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

WordPress/src/main/java/org/wordpress/android/ui/reader/subscription/ReaderBlogSubscriptionUseCase.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class ReaderBlogSubscriptionUseCase @Inject constructor(
7575
@Subscribe(threadMode = ThreadMode.MAIN)
7676
fun onSubscriptionUpdated(event: OnSubscriptionUpdated) {
7777
val result = if (event.isError) {
78-
UpdateResult.Failure(event.error?.message)
78+
UpdateResult.Failure
7979
} else {
8080
UpdateResult.Success
8181
}
@@ -90,6 +90,6 @@ class ReaderBlogSubscriptionUseCase @Inject constructor(
9090
sealed class UpdateResult {
9191
object Success : UpdateResult()
9292
object NoNetwork : UpdateResult()
93-
data class Failure(val errorMessage: String?) : UpdateResult()
93+
object Failure : UpdateResult()
9494
}
9595
}

WordPress/src/test/java/org/wordpress/android/ui/reader/subscription/ReaderBlogSubscriptionUseCaseTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ class ReaderBlogSubscriptionUseCaseTest : BaseUnitTest() {
115115

116116
val result = useCase.updateNotifyPosts(BLOG_ID, true)
117117

118-
assertThat(result).isInstanceOf(UpdateResult.Failure::class.java)
119-
assertThat((result as UpdateResult.Failure).errorMessage).isEqualTo(ERROR_MESSAGE)
118+
assertThat(result).isEqualTo(UpdateResult.Failure)
120119
}
121120

122121
@Test

WordPress/src/test/java/org/wordpress/android/ui/reader/subscription/ReaderSubscriptionSettingsViewModelTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class ReaderSubscriptionSettingsViewModelTest : BaseUnitTest() {
116116
fun `onNotifyPostsToggled reverts state on failure`() = test {
117117
initializeViewModel(notifyPostsEnabled = false)
118118
whenever(subscriptionUseCase.updateNotifyPosts(BLOG_ID, true))
119-
.thenReturn(UpdateResult.Failure("Error"))
119+
.thenReturn(UpdateResult.Failure)
120120

121121
viewModel.onNotifyPostsToggled(true)
122122

@@ -128,7 +128,7 @@ class ReaderSubscriptionSettingsViewModelTest : BaseUnitTest() {
128128
fun `onNotifyPostsToggled shows error snackbar on failure`() = test {
129129
initializeViewModel()
130130
whenever(subscriptionUseCase.updateNotifyPosts(BLOG_ID, true))
131-
.thenReturn(UpdateResult.Failure("Error"))
131+
.thenReturn(UpdateResult.Failure)
132132

133133
viewModel.onNotifyPostsToggled(true)
134134

@@ -188,7 +188,7 @@ class ReaderSubscriptionSettingsViewModelTest : BaseUnitTest() {
188188
fun `onEmailPostsToggled reverts state on failure`() = test {
189189
initializeViewModel(emailPostsEnabled = false)
190190
whenever(subscriptionUseCase.updateEmailPosts(BLOG_ID, true))
191-
.thenReturn(UpdateResult.Failure("Error"))
191+
.thenReturn(UpdateResult.Failure)
192192

193193
viewModel.onEmailPostsToggled(true)
194194

@@ -200,7 +200,7 @@ class ReaderSubscriptionSettingsViewModelTest : BaseUnitTest() {
200200
fun `onEmailPostsToggled shows error snackbar on failure`() = test {
201201
initializeViewModel()
202202
whenever(subscriptionUseCase.updateEmailPosts(BLOG_ID, true))
203-
.thenReturn(UpdateResult.Failure("Error"))
203+
.thenReturn(UpdateResult.Failure)
204204

205205
viewModel.onEmailPostsToggled(true)
206206

@@ -260,7 +260,7 @@ class ReaderSubscriptionSettingsViewModelTest : BaseUnitTest() {
260260
fun `onEmailCommentsToggled reverts state on failure`() = test {
261261
initializeViewModel(emailCommentsEnabled = false)
262262
whenever(subscriptionUseCase.updateEmailComments(BLOG_ID, true))
263-
.thenReturn(UpdateResult.Failure("Error"))
263+
.thenReturn(UpdateResult.Failure)
264264

265265
viewModel.onEmailCommentsToggled(true)
266266

@@ -272,7 +272,7 @@ class ReaderSubscriptionSettingsViewModelTest : BaseUnitTest() {
272272
fun `onEmailCommentsToggled shows error snackbar on failure`() = test {
273273
initializeViewModel()
274274
whenever(subscriptionUseCase.updateEmailComments(BLOG_ID, true))
275-
.thenReturn(UpdateResult.Failure("Error"))
275+
.thenReturn(UpdateResult.Failure)
276276

277277
viewModel.onEmailCommentsToggled(true)
278278

0 commit comments

Comments
 (0)