Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into bug/TeachTravisToBePolite
- Loading branch information
Showing
16 changed files
with
605 additions
and
101 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
app/src/androidTest/java/ch/epfl/sweng/eventmanager/TestHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package ch.epfl.sweng.eventmanager; | ||
|
|
||
| import android.support.test.espresso.matcher.BoundedMatcher; | ||
| import android.support.v7.widget.Toolbar; | ||
| import android.view.View; | ||
| import android.widget.EditText; | ||
|
|
||
| import org.hamcrest.Description; | ||
| import org.hamcrest.Matcher; | ||
|
|
||
| import static org.hamcrest.CoreMatchers.is; | ||
|
|
||
| public class TestHelper { | ||
| /** | ||
| * Stolen from StackOverflow question 36329978. | ||
| */ | ||
| public static Matcher<View> withToolbarTitle(CharSequence title) { | ||
| return withToolbarTitle(is(title)); | ||
| } | ||
|
|
||
| /** | ||
| * Stolen from StackOverflow question 36329978. | ||
| */ | ||
| public static Matcher<View> withToolbarTitle(final Matcher<CharSequence> textMatcher) { | ||
| return new BoundedMatcher<View, Toolbar>(Toolbar.class) { | ||
| @Override | ||
| public boolean matchesSafely(Toolbar toolbar) { | ||
| return textMatcher.matches(toolbar.getTitle()); | ||
| } | ||
|
|
||
| @Override | ||
| public void describeTo(Description description) { | ||
| description.appendText("with toolbar title: "); | ||
| textMatcher.describeTo(description); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| /** | ||
| * Stolen from StackOverflow question 42668617. | ||
| */ | ||
| public static Matcher<View> hasNoErrorText() { | ||
| return new BoundedMatcher<View, EditText>(EditText.class) { | ||
|
|
||
| @Override | ||
| public void describeTo(Description description) { | ||
| description.appendText("has no error text: "); | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean matchesSafely(EditText view) { | ||
| return view.getError() == null; | ||
| } | ||
| }; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
98 changes: 98 additions & 0 deletions
98
app/src/androidTest/java/ch/epfl/sweng/eventmanager/ui/userManager/SignUpActivityTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| package ch.epfl.sweng.eventmanager.ui.userManager; | ||
|
|
||
| import android.content.Context; | ||
| import android.os.SystemClock; | ||
| import android.support.test.InstrumentationRegistry; | ||
| import android.support.test.espresso.NoMatchingViewException; | ||
| import android.support.test.espresso.matcher.ViewMatchers; | ||
| import android.support.test.rule.ActivityTestRule; | ||
| import android.support.test.runner.AndroidJUnit4; | ||
| import android.util.Log; | ||
|
|
||
| import junit.framework.AssertionFailedError; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Ignore; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| import ch.epfl.sweng.eventmanager.R; | ||
| import ch.epfl.sweng.eventmanager.TestHelper; | ||
| import ch.epfl.sweng.eventmanager.users.Session; | ||
|
|
||
| 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.closeSoftKeyboard; | ||
| import static android.support.test.espresso.action.ViewActions.typeText; | ||
| import static android.support.test.espresso.assertion.ViewAssertions.matches; | ||
| import static android.support.test.espresso.matcher.ViewMatchers.hasErrorText; | ||
| 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.hamcrest.CoreMatchers.containsString; | ||
|
|
||
| @RunWith(AndroidJUnit4.class) | ||
| public class SignUpActivityTest { | ||
|
|
||
| @Before | ||
| public void disableFirebaseAuth() { | ||
| Session.enforceDummySessions(); | ||
| } | ||
|
|
||
| @Rule | ||
| public final ActivityTestRule<SignUpActivity> mActivityRule = | ||
| new ActivityTestRule<>(SignUpActivity.class); | ||
|
|
||
| @Test | ||
| public void testNonMatchingPasswords() { | ||
| String email = "al.pha"; | ||
| String password = "secret"; | ||
| String passwordMatchError = getResourceString(R.string.password_match_error); | ||
|
|
||
| // Test non-matching passwords | ||
| onView(withId(R.id.email_field)) | ||
| .perform(typeText(email)) | ||
| .perform(closeSoftKeyboard()); | ||
| onView(withId(R.id.password_field)) | ||
| .perform(typeText(password)) | ||
| .perform(closeSoftKeyboard()); | ||
| onView(withId(R.id.password_confirmation_field)) | ||
| .perform(typeText("secret+typo")) | ||
| .perform(closeSoftKeyboard()); | ||
| onView(withId(R.id.signup_button)).perform(click()); | ||
| onView(withId(R.id.password_field)) | ||
| .check(matches(hasErrorText(passwordMatchError))); | ||
| } | ||
|
|
||
| @Test | ||
| public void testValidInput() { | ||
| String email = "al.pha@domain.tld"; | ||
| String password = "secret"; | ||
|
|
||
| onView(withId(R.id.email_field)) | ||
| .perform(typeText(email)) | ||
| .perform(closeSoftKeyboard()); | ||
| onView(withId(R.id.password_field)) | ||
| .perform(typeText(password)) | ||
| .perform(closeSoftKeyboard()); | ||
| onView(withId(R.id.password_confirmation_field)) | ||
| .perform(typeText(password)) | ||
| .perform(closeSoftKeyboard()); | ||
| onView(withId(R.id.signup_button)).perform(click()); | ||
|
|
||
| // Nothing is going to happen since we use the DummyInMemorySession | ||
| // Check that everything went fine with the lack of error messages | ||
| onView(withId(R.id.email_field)) | ||
| .check(matches(TestHelper.hasNoErrorText())); | ||
| onView(withId(R.id.password_field)) | ||
| .check(matches(TestHelper.hasNoErrorText())); | ||
| onView(withId(R.id.password_confirmation_field)) | ||
| .check(matches(TestHelper.hasNoErrorText())); | ||
| } | ||
|
|
||
| private String getResourceString(int id) { | ||
| Context targetContext = InstrumentationRegistry.getTargetContext(); | ||
| return targetContext.getResources().getString(id); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.