DO NOT MERGE Remove test code
Bug # 2092944
diff --git a/res/xml/senders.xml b/res/xml/senders.xml
index 51d5401..5ae1707 100644
--- a/res/xml/senders.xml
+++ b/res/xml/senders.xml
@@ -33,5 +33,5 @@
<sender scheme="smtp" class="com.android.email.mail.transport.SmtpSender" />
<!-- This is here for temporary demo purposes only. Do not ship with this. -->
- <sender scheme="eas" class="com.android.email.mail.exchange.ExchangeSenderExample" />
+ <!-- sender scheme="eas" class="com.android.email.mail.exchange.ExchangeSenderExample" -->
</senders>
diff --git a/res/xml/stores.xml b/res/xml/stores.xml
index d362a8e..e2f0f29 100644
--- a/res/xml/stores.xml
+++ b/res/xml/stores.xml
@@ -35,6 +35,6 @@
<store scheme="imap" class="com.android.email.mail.store.ImapStore" />
<!-- This is here for temporary demo purposes only. Do not ship with this. -->
- <store scheme="eas" class="com.android.email.mail.exchange.ExchangeStoreExample"
- push="true" visibleLimitDefault="-1" visibleLimitIncrement="-1" accountInstanceLimit="1" />
+ <!-- store scheme="eas" class="com.android.email.mail.exchange.ExchangeStoreExample"
+ push="true" visibleLimitDefault="-1" visibleLimitIncrement="-1" accountInstanceLimit="1" -->
</stores>
diff --git a/tests/src/com/android/email/activity/setup/AccountSetupAccountTypeUnitTests.java b/tests/src/com/android/email/activity/setup/AccountSetupAccountTypeUnitTests.java
index 9ad9a77..f2a5681 100644
--- a/tests/src/com/android/email/activity/setup/AccountSetupAccountTypeUnitTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSetupAccountTypeUnitTests.java
@@ -18,19 +18,19 @@
import com.android.email.Account;
import com.android.email.Preferences;
+import com.android.email.R;
import com.android.email.mail.Store;
import android.content.Context;
import android.content.Intent;
import android.test.ActivityUnitTestCase;
import android.test.suitebuilder.annotation.SmallTest;
+import android.view.View;
import java.util.HashSet;
/**
* This is a series of unit tests for the AccountSetupAccountType class.
- *
- * This is just unit tests of simple calls - the activity is not instantiated
*/
@SmallTest
public class AccountSetupAccountTypeUnitTests
@@ -91,13 +91,23 @@
info.mAccountInstanceLimit = 2;
assertFalse("limit, reached", activity.checkAccountInstanceLimit(info));
}
-
+
+ /**
+ * Confirm that EAS is not presented (not supported in this release)
+ */
+ public void testEasOffered() {
+ Account acct1 = createTestAccount("scheme1");
+ AccountSetupAccountType activity = startActivity(getTestIntent(acct1), null, null);
+ View exchangeButton = activity.findViewById(R.id.exchange);
+ assertEquals(View.GONE, exchangeButton.getVisibility());
+ }
+
/**
* Create a dummy account with minimal fields
*/
private Account createTestAccount(String scheme) {
Account account = new Account(mContext);
- account.setStoreUri(scheme + "://user:pass@server.com:port");
+ account.setStoreUri(scheme + "://user:pass@server.com:999");
account.save(mPreferences);
mAccounts.add(account);
return account;
