Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 258971da authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Rename base test class KeySpecParserTestsBase"

parents bb476be4 2151216c

tests/src/com/android/inputmethod/keyboard/internal/KeySpecParserTests.java

+1 −1
Original line number Diff line number Diff line
@@ -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,

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

+5 −1
Original line number Diff line number Diff line
@@ -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,

tests/src/com/android/inputmethod/keyboard/internal/MoreKeySpecTests.java

+1 −1
Original line number Diff line number Diff line
@@ -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,