Skip to content
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.

Sign up for GitHub

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

[Nullability Annotations to Java Classes] Use Updated and Null Proof Media Payload Classes (safe) #19428

Merged
merged 4 commits into from
Oct 27, 2023
Merged

[Nullability Annotations to Java Classes] Use Updated and Null Proof Media Payload Classes (safe) #19428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e85f08
Build: Update fluxc version to pr hash (#2878)
ParaskP7 Oct 23, 2023
966023e
Test: Update post media handler test to updated media payload
ParaskP7 Oct 23, 2023
72ef969
Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-Android…
ParaskP7 Oct 27, 2023
2e605ea
Build: Update fluxc version to trunk hash (#2878)
ParaskP7 Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions WordPress/src/test/java/org/wordpress/android/ui/uploads/PostMediaHandlerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class PostMediaHandlerTest {
verify(dispatcher).dispatch(any())
assertThat(actions).hasSize(1)
val emittedAction = actions.last()
assertThat(emittedAction.payload.media.postId).isEqualTo(updatedPostId)
assertThat(emittedAction.payload.media?.postId).isEqualTo(updatedPostId)
assertThat(emittedAction.payload.site).isEqualTo(site)
}

Expand All @@ -83,12 +83,12 @@ class PostMediaHandlerTest {
verify(dispatcher, times(2)).dispatch(any())
assertThat(actions).hasSize(2)
val firstAction = actions[0]
assertThat(firstAction.payload.media.mediaId).isEqualTo(firstMediaItem.mediaId)
assertThat(firstAction.payload.media.postId).isEqualTo(updatedPostId)
assertThat(firstAction.payload.media?.mediaId).isEqualTo(firstMediaItem.mediaId)
assertThat(firstAction.payload.media?.postId).isEqualTo(updatedPostId)
assertThat(firstAction.payload.site).isEqualTo(site)
val secondAction = actions[1]
assertThat(secondAction.payload.media.mediaId).isEqualTo(secondMediaItem.mediaId)
assertThat(secondAction.payload.media.postId).isEqualTo(updatedPostId)
assertThat(secondAction.payload.media?.mediaId).isEqualTo(secondMediaItem.mediaId)
assertThat(secondAction.payload.media?.postId).isEqualTo(updatedPostId)
assertThat(secondAction.payload.site).isEqualTo(site)
}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ext {
automatticTracksVersion = '3.3.0'
gutenbergMobileVersion = 'v1.107.0'
wordPressAztecVersion = 'v1.8.0'
wordPressFluxCVersion = 'trunk-5f7448d86213648f402c2e04af738ec5904ebb31'
wordPressFluxCVersion = 'trunk-b85a542abce556295bb4afc44e553bc2a395c3b4'
wordPressLoginVersion = '1.6.0'
wordPressPersistentEditTextVersion = '1.0.2'
wordPressUtilsVersion = '3.10.0'
Expand Down
Loading