More Store cleanup

Change-Id: I8f542175b4468c7a320322a57bfdaf19a7320165

3 files changed, 8 insertions, 55 deletions

diff --git a/tests/src/com/android/email/activity/setup/AccountSettingsTests.java b/tests/src/com/android/email/activity/setup/AccountSettingsTests.java
index 15e0cc658..d923c5b2b 100644
--- a/tests/src/com/android/email/activity/setup/AccountSettingsTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSettingsTests.java
@@ -16,10 +16,6 @@
 
 package com.android.email.activity.setup;
 
-import com.android.email.mail.Store;
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.HostAuth;
-
 import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
@@ -29,6 +25,9 @@ import android.preference.PreferenceFragment;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.MediumTest;
 
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.HostAuth;
+
 import java.net.URISyntaxException;
 
 /**
@@ -38,7 +37,7 @@ import java.net.URISyntaxException;
  * TODO: These cannot run in the single-pane mode, and need to be refactored into single-pane
  *       and multi-pane versions.  Until then, they are all disabled.
  *
- * To execute:  runtest -c com.android.email.activity.setup.AccountSettingsXLTests email
+ * To execute:  runtest -c com.android.email.activity.setup.AccountSettingsTests email
  */
 @MediumTest
 public class AccountSettingsTests extends ActivityInstrumentationTestCase2<AccountSettings> {
@@ -111,12 +110,6 @@ public class AccountSettingsTests extends ActivityInstrumentationTestCase2<Accou
      * Test that EAS accounts are displayed with a push option
      */
     public void disable_testPushOptionEAS() throws Throwable {
-        // This test should only be run if EAS is supported
-        if (Store.StoreInfo.getStoreInfo("eas", getInstrumentation().getTargetContext())
-                == null) {
-            return;
-        }
-
         Intent i = getTestIntent("Name", "eas://user:password@server.com",
                 "eas://user:password@server.com");
         setActivityIntent(i);
diff --git a/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java b/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java
index 909408419..7d7e9bdf3 100644
--- a/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java
@@ -16,11 +16,6 @@
 
 package com.android.email.activity.setup;
 
-import com.android.email.R;
-import com.android.email.mail.Store;
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.HostAuth;
-
 import android.content.Context;
 import android.content.Intent;
 import android.test.ActivityInstrumentationTestCase2;
@@ -30,6 +25,10 @@ import android.widget.CheckBox;
 import android.widget.Spinner;
 import android.widget.SpinnerAdapter;
 
+import com.android.email.R;
+import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.HostAuth;
+
 import java.net.URISyntaxException;
 
 /**
@@ -82,12 +81,6 @@ public class AccountSetupOptionsTests
      */
     public void testPushOptionEAS()
             throws URISyntaxException {
-        // This test should only be run if EAS is supported
-        if (Store.StoreInfo.getStoreInfo("eas", this.getInstrumentation().getTargetContext())
-                == null) {
-            return;
-        }
-
         Intent i = getTestIntent("Name", "eas://user:password@server.com");
         this.setActivityIntent(i);
 
@@ -118,11 +111,6 @@ public class AccountSetupOptionsTests
      */
     public void testBackgroundAttachmentsEas()
             throws URISyntaxException {
-        // This test should only be run if EAS is supported
-        if (Store.StoreInfo.getStoreInfo("eas", this.getInstrumentation().getTargetContext())
-                == null) {
-            return;
-        }
         checkBackgroundAttachments("eas://user:password@server.com", true);
     }
 
diff --git a/tests/src/com/android/email/mail/StoreTests.java b/tests/src/com/android/email/mail/StoreTests.java
index b36b9bc88..1be9a85ec 100644
--- a/tests/src/com/android/email/mail/StoreTests.java
+++ b/tests/src/com/android/email/mail/StoreTests.java
@@ -20,8 +20,6 @@ import android.content.Context;
 import android.test.ProviderTestCase2;
 import android.test.suitebuilder.annotation.MediumTest;
 
-import com.android.email.Email;
-import com.android.email.mail.Store.StoreInfo;
 import com.android.email.provider.EmailProvider;
 import com.android.email.provider.ProviderTestUtils;
 import com.android.emailcommon.mail.MessagingException;
@@ -54,32 +52,6 @@ public class StoreTests extends ProviderTestCase2<EmailProvider> {
         super(EmailProvider.class, EmailContent.AUTHORITY);
     }
 
-    public void testGetStoreInfo() {
-        StoreInfo testInfo;
-
-        // POP3
-        testInfo = Store.StoreInfo.getStoreInfo("pop3", mContext);
-        assertNotNull(testInfo);
-        assertNotNull(testInfo.mScheme);
-        assertNotNull(testInfo.mClassName);
-        assertFalse(testInfo.mPushSupported);
-        assertEquals(Email.VISIBLE_LIMIT_DEFAULT, testInfo.mVisibleLimitDefault);
-        assertEquals(Email.VISIBLE_LIMIT_INCREMENT, testInfo.mVisibleLimitIncrement);
-
-        // IMAP
-        testInfo = Store.StoreInfo.getStoreInfo("imap", mContext);
-        assertNotNull(testInfo);
-        assertNotNull(testInfo.mScheme);
-        assertNotNull(testInfo.mClassName);
-        assertFalse(testInfo.mPushSupported);
-        assertEquals(Email.VISIBLE_LIMIT_DEFAULT, testInfo.mVisibleLimitDefault);
-        assertEquals(Email.VISIBLE_LIMIT_INCREMENT, testInfo.mVisibleLimitIncrement);
-
-        // Unknown
-        testInfo = Store.StoreInfo.getStoreInfo("unknownscheme", mContext);
-        assertNull(testInfo);
-    }
-
     public void testGetInstance() throws MessagingException {
         Store testStore;