am c18b1c42: Merge "Fix subtype count in unit test"

* commit 'c18b1c42f31ed81e072373dbbff25279cf4da94e':
  Fix subtype count in unit test
main
Ken Wakasa 2014-05-21 04:42:53 +00:00 committed by Android Git Automerger
commit 2f3db0f381
4 changed files with 7 additions and 7 deletions

View File

@ -25,7 +25,7 @@ import java.util.ArrayList;
@SmallTest
public class KeyboardLayoutSetSubtypesCountTests extends KeyboardLayoutSetTestsBase {
private static final int NUMBER_OF_SUBTYPES = 71;
private static final int NUMBER_OF_SUBTYPES = 68;
private static final int NUMBER_OF_ASCII_CAPABLE_SUBTYPES = 45;
private static final int NUMBER_OF_PREDEFINED_ADDITIONAL_SUBTYPES = 2;

View File

@ -16,7 +16,7 @@
package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import android.test.suitebuilder.annotation.Suppress;
import com.android.inputmethod.keyboard.layout.HindiCompact;
import com.android.inputmethod.keyboard.layout.HindiCompact.HindiCompactCustomizer;
@ -27,7 +27,7 @@ import java.util.Locale;
/**
* hi: Hindi/hindi_compact
*/
@SmallTest
@Suppress
public final class TestsHindiCompact extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("hi");
private static final LayoutBase LAYOUT = new HindiCompact(new HindiCompactCustomizer(LOCALE));

View File

@ -16,7 +16,7 @@
package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import android.test.suitebuilder.annotation.Suppress;
import com.android.inputmethod.keyboard.layout.LayoutBase;
import com.android.inputmethod.keyboard.layout.Marathi;
@ -27,7 +27,7 @@ import java.util.Locale;
/**
* mr_IN: Marathi (India)/marathi
*/
@SmallTest
@Suppress
public final class TestsMarathiIN extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("mr", "IN");
private static final LayoutBase LAYOUT = new Marathi(new MarathiCustomizer(LOCALE));

View File

@ -16,7 +16,7 @@
package com.android.inputmethod.keyboard.layout.tests;
import android.test.suitebuilder.annotation.SmallTest;
import android.test.suitebuilder.annotation.Suppress;
import com.android.inputmethod.keyboard.layout.LayoutBase;
import com.android.inputmethod.keyboard.layout.Myanmar;
@ -27,7 +27,7 @@ import java.util.Locale;
/**
* my_MM: Myanmar (Myanmar)/myanmar
*/
@SmallTest
@Suppress
public final class TestsMyanmarMM extends LayoutTestsBase {
private static final Locale LOCALE = new Locale("my", "MM");
private static final LayoutBase LAYOUT = new Myanmar(new MyanmarCustomizer(LOCALE));