nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 258971da: Merge "Rename base test class KeySpecParserTestsBase" 

* commit '258971daace41af68373a606fc9a988d588f5bd3':
  Rename base test class KeySpecParserTestsBase
main
Tadashi G. Takaoka 2014-02-05 00:18:26 -08:00 committed by Android Git Automerger
parent a12f70f64b 258971daac
commit 15b5d0c266
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java
View File

@ -21,7 +21,7 @@ import android.test.suitebuilder.annotation.SmallTest;
import com.android.inputmethod.latin.Constants;
@SmallTest
public final class KeySpecParserTests extends KeySpecParserBase {
public final class KeySpecParserTests extends KeySpecParserTestsBase {
@Override
protected void assertParser(final String message, final String keySpec,
final String expectedLabel, final String expectedOutputText, final int expectedIcon,

6
tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserBase.java → tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTestsBase.java
View File

@ -30,7 +30,7 @@ import com.android.inputmethod.latin.utils.RunInLocale;
import java.util.Locale;
abstract class KeySpecParserBase extends AndroidTestCase {
abstract class KeySpecParserTestsBase extends AndroidTestCase {
private final static Locale TEST_LOCALE = Locale.ENGLISH;
protected final KeyboardCodesSet mCodesSet = new KeyboardCodesSet();
protected final KeyboardTextsSet mTextsSet = new KeyboardTextsSet();
@ -251,8 +251,12 @@ abstract class KeySpecParserBase extends AndroidTestCase {
}
public void testFormatError() {
assertParserError("Null spec", null, null,
null, ICON_UNDEFINED, CODE_UNSPECIFIED);
assertParserError("Empty spec", "", null,
null, ICON_UNDEFINED, CODE_UNSPECIFIED);
assertParserError("Single bar", "|",
"|", null, ICON_UNDEFINED, '|');
assertParserError("Empty label with outputText", "|a",
null, "a", ICON_UNDEFINED, CODE_UNSPECIFIED);
assertParserError("Empty label with code", "|" + CODE_SETTINGS,

2
tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java
View File

@ -24,7 +24,7 @@ import java.util.Arrays;
import java.util.Locale;
@SmallTest
public final class MoreKeySpecTests extends KeySpecParserBase {
public final class MoreKeySpecTests extends KeySpecParserTestsBase {
@Override
protected void assertParser(final String message, final String moreKeySpec,
final String expectedLabel, final String expectedOutputText, final int expectedIconId,