Use InstrumentationTestCase and get rid of AndroidTestCase.getTestContext call
Bug: 6202480 Change-Id: I19e04f17614e70867f8383d08667e350d753cde9main
parent
4c8cee05ac
commit
9a5bf1d12e
|
@ -16,25 +16,27 @@
|
||||||
|
|
||||||
package com.android.inputmethod.keyboard.internal;
|
package com.android.inputmethod.keyboard.internal;
|
||||||
|
|
||||||
import android.test.AndroidTestCase;
|
import android.app.Instrumentation;
|
||||||
|
import android.test.InstrumentationTestCase;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
public class KeySpecParserCsvTests extends AndroidTestCase {
|
public class KeySpecParserCsvTests extends InstrumentationTestCase {
|
||||||
private final KeyboardTextsSet mTextsSet = new KeyboardTextsSet();
|
private final KeyboardTextsSet mTextsSet = new KeyboardTextsSet();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void setUp() throws Exception {
|
protected void setUp() throws Exception {
|
||||||
super.setUp();
|
super.setUp();
|
||||||
|
|
||||||
|
final Instrumentation instrumentation = getInstrumentation();
|
||||||
mTextsSet.setLanguage(Locale.ENGLISH.getLanguage());
|
mTextsSet.setLanguage(Locale.ENGLISH.getLanguage());
|
||||||
mTextsSet.loadStringResources(getContext());
|
mTextsSet.loadStringResources(instrumentation.getTargetContext());
|
||||||
final String[] testResourceNames = getAllResourceIdNames(
|
final String[] testResourceNames = getAllResourceIdNames(
|
||||||
com.android.inputmethod.latin.tests.R.string.class);
|
com.android.inputmethod.latin.tests.R.string.class);
|
||||||
mTextsSet.loadStringResourcesInternal(getTestContext(),
|
mTextsSet.loadStringResourcesInternal(instrumentation.getContext(),
|
||||||
testResourceNames,
|
testResourceNames,
|
||||||
com.android.inputmethod.latin.tests.R.string.empty_string);
|
com.android.inputmethod.latin.tests.R.string.empty_string);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue