From d6525756a12687c985fb9f23c9cfc9dd5b238f8c Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Mon, 13 Aug 2018 14:36:49 -0700
Subject: [PATCH] Add missing test runner annotations
These tests are supposed to run even withotu @RunWith annocation, but
for better consistency we should have it there.
Bug: 110805255
Test: verified as follows. No new test failures.
tapas adb LatinIME LatinIMETests arm64 userdebug && \
DISABLE_PROGUARD=true make -j LatinIME && \
adb install -r $OUT/system/app/LatinIME/LatinIME.apk && \
atest LatinIMETests:com.android.inputmethod.latin.ContactsDictionaryUtilsTest && \
atest LatinIMETests:com.android.inputmethod.latin.ContactsContentObserverTest
Change-Id: I5c115d57b2ad41642f5f9b09b0c0d8f8c12480b0
---
.../inputmethod/latin/ContactsContentObserverTest.java | 5 ++++-
.../inputmethod/latin/ContactsDictionaryUtilsTest.java | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java b/tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java
index f90a18bf17..be039c4811 100644
--- a/tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java
+++ b/tests/src/com/android/inputmethod/latin/ContactsContentObserverTest.java
@@ -24,11 +24,13 @@ import static org.mockito.Mockito.when;
import android.content.Context;
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.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -38,6 +40,7 @@ import java.util.ArrayList;
* Tests for {@link ContactsContentObserver}.
*/
@SmallTest
+@RunWith(AndroidJUnit4.class)
public class ContactsContentObserverTest {
private static final int UPDATED_CONTACT_COUNT = 10;
private static final int STALE_CONTACT_COUNT = 8;
diff --git a/tests/src/com/android/inputmethod/latin/ContactsDictionaryUtilsTest.java b/tests/src/com/android/inputmethod/latin/ContactsDictionaryUtilsTest.java
index 9b49f1abb0..57d5def15f 100644
--- a/tests/src/com/android/inputmethod/latin/ContactsDictionaryUtilsTest.java
+++ b/tests/src/com/android/inputmethod/latin/ContactsDictionaryUtilsTest.java
@@ -20,9 +20,11 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
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.runner.RunWith;
import java.util.Locale;
@@ -30,6 +32,7 @@ import java.util.Locale;
* Tests for {@link ContactsDictionaryUtils}
*/
@SmallTest
+@RunWith(AndroidJUnit4.class)
public class ContactsDictionaryUtilsTest {
@Test
--
GitLab