Modified BaseTest to support the new login flow

Author: kunall17

app/src/androidTest/java/com/zulip/android/activities/BaseTest.java

@@ -3,13 +3,14 @@
 
 import android.support.test.espresso.Root;
 import android.support.test.espresso.ViewInteraction;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 
 import com.zulip.android.R;
 import com.zulip.android.ToastMatcher;
 import com.zulip.android.ZulipApp;
+import com.zulip.android.util.ZLog;
 
 import org.hamcrest.Matcher;
 import org.junit.Before;
@@ -38,6 +39,7 @@ public class BaseTest {
 
     private static final String PASSWORD_TEST = "yourpasswordhere";
     private static final String EMAIL_TEST = "[email protected]";
+    public static final String SERVER_URL = "www.local.test.com";
 
     @Rule
     public ActivityTestRule<ZulipActivity> mActivityTestRule = new ActivityTestRule<>(ZulipActivity.class);
@@ -53,7 +55,22 @@ public void setUp() {
     public void WrongLoginPasswordToast() {
         if (ZulipApp.get().getApiKey() != null) {
             logout();
+            try {
+                Thread.sleep(4000);
+            } catch (InterruptedException e) {
+                ZLog.logException(e);
+            }
         }
+
+        //Fill Server URL
+        ViewInteraction serverURLInteraction = onView(allOf(withId(R.id.server_url_in), isDisplayed()));
+        serverURLInteraction.perform(replaceText(SERVER_URL));
+
+        //Click Enter server URL
+        ViewInteraction enterServerUrl = onView(allOf(withId(R.id.server_btn), withText(R.string.enter), isDisplayed()));
+        enterServerUrl.perform(click());
+
+
         //Fill Username
         ViewInteraction usernameVI = onView(
                 allOf(withId(R.id.username), isDisplayed()));
@@ -78,6 +95,23 @@ public static Matcher<Root> isToast() {
 
     @Test
     public void logout() {
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            ZLog.logException(e);
+        }
+        mActivityTestRule.getActivity().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mActivityTestRule.getActivity().showView(mActivityTestRule.getActivity().findViewById(R.id.appBarLayout));
+            }
+        });
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            ZLog.logException(e);
+        }
+
         //Open overflow menu
         openActionBarOverflowOrOptionsMenu(getInstrumentation().getTargetContext());
 
@@ -88,21 +122,28 @@ public void logout() {
         assertNull(ZulipApp.get().getApiKey());
     }
 
+    @Test
     public void login() {
         try {
             Thread.sleep(1000);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            ZLog.logException(e);
         }
 
+        //Fill Server URL
+        ViewInteraction serverURLInteraction = onView(allOf(withId(R.id.server_url_in), isDisplayed()));
+        serverURLInteraction.perform(replaceText(SERVER_URL));
+
+        //Click Enter server URL
+        ViewInteraction enterServerUrl = onView(allOf(withId(R.id.server_btn), withText(R.string.enter), isDisplayed()));
+        enterServerUrl.perform(click());
+
         //Fill Username
-        ViewInteraction usernameVI = onView(
-                allOf(withId(R.id.username), isDisplayed()));
+        ViewInteraction usernameVI = onView(allOf(withId(R.id.username), isDisplayed()));
         usernameVI.perform(replaceText(EMAIL_TEST));
 
         //Fill Password
-        ViewInteraction passwordVI = onView(
-                allOf(withId(R.id.password), isDisplayed()));
+        ViewInteraction passwordVI = onView(allOf(withId(R.id.password), isDisplayed()));
         passwordVI.perform(replaceText(PASSWORD_TEST));
 
         //Click Login

app/src/main/res/layout/main.xml

@@ -14,6 +14,7 @@
         <android.support.design.widget.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:id="@+id/appBarLayout"
             android:theme="@style/AppTheme.AppBarOverlay"
             app:layout_behavior="com.zulip.android.util.RemoveViewsOnScroll">