From 10c7412555ce7f1499cf2834f35e95adf4769de3 Mon Sep 17 00:00:00 2001 From: Martin Hibdon Date: Wed, 19 Feb 2014 16:15:43 -0800 Subject: [PATCH] Fix some broken tests b/13085182 You can't look up emailServiceInfo for smtp, we don't store that in services.xml. The thing is, if we're using outgoing settings, we're always using smtp, which allows oauth. Change-Id: I5c6032e8d5020ba83fa1c803666b83f134f87f75 --- .../activity/setup/AccountSetupOutgoingFragment.java | 8 +------- .../email/activity/setup/AccountSetupOutgoingTests.java | 7 ++++--- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java b/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java index 6db750f90..3583f4fd5 100644 --- a/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java +++ b/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java @@ -75,7 +75,6 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment private EditText mPortView; private CheckBox mRequireLoginView; private Spinner mSecurityTypeView; - private EmailServiceInfo mServiceInfo; // Support for lifecycle private boolean mStarted; @@ -283,7 +282,6 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment if (mLoaded) return; final HostAuth sendAuth = mSetupData.getAccount().getOrCreateHostAuthSend(mContext); - mServiceInfo = EmailServiceUtils.getServiceInfo(mContext, sendAuth.mProtocol); if ((sendAuth.mFlags & HostAuth.FLAG_AUTHENTICATE) != 0) { final String username = sendAuth.mLogin; if (username != null) { @@ -293,11 +291,7 @@ public class AccountSetupOutgoingFragment extends AccountServerBaseFragment mAuthenticationView.setAuthInfo(true, sendAuth); if (mAuthenticationLabel != null) { - if (mServiceInfo.offerOAuth) { - mAuthenticationLabel.setText(R.string.authentication_label); - } else { - mAuthenticationLabel.setText(R.string.password_label); - } + mAuthenticationLabel.setText(R.string.authentication_label); } } diff --git a/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java b/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java index 5de3fb95f..5384ed576 100644 --- a/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java +++ b/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java @@ -26,6 +26,7 @@ import android.widget.EditText; import com.android.email.R; import com.android.email.activity.setup.AccountSetupOutgoing; import com.android.email.activity.setup.AccountSetupOutgoingFragment; +import com.android.email.activity.setup.AuthenticationView; import com.android.email.activity.setup.SetupDataFragment; import com.android.emailcommon.provider.Account; import com.android.emailcommon.provider.HostAuth; @@ -44,7 +45,7 @@ public class AccountSetupOutgoingTests extends private AccountSetupOutgoing mActivity; private AccountSetupOutgoingFragment mFragment; private EditText mServerView; - private EditText mPasswordView; + private AuthenticationView mAuthenticationView; public AccountSetupOutgoingTests() { super(AccountSetupOutgoing.class); @@ -159,7 +160,7 @@ public class AccountSetupOutgoingTests extends * @param expectNext true if expected that this password will enable the "next" button */ private void checkPassword(String password, boolean expectNext) throws URISyntaxException { - mPasswordView.setText(password); + mAuthenticationView.setPassword(password); if (expectNext) { assertTrue(mActivity.mNextButtonEnabled); } else { @@ -178,7 +179,7 @@ public class AccountSetupOutgoingTests extends mActivity = getActivity(); mFragment = mActivity.mFragment; mServerView = (EditText) mActivity.findViewById(R.id.account_server); - mPasswordView = (EditText) mActivity.findViewById(R.id.account_server); + mAuthenticationView = (AuthenticationView) mActivity.findViewById(R.id.account_server); } /**