Merge "Add missing test runner annotations"

main
TreeHugger Robot 2018-08-14 19:42:25 +00:00 committed by Android (Google) Code Review
commit ac5ba44b09
2 changed files with 8 additions and 2 deletions

View File

@ -24,11 +24,13 @@ import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Contacts;
import android.test.suitebuilder.annotation.SmallTest; import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
@ -38,6 +40,7 @@ import java.util.ArrayList;
* Tests for {@link ContactsContentObserver}. * Tests for {@link ContactsContentObserver}.
*/ */
@SmallTest @SmallTest
@RunWith(AndroidJUnit4.class)
public class ContactsContentObserverTest { public class ContactsContentObserverTest {
private static final int UPDATED_CONTACT_COUNT = 10; private static final int UPDATED_CONTACT_COUNT = 10;
private static final int STALE_CONTACT_COUNT = 8; private static final int STALE_CONTACT_COUNT = 8;

View File

@ -20,9 +20,11 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import android.test.suitebuilder.annotation.SmallTest; import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.Locale; import java.util.Locale;
@ -30,6 +32,7 @@ import java.util.Locale;
* Tests for {@link ContactsDictionaryUtils} * Tests for {@link ContactsDictionaryUtils}
*/ */
@SmallTest @SmallTest
@RunWith(AndroidJUnit4.class)
public class ContactsDictionaryUtilsTest { public class ContactsDictionaryUtilsTest {
@Test @Test