Skip to content

Commit e939ecd

Browse files
committed
Revision 3
1. Added test to verify if the text passed is visible on empty inbox screen 2. Passing the arguments to IterableInboxFragment in in-case customer just initializes IterableInboxActivity instead of IterableInboxFragment 3. Modified basic test method as it tries to click on empty list which we now hide if its empty 4. Parsing and assinging the strings in onCreate instead of onStart of fragment
1 parent c5a6e90 commit e939ecd

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

app/src/androidTest/java/com/iterable/iterableapi/MainActivityTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,18 @@ public void testSwipeToDeleteInApp() throws Exception {
233233
onView(withText("Tips and tricks 2")).check(doesNotExist());
234234
}
235235

236+
@Test
237+
public void testNoMessagesTitleAndText() throws Exception {
238+
Intent intent = new Intent();
239+
String noMessageTitle = "OOPSY";
240+
String noMessageBody = "No messages for you";
241+
intent.putExtra(IterableConstants.NO_MESSAGES_TITLE,noMessageTitle);
242+
intent.putExtra(IterableConstants.NO_MESSAGES_BODY,noMessageBody);
243+
rule.launchActivity(intent);
244+
onView(withText(noMessageTitle)).check(matches(isDisplayed()));
245+
onView(withText(noMessageBody)).check(matches(isDisplayed()));
246+
}
247+
236248

237249
static class Matchers{
238250
public static Matcher<View> withListSize (final int size) {

app/src/androidTest/java/com/iterable/iterableapi/testapp/InboxUITest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ protected void beforeActivityLaunched() {
3030

3131
@Test
3232
public void basicTest() {
33-
onView(withId(R.id.list)).perform(click());
3433
assertNotNull(rule.getActivity());
3534
}
3635
}

iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/inbox/IterableInboxActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
3838
inboxMode = (InboxMode) inboxModeExtra;
3939
}
4040
inboxFragment = IterableInboxFragment.newInstance(inboxMode, itemLayoutId);
41+
inboxFragment.setArguments(intent.getExtras());
4142

4243
if (intent.getStringExtra(ACTIVITY_TITLE) != null) {
4344
setTitle(intent.getStringExtra(ACTIVITY_TITLE));

iterableapi-ui/src/main/java/com/iterable/iterableapi/ui/inbox/IterableInboxFragment.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -174,17 +174,15 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
174174
recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
175175
IterableInboxAdapter adapter = new IterableInboxAdapter(IterableApi.getInstance().getInAppManager().getInboxMessages(), IterableInboxFragment.this, adapterExtension, comparator, filter, dateMapper);
176176
recyclerView.setAdapter(adapter);
177+
noMessagesTitleTextView = relativeLayout.findViewById(R.id.emptyInboxTitle);
178+
noMessagesBodyTextView = relativeLayout.findViewById(R.id.emptyInboxMessage);
179+
noMessagesTitleTextView.setText(noMessagesTitle);
180+
noMessagesBodyTextView.setText(noMessagesBody);
177181
ItemTouchHelper itemTouchHelper = new ItemTouchHelper(new IterableInboxTouchHelper(getContext(), adapter));
178182
itemTouchHelper.attachToRecyclerView(recyclerView);
179183
return relativeLayout.getRootView();
180184
}
181185

182-
@Override
183-
public void onStart() {
184-
super.onStart();
185-
updateEmptyInboxMessage();
186-
}
187-
188186
@Override
189187
public void onResume() {
190188
super.onResume();
@@ -193,13 +191,6 @@ public void onResume() {
193191
startSession();
194192
}
195193

196-
private void updateEmptyInboxMessage() {
197-
noMessagesTitleTextView = getView().findViewById(R.id.emptyInboxTitle);
198-
noMessagesBodyTextView = getView().findViewById(R.id.emptyInboxMessage);
199-
noMessagesTitleTextView.setText(noMessagesTitle);
200-
noMessagesBodyTextView.setText(noMessagesBody);
201-
}
202-
203194
@Override
204195
public void onPause() {
205196
IterableApi.getInstance().getInAppManager().removeListener(this);

0 commit comments

Comments
 (0)