diff --git a/app/src/main/java/com/eventyay/organizer/core/attendee/history/CheckInHistoryFragment.java b/app/src/main/java/com/eventyay/organizer/core/attendee/history/CheckInHistoryFragment.java index 3c7aa936a..c8dd237e8 100644 --- a/app/src/main/java/com/eventyay/organizer/core/attendee/history/CheckInHistoryFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/attendee/history/CheckInHistoryFragment.java @@ -122,8 +122,7 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { - if (success) - ViewUtils.showSnackbar(binding.getRoot(), R.string.refresh_complete); + // Nothing to do } @Override diff --git a/app/src/main/java/com/eventyay/organizer/core/attendee/list/AttendeesFragment.java b/app/src/main/java/com/eventyay/organizer/core/attendee/list/AttendeesFragment.java index a2625882e..1785d2950 100644 --- a/app/src/main/java/com/eventyay/organizer/core/attendee/list/AttendeesFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/attendee/list/AttendeesFragment.java @@ -318,8 +318,7 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { - if (success) - ViewUtils.showSnackbar(binding.rvAttendeeList, R.string.refresh_complete); + // Nothing to do } @Override diff --git a/app/src/main/java/com/eventyay/organizer/core/event/about/AboutEventFragment.java b/app/src/main/java/com/eventyay/organizer/core/event/about/AboutEventFragment.java index 850d72afa..cc2fa527a 100644 --- a/app/src/main/java/com/eventyay/organizer/core/event/about/AboutEventFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/event/about/AboutEventFragment.java @@ -251,8 +251,6 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { refreshLayout.setRefreshing(false); - if (success) - ViewUtils.showSnackbar(binding.mainContent, R.string.refresh_complete); } @Override diff --git a/app/src/main/java/com/eventyay/organizer/core/event/dashboard/EventDashboardFragment.java b/app/src/main/java/com/eventyay/organizer/core/event/dashboard/EventDashboardFragment.java index e1cd1df8e..e484345c5 100644 --- a/app/src/main/java/com/eventyay/organizer/core/event/dashboard/EventDashboardFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/event/dashboard/EventDashboardFragment.java @@ -168,8 +168,7 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { - if (success) - ViewUtils.showSnackbar(container, R.string.refresh_complete); + // Nothing to do } @Override diff --git a/app/src/main/java/com/eventyay/organizer/core/event/list/EventListFragment.java b/app/src/main/java/com/eventyay/organizer/core/event/list/EventListFragment.java index 39c3581fb..fe9385c0e 100644 --- a/app/src/main/java/com/eventyay/organizer/core/event/list/EventListFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/event/list/EventListFragment.java @@ -191,9 +191,7 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { - if (success) { - ViewUtils.showSnackbar(binding.getRoot(), R.string.refresh_complete); - } + // Nothing to do } @Override diff --git a/app/src/main/java/com/eventyay/organizer/core/event/list/sales/SalesSummaryViewModel.java b/app/src/main/java/com/eventyay/organizer/core/event/list/sales/SalesSummaryViewModel.java index 264033f15..c857cfb28 100644 --- a/app/src/main/java/com/eventyay/organizer/core/event/list/sales/SalesSummaryViewModel.java +++ b/app/src/main/java/com/eventyay/organizer/core/event/list/sales/SalesSummaryViewModel.java @@ -73,7 +73,6 @@ public void loadDetails(long eventId, boolean forceReload) { }) .toList() .subscribe(attendees -> { - success.setValue("Loaded Successfully"); this.attendees = attendees; ticketAnalyser.analyseSoldTickets(event, attendees); }, throwable -> error.setValue(ErrorUtils.getMessage(throwable).toString()))); diff --git a/app/src/main/java/com/eventyay/organizer/core/faq/list/FaqListFragment.java b/app/src/main/java/com/eventyay/organizer/core/faq/list/FaqListFragment.java index e7f8e436c..573d4823d 100644 --- a/app/src/main/java/com/eventyay/organizer/core/faq/list/FaqListFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/faq/list/FaqListFragment.java @@ -226,8 +226,6 @@ public void showProgress(boolean show) { public void onRefreshComplete(boolean success) { faqListViewModel.resetToDefaultState(); exitContextualMenuMode(); - if (success) - ViewUtils.showSnackbar(binding.faqsRecyclerView, R.string.refresh_complete); } @Override diff --git a/app/src/main/java/com/eventyay/organizer/core/faq/list/FaqListViewModel.java b/app/src/main/java/com/eventyay/organizer/core/faq/list/FaqListViewModel.java index 3795cb4ab..ec86cbeb4 100644 --- a/app/src/main/java/com/eventyay/organizer/core/faq/list/FaqListViewModel.java +++ b/app/src/main/java/com/eventyay/organizer/core/faq/list/FaqListViewModel.java @@ -94,7 +94,6 @@ public void loadFaqs(boolean forceReload) { .subscribe(loadedFaqs -> { faqs.clear(); faqs.addAll(loadedFaqs); - success.setValue("FAQs Loaded Successfully"); faqsLiveData.setValue(loadedFaqs); }, throwable -> error.setValue(ErrorUtils.getMessage(throwable).toString()))); } diff --git a/app/src/main/java/com/eventyay/organizer/core/feedback/list/FeedbackListFragment.java b/app/src/main/java/com/eventyay/organizer/core/feedback/list/FeedbackListFragment.java index 31563f66e..d1fde9944 100644 --- a/app/src/main/java/com/eventyay/organizer/core/feedback/list/FeedbackListFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/feedback/list/FeedbackListFragment.java @@ -130,8 +130,6 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { refreshLayout.setRefreshing(false); - if (success) - ViewUtils.showSnackbar(binding.feedbacksRecyclerView, R.string.refresh_complete); } private void showMessage(String message) { diff --git a/app/src/main/java/com/eventyay/organizer/core/feedback/list/FeedbackListViewModel.java b/app/src/main/java/com/eventyay/organizer/core/feedback/list/FeedbackListViewModel.java index 90acb9735..d79cb3192 100644 --- a/app/src/main/java/com/eventyay/organizer/core/feedback/list/FeedbackListViewModel.java +++ b/app/src/main/java/com/eventyay/organizer/core/feedback/list/FeedbackListViewModel.java @@ -67,7 +67,6 @@ public void loadFeedbacks(boolean forceReload) { .doFinally(() -> progress.setValue(false)) .toList() .subscribe(feedbacks -> { - success.setValue("Feedbacks Loaded Successfully"); feedbacksLiveData.setValue(feedbacks); }, throwable -> error.setValue(ErrorUtils.getMessage(throwable).toString()))); } diff --git a/app/src/main/java/com/eventyay/organizer/core/notification/list/NotificationsFragment.java b/app/src/main/java/com/eventyay/organizer/core/notification/list/NotificationsFragment.java index ccfa7d1b1..ab9a618bc 100644 --- a/app/src/main/java/com/eventyay/organizer/core/notification/list/NotificationsFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/notification/list/NotificationsFragment.java @@ -118,8 +118,6 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { refreshLayout.setRefreshing(false); - if (success) - ViewUtils.showSnackbar(binding.notificationsRecyclerView, R.string.refresh_complete); } private void showMessage(String message) { diff --git a/app/src/main/java/com/eventyay/organizer/core/notification/list/NotificationsViewModel.java b/app/src/main/java/com/eventyay/organizer/core/notification/list/NotificationsViewModel.java index 1fd82caf0..c09330507 100644 --- a/app/src/main/java/com/eventyay/organizer/core/notification/list/NotificationsViewModel.java +++ b/app/src/main/java/com/eventyay/organizer/core/notification/list/NotificationsViewModel.java @@ -75,7 +75,6 @@ public void loadNotifications(boolean forceReload) { Collections.reverse(notificationsList); notifications.clear(); notifications.addAll(notificationsList); - success.setValue("Notifications Loaded Successfully"); notificationsLiveData.setValue(notifications); }, throwable -> error.setValue(ErrorUtils.getMessage(throwable).toString()))); } diff --git a/app/src/main/java/com/eventyay/organizer/core/orders/create/CreateOrderFragment.java b/app/src/main/java/com/eventyay/organizer/core/orders/create/CreateOrderFragment.java index f21421cf5..617f9549c 100644 --- a/app/src/main/java/com/eventyay/organizer/core/orders/create/CreateOrderFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/orders/create/CreateOrderFragment.java @@ -156,7 +156,6 @@ public void showEmptyView(boolean show) { @Override public void onRefreshComplete(boolean success) { - if (success) - ViewUtils.showSnackbar(binding.getRoot(), R.string.refresh_complete); + // Nothing to do } } diff --git a/app/src/main/java/com/eventyay/organizer/core/orders/detail/OrderDetailFragment.java b/app/src/main/java/com/eventyay/organizer/core/orders/detail/OrderDetailFragment.java index 76d3e661c..027ab3456 100644 --- a/app/src/main/java/com/eventyay/organizer/core/orders/detail/OrderDetailFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/orders/detail/OrderDetailFragment.java @@ -195,8 +195,7 @@ public void showEmptyView(boolean show) { @Override public void onRefreshComplete(boolean success) { - if (success) - ViewUtils.showSnackbar(binding.getRoot(), R.string.refresh_complete); + // Nothing to do } public void showOrderDetails(Order order) { diff --git a/app/src/main/java/com/eventyay/organizer/core/orders/list/OrdersFragment.java b/app/src/main/java/com/eventyay/organizer/core/orders/list/OrdersFragment.java index 67b5e60f9..2474eb364 100644 --- a/app/src/main/java/com/eventyay/organizer/core/orders/list/OrdersFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/orders/list/OrdersFragment.java @@ -158,8 +158,7 @@ public void showEmptyView(boolean show) { @Override public void onRefreshComplete(boolean success) { - if (success) - ViewUtils.showSnackbar(binding.ordersRecyclerView, R.string.refresh_complete); + // Nothing to do } @Override diff --git a/app/src/main/java/com/eventyay/organizer/core/organizer/detail/OrganizerDetailFragment.java b/app/src/main/java/com/eventyay/organizer/core/organizer/detail/OrganizerDetailFragment.java index c552e7430..d6cc766e6 100644 --- a/app/src/main/java/com/eventyay/organizer/core/organizer/detail/OrganizerDetailFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/organizer/detail/OrganizerDetailFragment.java @@ -344,7 +344,5 @@ public void showSnackbar(String message) { @Override public void onRefreshComplete(boolean success) { refreshLayout.setRefreshing(false); - if (success) - ViewUtils.showSnackbar(binding.mainContent, R.string.refresh_complete); } } diff --git a/app/src/main/java/com/eventyay/organizer/core/organizer/detail/OrganizerDetailViewModel.java b/app/src/main/java/com/eventyay/organizer/core/organizer/detail/OrganizerDetailViewModel.java index d48a46f24..a1a11109a 100644 --- a/app/src/main/java/com/eventyay/organizer/core/organizer/detail/OrganizerDetailViewModel.java +++ b/app/src/main/java/com/eventyay/organizer/core/organizer/detail/OrganizerDetailViewModel.java @@ -72,7 +72,6 @@ public void loadOrganizer(boolean forceReload) { .subscribe(loadedUser -> { this.user = loadedUser; resendVerificationMail.setEmail(user.getEmail()); - success.setValue("Organizer Details Loaded Successfully"); userLiveData.setValue(user); }, throwable -> error.setValue(ErrorUtils.getMessage(throwable).toString()))); } diff --git a/app/src/main/java/com/eventyay/organizer/core/role/list/RoleListFragment.java b/app/src/main/java/com/eventyay/organizer/core/role/list/RoleListFragment.java index 92698ff7b..929e775e6 100644 --- a/app/src/main/java/com/eventyay/organizer/core/role/list/RoleListFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/role/list/RoleListFragment.java @@ -225,8 +225,6 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { refreshLayout.setRefreshing(false); - if (success) - ViewUtils.showSnackbar(binding.rolesRecyclerView, R.string.refresh_complete); } private void showMessage(String message) { diff --git a/app/src/main/java/com/eventyay/organizer/core/role/list/RoleListViewModel.java b/app/src/main/java/com/eventyay/organizer/core/role/list/RoleListViewModel.java index c277b415b..cf30c8770 100644 --- a/app/src/main/java/com/eventyay/organizer/core/role/list/RoleListViewModel.java +++ b/app/src/main/java/com/eventyay/organizer/core/role/list/RoleListViewModel.java @@ -94,7 +94,6 @@ public void loadRoles(boolean forceReload) { .subscribe(roleList -> { roles.clear(); roles.addAll(roleList); - success.setValue("Roles Loaded Successfully"); rolesLiveData.setValue(roles); }, throwable -> error.setValue(ErrorUtils.getMessage(throwable).toString()))); } diff --git a/app/src/main/java/com/eventyay/organizer/core/session/list/SessionsFragment.java b/app/src/main/java/com/eventyay/organizer/core/session/list/SessionsFragment.java index edbdca64b..51b00a866 100644 --- a/app/src/main/java/com/eventyay/organizer/core/session/list/SessionsFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/session/list/SessionsFragment.java @@ -245,8 +245,7 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { - if (success) - ViewUtils.showSnackbar(binding.sessionsRecyclerView, R.string.refresh_complete); + // Nothing to do } @Override diff --git a/app/src/main/java/com/eventyay/organizer/core/speaker/details/SpeakerDetailsFragment.java b/app/src/main/java/com/eventyay/organizer/core/speaker/details/SpeakerDetailsFragment.java index e356530ae..fd6d855f7 100644 --- a/app/src/main/java/com/eventyay/organizer/core/speaker/details/SpeakerDetailsFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/speaker/details/SpeakerDetailsFragment.java @@ -138,7 +138,5 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { refreshLayout.setRefreshing(false); - if (success) - ViewUtils.showSnackbar(binding.mainContent, R.string.refresh_complete); } } diff --git a/app/src/main/java/com/eventyay/organizer/core/speaker/list/SpeakersFragment.java b/app/src/main/java/com/eventyay/organizer/core/speaker/list/SpeakersFragment.java index ca2a15818..f887892fe 100644 --- a/app/src/main/java/com/eventyay/organizer/core/speaker/list/SpeakersFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/speaker/list/SpeakersFragment.java @@ -114,8 +114,7 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { - if (success) - ViewUtils.showSnackbar(binding.speakersRecyclerView, R.string.refresh_complete); + // Nothing to do } @Override diff --git a/app/src/main/java/com/eventyay/organizer/core/speakerscall/detail/SpeakersCallFragment.java b/app/src/main/java/com/eventyay/organizer/core/speakerscall/detail/SpeakersCallFragment.java index e1a086331..0d6cbdcb3 100644 --- a/app/src/main/java/com/eventyay/organizer/core/speakerscall/detail/SpeakersCallFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/speakerscall/detail/SpeakersCallFragment.java @@ -152,8 +152,7 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { - if (success) - ViewUtils.showSnackbar(binding.getRoot(), R.string.refresh_complete); + // Nothing to do } @Override diff --git a/app/src/main/java/com/eventyay/organizer/core/sponsor/list/SponsorsFragment.java b/app/src/main/java/com/eventyay/organizer/core/sponsor/list/SponsorsFragment.java index 440b80438..bbc563748 100644 --- a/app/src/main/java/com/eventyay/organizer/core/sponsor/list/SponsorsFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/sponsor/list/SponsorsFragment.java @@ -237,8 +237,7 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { - if (success) - ViewUtils.showSnackbar(binding.sponsorsRecyclerView, R.string.refresh_complete); + // Nothing to do } @Override diff --git a/app/src/main/java/com/eventyay/organizer/core/ticket/list/TicketsFragment.java b/app/src/main/java/com/eventyay/organizer/core/ticket/list/TicketsFragment.java index 395708b79..3cd8e33a1 100644 --- a/app/src/main/java/com/eventyay/organizer/core/ticket/list/TicketsFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/ticket/list/TicketsFragment.java @@ -154,8 +154,7 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { - if (success) - ViewUtils.showSnackbar(binding.ticketsRecyclerView, R.string.refresh_complete); + // Nothing to do } @Override diff --git a/app/src/main/java/com/eventyay/organizer/core/track/list/TracksFragment.java b/app/src/main/java/com/eventyay/organizer/core/track/list/TracksFragment.java index b74b97d4f..5f3afed71 100644 --- a/app/src/main/java/com/eventyay/organizer/core/track/list/TracksFragment.java +++ b/app/src/main/java/com/eventyay/organizer/core/track/list/TracksFragment.java @@ -197,8 +197,7 @@ public void showProgress(boolean show) { @Override public void onRefreshComplete(boolean success) { - if (success) - ViewUtils.showSnackbar(binding.tracksRecyclerView, R.string.refresh_complete); + // Nothing to do } @Override diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 12ef61daa..3477e2c16 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -61,7 +61,6 @@ Draft Gross Sales Sales Summary - Refresh Complete Search Search Attendees Tickets diff --git a/app/src/test/java/com/eventyay/organizer/core/event/sales/SalesSummaryViewModelTest.java b/app/src/test/java/com/eventyay/organizer/core/event/sales/SalesSummaryViewModelTest.java index 775966d85..cf67d00ab 100644 --- a/app/src/test/java/com/eventyay/organizer/core/event/sales/SalesSummaryViewModelTest.java +++ b/app/src/test/java/com/eventyay/organizer/core/event/sales/SalesSummaryViewModelTest.java @@ -52,8 +52,6 @@ public class SalesSummaryViewModelTest { @Mock Observer progress; @Mock - Observer success; - @Mock Observer event; private static final List ATTENDEES = Arrays.asList( @@ -89,10 +87,9 @@ public void shouldLoadDetailsSuccessfully() { when(eventRepository.getEvent(ID, false)) .thenReturn(Observable.just(EVENT)); - InOrder inOrder = Mockito.inOrder(event, eventRepository, progress, success); + InOrder inOrder = Mockito.inOrder(event, eventRepository, progress); salesSummaryViewModel.getProgress().observeForever(progress); - salesSummaryViewModel.getSuccess().observeForever(success); salesSummaryViewModel.getEventLiveData().observeForever(event); salesSummaryViewModel.loadDetails(ID, false); @@ -111,16 +108,14 @@ public void shouldLoadAttendeesSuccessfully() { when(attendeeRepository.getAttendees(ID, false)) .thenReturn(Observable.fromIterable(ATTENDEES)); - InOrder inOrder = Mockito.inOrder(event, attendeeRepository, progress, success); + InOrder inOrder = Mockito.inOrder(event, attendeeRepository, progress); salesSummaryViewModel.getProgress().observeForever(progress); - salesSummaryViewModel.getSuccess().observeForever(success); salesSummaryViewModel.loadDetails(ID, false); inOrder.verify(attendeeRepository).getAttendees(ID, false); inOrder.verify(progress).onChanged(true); - inOrder.verify(success).onChanged("Loaded Successfully"); inOrder.verify(progress).onChanged(false); } diff --git a/app/src/test/java/com/eventyay/organizer/core/faq/list/FaqListViewModelTest.java b/app/src/test/java/com/eventyay/organizer/core/faq/list/FaqListViewModelTest.java index 1de26320c..caf0d53aa 100644 --- a/app/src/test/java/com/eventyay/organizer/core/faq/list/FaqListViewModelTest.java +++ b/app/src/test/java/com/eventyay/organizer/core/faq/list/FaqListViewModelTest.java @@ -61,8 +61,6 @@ public class FaqListViewModelTest { @Mock Observer progress; @Mock - Observer success; - @Mock Observer error; private static final List FAQS = Arrays.asList( @@ -96,15 +94,13 @@ public void shouldLoadFaqsSuccessfully() { .thenReturn(Observable.fromIterable(FAQS)); when(faqChangeListener.getNotifier()).thenReturn(PublishSubject.create()); - InOrder inOrder = Mockito.inOrder(progress, success); + InOrder inOrder = Mockito.inOrder(progress); faqListViewModel.getProgress().observeForever(progress); - faqListViewModel.getSuccess().observeForever(success); faqListViewModel.loadFaqs(false); inOrder.verify(progress).onChanged(true); - inOrder.verify(success).onChanged(anyString()); inOrder.verify(progress).onChanged(false); } diff --git a/app/src/test/java/com/eventyay/organizer/core/feedback/FeedbackListViewModelTest.java b/app/src/test/java/com/eventyay/organizer/core/feedback/FeedbackListViewModelTest.java index 98f38a1f1..4e07060af 100644 --- a/app/src/test/java/com/eventyay/organizer/core/feedback/FeedbackListViewModelTest.java +++ b/app/src/test/java/com/eventyay/organizer/core/feedback/FeedbackListViewModelTest.java @@ -54,8 +54,6 @@ public class FeedbackListViewModelTest { @Mock Observer progress; @Mock - Observer success; - @Mock Observer error; private static final List FEEDBACKS = Arrays.asList( @@ -85,15 +83,13 @@ public void shouldLoadFeedbacksSuccessfully() { when(feedbackRepository.getFeedbacks(anyLong(), anyBoolean())) .thenReturn(Observable.fromIterable(FEEDBACKS)); - InOrder inOrder = Mockito.inOrder(progress, success); + InOrder inOrder = Mockito.inOrder(progress); feedbackListViewModel.getProgress().observeForever(progress); - feedbackListViewModel.getSuccess().observeForever(success); feedbackListViewModel.loadFeedbacks(false); inOrder.verify(progress).onChanged(true); - inOrder.verify(success).onChanged(anyString()); inOrder.verify(progress).onChanged(false); } diff --git a/app/src/test/java/com/eventyay/organizer/core/organizer/detail/OrganizerDetailViewModelTest.java b/app/src/test/java/com/eventyay/organizer/core/organizer/detail/OrganizerDetailViewModelTest.java index 95090cf8d..e7767d168 100644 --- a/app/src/test/java/com/eventyay/organizer/core/organizer/detail/OrganizerDetailViewModelTest.java +++ b/app/src/test/java/com/eventyay/organizer/core/organizer/detail/OrganizerDetailViewModelTest.java @@ -51,8 +51,6 @@ public class OrganizerDetailViewModelTest { Observer error; @Mock Observer progress; - @Mock - Observer success; @Before public void setUp() { @@ -71,18 +69,15 @@ public void tearDown() { @Test public void shouldLoadOrganizerSuccessfully() { - String successString = "Organizer Details Loaded Successfully"; when(userRepository.getOrganizer(anyBoolean())).thenReturn(Observable.just(USER)); - InOrder inOrder = Mockito.inOrder(progress, success); + InOrder inOrder = Mockito.inOrder(progress); organizerDetailViewModel.getProgress().observeForever(progress); - organizerDetailViewModel.getSuccess().observeForever(success); organizerDetailViewModel.loadOrganizer(false); inOrder.verify(progress).onChanged(true); - inOrder.verify(success).onChanged(successString); inOrder.verify(progress).onChanged(false); } @@ -90,7 +85,7 @@ public void shouldLoadOrganizerSuccessfully() { public void shouldShowErrorOnOrganizerLoadFailure() { when(userRepository.getOrganizer(anyBoolean())).thenReturn(Observable.error(new Throwable("Error"))); - InOrder inOrder = Mockito.inOrder(progress, error, success); + InOrder inOrder = Mockito.inOrder(progress, error); organizerDetailViewModel.getProgress().observeForever(progress); organizerDetailViewModel.getError().observeForever(error); @@ -104,15 +99,9 @@ public void shouldShowErrorOnOrganizerLoadFailure() { @Test public void shouldShowOrganizerDetailsOnSwipeRefreshSuccess() { - String successString = "Organizer Details Loaded Successfully"; when(userRepository.getOrganizer(true)).thenReturn(Observable.just(USER)); - InOrder inOrder = Mockito.inOrder(success); - - organizerDetailViewModel.getSuccess().observeForever(success); organizerDetailViewModel.loadOrganizer(true); - - inOrder.verify(success).onChanged(successString); } @Test @@ -129,19 +118,16 @@ public void shouldShowErrorMessageOnSwipeRefreshError() { @Test public void testProgressbarOnSwipeRefreshSuccess() { - String successString = "Organizer Details Loaded Successfully"; when(userRepository.getOrganizer(true)).thenReturn(Observable.just(USER)); - InOrder inOrder = Mockito.inOrder(progress, success); + InOrder inOrder = Mockito.inOrder(progress); organizerDetailViewModel.getProgress().observeForever(progress); - organizerDetailViewModel.getSuccess().observeForever(success); organizerDetailViewModel.getProgress().observeForever(progress); organizerDetailViewModel.loadOrganizer(true); inOrder.verify(progress).onChanged(true); - inOrder.verify(success).onChanged(successString); inOrder.verify(progress).onChanged(false); }