From 3555dc03bf2243dc275c9c832702abbee3b64387 Mon Sep 17 00:00:00 2001 From: Jerry Xie Date: Wed, 19 Feb 2014 20:13:59 -0800 Subject: [PATCH] Add @SmallTest annotation to test classes so they get run in continuous Change-Id: Ieb0e3af146a6668c813ff16a718221eae61e8e01 --- tests/src/com/android/email/ThrottleTest.java | 2 ++ tests/src/com/android/email/VendorPolicyLoaderTest.java | 2 ++ .../com/android/email/activity/ContactStatusLoaderTest.java | 2 ++ tests/src/com/android/email/activity/IntentUtilitiesTests.java | 2 ++ tests/src/com/android/email/activity/UiUtilitiesTests.java | 2 ++ .../com/android/email/mail/store/imap/ImapUtilityTests.java | 2 ++ .../com/android/email/mail/transport/DiscourseLoggerTest.java | 2 ++ tests/src/com/android/emailcommon/DeviceTests.java | 2 ++ tests/src/com/android/emailcommon/mail/PackedStringTests.java | 3 +++ .../android/emailcommon/utility/AttachmentUtilitiesTests.java | 2 ++ .../com/android/emailcommon/utility/EmailAsyncTaskTests.java | 2 ++ .../com/android/emailcommon/utility/TextUtilitiesTests.java | 3 +++ 12 files changed, 26 insertions(+) diff --git a/tests/src/com/android/email/ThrottleTest.java b/tests/src/com/android/email/ThrottleTest.java index d31903029..49adea7b3 100644 --- a/tests/src/com/android/email/ThrottleTest.java +++ b/tests/src/com/android/email/ThrottleTest.java @@ -19,6 +19,7 @@ package com.android.email; import android.os.Handler; import android.os.Message; import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; import com.android.mail.utils.Clock; import com.android.mail.utils.Throttle; @@ -28,6 +29,7 @@ import java.util.TimerTask; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; +@SmallTest public class ThrottleTest extends AndroidTestCase { private static final int MIN_TIMEOUT = 100; private static final int MAX_TIMEOUT = 500; diff --git a/tests/src/com/android/email/VendorPolicyLoaderTest.java b/tests/src/com/android/email/VendorPolicyLoaderTest.java index c4aab5238..17bb398c3 100644 --- a/tests/src/com/android/email/VendorPolicyLoaderTest.java +++ b/tests/src/com/android/email/VendorPolicyLoaderTest.java @@ -19,10 +19,12 @@ package com.android.email; import android.content.Context; import android.os.Bundle; import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; import com.android.emailcommon.VendorPolicyLoader; import com.android.emailcommon.VendorPolicyLoader.Provider; +@SmallTest public class VendorPolicyLoaderTest extends AndroidTestCase { private String mTestApkPackageName; diff --git a/tests/src/com/android/email/activity/ContactStatusLoaderTest.java b/tests/src/com/android/email/activity/ContactStatusLoaderTest.java index 73a207c8c..ebc946253 100644 --- a/tests/src/com/android/email/activity/ContactStatusLoaderTest.java +++ b/tests/src/com/android/email/activity/ContactStatusLoaderTest.java @@ -29,6 +29,7 @@ import android.provider.ContactsContract; import android.provider.ContactsContract.StatusUpdates; import android.test.ProviderTestCase2; import android.test.mock.MockContentProvider; +import android.test.suitebuilder.annotation.SmallTest; import java.io.ByteArrayOutputStream; import java.util.ArrayList; @@ -44,6 +45,7 @@ import junit.framework.Assert; * (shouldn't) know how {@link android.provider.ContactsContract.Data#getContactLookupUri} is * implemented. */ +@SmallTest public class ContactStatusLoaderTest extends ProviderTestCase2 { private static final String EMAIL = "a@b.c"; diff --git a/tests/src/com/android/email/activity/IntentUtilitiesTests.java b/tests/src/com/android/email/activity/IntentUtilitiesTests.java index 2596e5a76..7325a9ac2 100644 --- a/tests/src/com/android/email/activity/IntentUtilitiesTests.java +++ b/tests/src/com/android/email/activity/IntentUtilitiesTests.java @@ -21,7 +21,9 @@ import com.android.emailcommon.utility.IntentUtilities; import android.content.Intent; import android.net.Uri; import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; +@SmallTest public class IntentUtilitiesTests extends AndroidTestCase { public void brokentestSimple() { final Uri.Builder b = IntentUtilities.createActivityIntentUrlBuilder("/abc"); diff --git a/tests/src/com/android/email/activity/UiUtilitiesTests.java b/tests/src/com/android/email/activity/UiUtilitiesTests.java index 541556ceb..7a5a13179 100644 --- a/tests/src/com/android/email/activity/UiUtilitiesTests.java +++ b/tests/src/com/android/email/activity/UiUtilitiesTests.java @@ -21,10 +21,12 @@ import com.android.email.R; import android.app.Activity; import android.content.Context; import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; import android.view.View; import java.util.Locale; +@SmallTest public class UiUtilitiesTests extends AndroidTestCase { public void brokentestFormatSize() { if (!"en".equalsIgnoreCase(Locale.getDefault().getLanguage())) { diff --git a/tests/src/com/android/email/mail/store/imap/ImapUtilityTests.java b/tests/src/com/android/email/mail/store/imap/ImapUtilityTests.java index 7e4a10970..91d1594da 100644 --- a/tests/src/com/android/email/mail/store/imap/ImapUtilityTests.java +++ b/tests/src/com/android/email/mail/store/imap/ImapUtilityTests.java @@ -18,7 +18,9 @@ package com.android.email.mail.store.imap; import android.test.AndroidTestCase; import android.test.MoreAsserts; +import android.test.suitebuilder.annotation.SmallTest; +@SmallTest public class ImapUtilityTests extends AndroidTestCase { public static final String[] EmptyArrayString = new String[0]; diff --git a/tests/src/com/android/email/mail/transport/DiscourseLoggerTest.java b/tests/src/com/android/email/mail/transport/DiscourseLoggerTest.java index f39b71866..a988d71c6 100644 --- a/tests/src/com/android/email/mail/transport/DiscourseLoggerTest.java +++ b/tests/src/com/android/email/mail/transport/DiscourseLoggerTest.java @@ -17,9 +17,11 @@ package com.android.email.mail.transport; import android.test.MoreAsserts; +import android.test.suitebuilder.annotation.SmallTest; import junit.framework.TestCase; +@SmallTest public class DiscourseLoggerTest extends TestCase { /** Shortcut to create a byte array */ diff --git a/tests/src/com/android/emailcommon/DeviceTests.java b/tests/src/com/android/emailcommon/DeviceTests.java index f5849e4ca..63b4ec643 100644 --- a/tests/src/com/android/emailcommon/DeviceTests.java +++ b/tests/src/com/android/emailcommon/DeviceTests.java @@ -20,9 +20,11 @@ package com.android.emailcommon; import android.content.Context; import android.telephony.TelephonyManager; import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; import com.android.mail.utils.LogUtils; +@SmallTest public class DeviceTests extends AndroidTestCase { public void testGetConsistentDeviceId() { diff --git a/tests/src/com/android/emailcommon/mail/PackedStringTests.java b/tests/src/com/android/emailcommon/mail/PackedStringTests.java index c2028f3ae..5d5182537 100644 --- a/tests/src/com/android/emailcommon/mail/PackedStringTests.java +++ b/tests/src/com/android/emailcommon/mail/PackedStringTests.java @@ -16,6 +16,8 @@ package com.android.emailcommon.mail; +import android.test.suitebuilder.annotation.SmallTest; + import com.android.emailcommon.mail.PackedString; import junit.framework.TestCase; @@ -26,6 +28,7 @@ import junit.framework.TestCase; * You can run this entire test case with: * runtest -c com.android.email.mail.PackedStringTests email */ +@SmallTest public class PackedStringTests extends TestCase { /** Note: copied from actual class */ private static final char DELIMITER_ELEMENT = '\1'; diff --git a/tests/src/com/android/emailcommon/utility/AttachmentUtilitiesTests.java b/tests/src/com/android/emailcommon/utility/AttachmentUtilitiesTests.java index 6dde0d605..f756b5b18 100644 --- a/tests/src/com/android/emailcommon/utility/AttachmentUtilitiesTests.java +++ b/tests/src/com/android/emailcommon/utility/AttachmentUtilitiesTests.java @@ -20,9 +20,11 @@ import com.android.emailcommon.provider.EmailContent; import android.net.Uri; import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; import java.io.File; +@SmallTest public class AttachmentUtilitiesTests extends AndroidTestCase { /** * Test static inferMimeType() diff --git a/tests/src/com/android/emailcommon/utility/EmailAsyncTaskTests.java b/tests/src/com/android/emailcommon/utility/EmailAsyncTaskTests.java index 41064aac5..23644812d 100644 --- a/tests/src/com/android/emailcommon/utility/EmailAsyncTaskTests.java +++ b/tests/src/com/android/emailcommon/utility/EmailAsyncTaskTests.java @@ -18,7 +18,9 @@ package com.android.emailcommon.utility; import android.test.AndroidTestCase; import android.test.MoreAsserts; +import android.test.suitebuilder.annotation.SmallTest; +@SmallTest public class EmailAsyncTaskTests extends AndroidTestCase { public void testAll() throws Exception { // Because AsyncTask relies on the UI thread and how we use threads in test, we can't diff --git a/tests/src/com/android/emailcommon/utility/TextUtilitiesTests.java b/tests/src/com/android/emailcommon/utility/TextUtilitiesTests.java index 2dbdfc717..f8068db4d 100644 --- a/tests/src/com/android/emailcommon/utility/TextUtilitiesTests.java +++ b/tests/src/com/android/emailcommon/utility/TextUtilitiesTests.java @@ -23,9 +23,12 @@ package com.android.emailcommon.utility; import android.test.AndroidTestCase; +import android.test.suitebuilder.annotation.SmallTest; + import android.text.SpannableStringBuilder; import android.text.style.BackgroundColorSpan; +@SmallTest public class TextUtilitiesTests extends AndroidTestCase { public void testPlainSnippet() {