Skip to content

Commit

Permalink
added test for forward of text message, detects signalapp#3413 and va…
Browse files Browse the repository at this point in the history
…lidates signalapp#3414

Closes signalapp#3416
// FREEBIE
  • Loading branch information
rhodey authored and moxie0 committed Jun 13, 2015
1 parent d935be7 commit d98cb7b
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
import static android.support.test.espresso.Espresso.openContextualActionModeOverflowMenu;
import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
Expand All @@ -42,6 +43,11 @@ public static void clickDeleteThread(Context context) throws Exception {
onView(withText(R.string.conversation__menu_delete_thread)).perform(click());
}

public static void clickForwardMessage() throws Exception {
openContextualActionModeOverflowMenu();
onView(withText(R.string.conversation_context__menu_forward_message)).perform(click());
}

public static void toggleEmojiKeyboard() throws Exception {
onView(withId(R.id.emoji_toggle)).perform(click());
}
Expand All @@ -50,4 +56,8 @@ public static void typeMessage(String message) throws Exception {
typeTextAndCloseKeyboard(onView(withId(R.id.embedded_text_editor)), message);
}

public static void clickSend() throws Exception {
onView(withId(R.id.send_button)).perform(click());
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package org.thoughtcrime.securesms;

import android.test.suitebuilder.annotation.LargeTest;

import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.longClick;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static org.thoughtcrime.securesms.EspressoUtil.addContact;
import static org.thoughtcrime.securesms.EspressoUtil.waitOn;

/**
* rhodey
*/
@LargeTest
public class ConversationActivityTest extends TextSecureEspressoTestCase<ConversationListActivity> {

public ConversationActivityTest() {
super(ConversationListActivity.class);
}

public void testForwardMessage() throws Exception {
final String[] CONTACT_NAMES = new String[] {"Clement Duval", "Masha Kolenkia"};
final String[] CONTACT_NUMBERS = new String[] {"55555555555", "33333333333"};
final String MESSAGE = "I struck him in the name of liberty";

addContact(getContext(), CONTACT_NAMES[0], CONTACT_NUMBERS[0]);
addContact(getContext(), CONTACT_NAMES[1], CONTACT_NUMBERS[1]);
loadActivity(ConversationListActivity.class, STATE_REGISTERED);

ConversationListActivityActions.clickNewConversation();
waitOn(NewConversationActivity.class);
NewConversationActivityActions.clickContactWithName(CONTACT_NAMES[0]);
waitOn(ConversationActivity.class);
ConversationActivityActions.typeMessage(MESSAGE);
ConversationActivityActions.clickSend();

onView(withText(MESSAGE)).perform(longClick());
ConversationActivityActions.clickForwardMessage();

waitOn(ShareActivity.class);
onView(withId(R.id.menu_new_message)).perform(click());
waitOn(NewConversationActivity.class);
NewConversationActivityActions.filterNameOrNumber(CONTACT_NAMES[1]);
NewConversationActivityActions.clickContactWithName(CONTACT_NAMES[1]);

waitOn(ConversationActivity.class);
onView(withText(MESSAGE)).check(matches(isDisplayed()));
}

}

0 comments on commit d98cb7b

Please sign in to comment.