@@ -13,20 +13,12 @@ import org.wordpress.android.analytics.AnalyticsTracker
1313import org.wordpress.android.fluxc.model.PostModel
1414import org.wordpress.android.fluxc.model.SiteModel
1515import org.wordpress.android.fluxc.model.post.PostStatus
16- import org.wordpress.android.fluxc.model.post.PostStatus.DRAFT
17- import org.wordpress.android.fluxc.model.post.PostStatus.PENDING
18- import org.wordpress.android.fluxc.model.post.PostStatus.PRIVATE
19- import org.wordpress.android.fluxc.model.post.PostStatus.PUBLISHED
20- import org.wordpress.android.fluxc.model.post.PostStatus.SCHEDULED
2116import org.wordpress.android.fluxc.store.MediaStore.MediaError
2217import org.wordpress.android.fluxc.store.MediaStore.MediaErrorType
23- import org.wordpress.android.fluxc.store.MediaStore.MediaErrorType.AUTHORIZATION_REQUIRED
2418import org.wordpress.android.fluxc.store.PostStore.PostError
25- import org.wordpress.android.fluxc.store.PostStore.PostErrorType.GENERIC_ERROR
19+ import org.wordpress.android.fluxc.store.PostStore.PostErrorType
2620import org.wordpress.android.fluxc.store.UploadStore.UploadError
2721import org.wordpress.android.ui.posts.AuthorFilterSelection
28- import org.wordpress.android.ui.posts.AuthorFilterSelection.EVERYONE
29- import org.wordpress.android.ui.posts.AuthorFilterSelection.ME
3022import org.wordpress.android.ui.posts.PostModelUploadStatusTracker
3123import org.wordpress.android.ui.prefs.AppPrefsWrapper
3224import org.wordpress.android.ui.utils.UiString.UiStringRes
@@ -45,11 +37,11 @@ import org.wordpress.android.widgets.PostListButtonType
4537
4638private const val FORMATTER_DATE = " January 1st, 1:35pm"
4739
48- private val POST_STATE_PUBLISH = PUBLISHED .toString()
49- private val POST_STATE_SCHEDULED = SCHEDULED .toString()
50- private val POST_STATE_PRIVATE = PRIVATE .toString()
51- private val POST_STATE_PENDING = PENDING .toString()
52- private val POST_STATE_DRAFT = DRAFT .toString()
40+ private val POST_STATE_PUBLISH = PostStatus . PUBLISHED .toString()
41+ private val POST_STATE_SCHEDULED = PostStatus . SCHEDULED .toString()
42+ private val POST_STATE_PRIVATE = PostStatus . PRIVATE .toString()
43+ private val POST_STATE_PENDING = PostStatus . PENDING .toString()
44+ private val POST_STATE_DRAFT = PostStatus . DRAFT .toString()
5345private val POST_STATE_TRASHED = PostStatus .TRASHED .toString()
5446
5547@Suppress(" LargeClass" )
@@ -498,7 +490,7 @@ class PostListItemUiStateHelperTest {
498490 )
499491 ).thenReturn(
500492 createFailedUploadUiState(
501- UploadError (MediaError (AUTHORIZATION_REQUIRED )),
493+ UploadError (MediaError (MediaErrorType . AUTHORIZATION_REQUIRED )),
502494 isEligibleForAutoUpload = true
503495 )
504496 )
@@ -606,7 +598,7 @@ class PostListItemUiStateHelperTest {
606598 @Test
607599 fun `error uploading media label shown when the media upload fails` () {
608600 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
609- createFailedUploadUiState(uploadError = UploadError (MediaError (AUTHORIZATION_REQUIRED )))
601+ createFailedUploadUiState(uploadError = UploadError (MediaError (MediaErrorType . AUTHORIZATION_REQUIRED )))
610602 )
611603 val state = createPostListItemUiState()
612604 assertThat(state.data.statuses).contains(UiStringRes (R .string.error_media_recover_post))
@@ -616,7 +608,7 @@ class PostListItemUiStateHelperTest {
616608 fun `generic error message shown when upload fails from unknown reason` () {
617609 val errorMsg = " testing error message"
618610 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
619- createFailedUploadUiState(uploadError = UploadError (PostError (GENERIC_ERROR , errorMsg)))
611+ createFailedUploadUiState(uploadError = UploadError (PostError (PostErrorType . GENERIC_ERROR , errorMsg)))
620612 )
621613 val state = createPostListItemUiState()
622614 assertThat(state.data.statuses).contains(UiStringRes (R .string.error_generic_error))
@@ -625,7 +617,7 @@ class PostListItemUiStateHelperTest {
625617 @Test
626618 fun `given a mix of info and error statuses, only the error status is shown` () {
627619 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
628- createFailedUploadUiState(uploadError = UploadError (MediaError (AUTHORIZATION_REQUIRED )))
620+ createFailedUploadUiState(uploadError = UploadError (MediaError (MediaErrorType . AUTHORIZATION_REQUIRED )))
629621 )
630622 val state = createPostListItemUiState(
631623 post = createPostModel(isLocallyChanged = true , status = POST_STATE_PRIVATE )
@@ -643,11 +635,8 @@ class PostListItemUiStateHelperTest {
643635 )
644636 ).thenReturn(
645637 createFailedUploadUiState(
646- uploadError = UploadError (
647- MediaError (
648- AUTHORIZATION_REQUIRED
649- )
650- ), isEligibleForAutoUpload = true
638+ uploadError = UploadError (MediaError (MediaErrorType .AUTHORIZATION_REQUIRED )),
639+ isEligibleForAutoUpload = true
651640 )
652641 )
653642 val state = createPostListItemUiState(
@@ -661,7 +650,7 @@ class PostListItemUiStateHelperTest {
661650 fun `media upload error shown with specific message for pending post not eligible for auto-upload` () {
662651 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
663652 createFailedUploadUiState(
664- uploadError = UploadError (MediaError (AUTHORIZATION_REQUIRED )),
653+ uploadError = UploadError (MediaError (MediaErrorType . AUTHORIZATION_REQUIRED )),
665654 isEligibleForAutoUpload = false ,
666655 retryWillPushChanges = true
667656 )
@@ -676,7 +665,7 @@ class PostListItemUiStateHelperTest {
676665 fun `media upload error shown with specific message for scheduled post eligible for auto-upload` () {
677666 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
678667 createFailedUploadUiState(
679- uploadError = UploadError (MediaError (AUTHORIZATION_REQUIRED )),
668+ uploadError = UploadError (MediaError (MediaErrorType . AUTHORIZATION_REQUIRED )),
680669 isEligibleForAutoUpload = true
681670 )
682671 )
@@ -691,7 +680,7 @@ class PostListItemUiStateHelperTest {
691680 fun `media upload error shown with specific message for scheduled post not eligible for auto-upload` () {
692681 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
693682 createFailedUploadUiState(
694- uploadError = UploadError (MediaError (AUTHORIZATION_REQUIRED )),
683+ uploadError = UploadError (MediaError (MediaErrorType . AUTHORIZATION_REQUIRED )),
695684 isEligibleForAutoUpload = false ,
696685 retryWillPushChanges = true
697686 )
@@ -706,7 +695,7 @@ class PostListItemUiStateHelperTest {
706695 fun `retrying media upload shown for draft eligible for auto-upload` () {
707696 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
708697 createFailedUploadUiState(
709- uploadError = UploadError (MediaError (AUTHORIZATION_REQUIRED )),
698+ uploadError = UploadError (MediaError (MediaErrorType . AUTHORIZATION_REQUIRED )),
710699 isEligibleForAutoUpload = true
711700 )
712701 )
@@ -720,7 +709,7 @@ class PostListItemUiStateHelperTest {
720709 fun `base media upload error shown for draft not eligible for auto-upload` () {
721710 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
722711 createFailedUploadUiState(
723- uploadError = UploadError (MediaError (AUTHORIZATION_REQUIRED )),
712+ uploadError = UploadError (MediaError (MediaErrorType . AUTHORIZATION_REQUIRED )),
724713 isEligibleForAutoUpload = false ,
725714 retryWillPushChanges = false
726715 )
@@ -735,7 +724,7 @@ class PostListItemUiStateHelperTest {
735724 fun `base upload error shown on GENERIC ERROR and not eligible for auto upload` () {
736725 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
737726 createFailedUploadUiState(
738- uploadError = UploadError (PostError (GENERIC_ERROR )),
727+ uploadError = UploadError (PostError (PostErrorType . GENERIC_ERROR )),
739728 isEligibleForAutoUpload = false ,
740729 retryWillPushChanges = false
741730 )
@@ -750,7 +739,7 @@ class PostListItemUiStateHelperTest {
750739 fun `retrying upload shown for draft eligible for auto-upload` () {
751740 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
752741 createFailedUploadUiState(
753- uploadError = UploadError (PostError (GENERIC_ERROR )),
742+ uploadError = UploadError (PostError (PostErrorType . GENERIC_ERROR )),
754743 isEligibleForAutoUpload = true ,
755744 retryWillPushChanges = true
756745 )
@@ -823,7 +812,7 @@ class PostListItemUiStateHelperTest {
823812 @Test
824813 fun `show overlay when performing critical action` () {
825814 val state = createPostListItemUiState(performingCriticalAction = true )
826- assertThat(state.data.showOverlay).isTrue()
815+ assertThat(state.data.showOverlay).isTrue
827816 }
828817
829818 @Test
@@ -832,7 +821,7 @@ class PostListItemUiStateHelperTest {
832821 UploadingPost (false )
833822 )
834823 val state = createPostListItemUiState()
835- assertThat(state.data.showOverlay).isTrue()
824+ assertThat(state.data.showOverlay).isTrue
836825 }
837826
838827 @Test
@@ -866,7 +855,7 @@ class PostListItemUiStateHelperTest {
866855 @Test
867856 fun `pending publish post label shown when post eligible for auto-upload` () {
868857 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
869- UploadWaitingForConnection (PUBLISHED )
858+ UploadWaitingForConnection (PostStatus . PUBLISHED )
870859 )
871860 val state = createPostListItemUiState(
872861 post = createPostModel(isLocallyChanged = true , status = POST_STATE_PUBLISH )
@@ -878,7 +867,7 @@ class PostListItemUiStateHelperTest {
878867 @Test
879868 fun `pending schedule label shown when post eligible for auto-upload` () {
880869 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
881- UploadWaitingForConnection (SCHEDULED )
870+ UploadWaitingForConnection (PostStatus . SCHEDULED )
882871 )
883872 val state = createPostListItemUiState(
884873 post = createPostModel(isLocallyChanged = true , status = POST_STATE_SCHEDULED )
@@ -891,7 +880,7 @@ class PostListItemUiStateHelperTest {
891880 @Test
892881 fun `pending publish private post label shown when post eligible for auto-upload` () {
893882 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
894- UploadWaitingForConnection (PRIVATE )
883+ UploadWaitingForConnection (PostStatus . PRIVATE )
895884 )
896885 val state = createPostListItemUiState(
897886 post = createPostModel(isLocallyChanged = true , status = POST_STATE_PRIVATE )
@@ -904,7 +893,7 @@ class PostListItemUiStateHelperTest {
904893 @Test
905894 fun `pending submit post label shown when post eligible for auto-upload` () {
906895 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
907- UploadWaitingForConnection (PENDING )
896+ UploadWaitingForConnection (PostStatus . PENDING )
908897 )
909898 val state = createPostListItemUiState(
910899 post = createPostModel(isLocallyChanged = true , status = POST_STATE_PENDING )
@@ -917,7 +906,7 @@ class PostListItemUiStateHelperTest {
917906 @Test
918907 fun `local changes post label shown when draft eligible for auto-upload` () {
919908 whenever(uploadUiStateUseCase.createUploadUiState(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(
920- UploadWaitingForConnection (DRAFT )
909+ UploadWaitingForConnection (PostStatus . DRAFT )
921910 )
922911 val state = createPostListItemUiState(
923912 post = createPostModel(isLocallyChanged = true , status = POST_STATE_DRAFT )
@@ -976,7 +965,7 @@ class PostListItemUiStateHelperTest {
976965 // Arrange
977966 val authorDisplayName = " John Novak"
978967 val state = createPostListItemUiState(
979- authorFilterSelection = EVERYONE ,
968+ authorFilterSelection = AuthorFilterSelection . EVERYONE ,
980969 post = createPostModel(
981970 authorDisplayName = authorDisplayName
982971 ), formattedDate = FORMATTER_DATE
@@ -993,7 +982,7 @@ class PostListItemUiStateHelperTest {
993982 // Arrange
994983 val authorDisplayName = " John Novak"
995984 val state = createPostListItemUiState(
996- authorFilterSelection = ME ,
985+ authorFilterSelection = AuthorFilterSelection . ME ,
997986 post = createPostModel(
998987 authorDisplayName = authorDisplayName
999988 ), formattedDate = FORMATTER_DATE
@@ -1020,7 +1009,7 @@ class PostListItemUiStateHelperTest {
10201009 }
10211010
10221011 @Test
1023- fun `when a post is locally changed and is local draft only " Local draft" label is displayed` () {
1012+ fun `when a post is locally changed and is local draft only ' Local draft' label is displayed` () {
10241013 // Arrange
10251014 val state = createPostListItemUiState(
10261015 post = createPostModel(isLocallyChanged = true , isLocalDraft = true )
@@ -1031,7 +1020,7 @@ class PostListItemUiStateHelperTest {
10311020 }
10321021
10331022 @Test
1034- fun `when a post is sticky and no errors ocurred , the " Sticky" label is displayed` () {
1023+ fun `when a post is sticky and no errors occurred , the ' Sticky' label is displayed` () {
10351024 // Arrange
10361025 val state = createPostListItemUiState(
10371026 post = createPostModel(sticky = true )
@@ -1042,7 +1031,7 @@ class PostListItemUiStateHelperTest {
10421031 }
10431032
10441033 @Test
1045- fun `when a post is sticky and private, the labels " Private" and " Sticky" are displayed` () {
1034+ fun `when a post is sticky and private, the labels ' Private' and ' Sticky' are displayed` () {
10461035 // Arrange
10471036 val state = createPostListItemUiState(
10481037 post = createPostModel(status = POST_STATE_PRIVATE , sticky = true )
@@ -1070,7 +1059,7 @@ class PostListItemUiStateHelperTest {
10701059 }
10711060
10721061 private fun createPostListItemUiState (
1073- authorFilterSelection : AuthorFilterSelection = EVERYONE ,
1062+ authorFilterSelection : AuthorFilterSelection = AuthorFilterSelection . EVERYONE ,
10741063 post : PostModel = PostModel (),
10751064 site : SiteModel = SiteModel (),
10761065 unhandledConflicts : Boolean = false,
@@ -1110,5 +1099,5 @@ class PostListItemUiStateHelperTest {
11101099 )
11111100 }
11121101
1113- private fun createGenericError (): UploadError = UploadError (PostError (GENERIC_ERROR ))
1102+ private fun createGenericError (): UploadError = UploadError (PostError (PostErrorType . GENERIC_ERROR ))
11141103}
0 commit comments