Merge "Use InstrumentationTestCase and get rid of AndroidTestCase.getTestContext call"
This commit is contained in:
commit
4b3ae50eef
1 changed files with 6 additions and 4 deletions
|
@ -16,25 +16,27 @@
|
|||
|
||||
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.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Locale;
|
||||
|
||||
public class KeySpecParserCsvTests extends AndroidTestCase {
|
||||
public class KeySpecParserCsvTests extends InstrumentationTestCase {
|
||||
private final KeyboardTextsSet mTextsSet = new KeyboardTextsSet();
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
|
||||
final Instrumentation instrumentation = getInstrumentation();
|
||||
mTextsSet.setLanguage(Locale.ENGLISH.getLanguage());
|
||||
mTextsSet.loadStringResources(getContext());
|
||||
mTextsSet.loadStringResources(instrumentation.getTargetContext());
|
||||
final String[] testResourceNames = getAllResourceIdNames(
|
||||
com.android.inputmethod.latin.tests.R.string.class);
|
||||
mTextsSet.loadStringResourcesInternal(getTestContext(),
|
||||
mTextsSet.loadStringResourcesInternal(instrumentation.getContext(),
|
||||
testResourceNames,
|
||||
com.android.inputmethod.latin.tests.R.string.empty_string);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue