diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-05-21 04:42:53 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-21 04:42:53 +0000 |
| commit | 2f3db0f38102f05d4c42bb39936e3b5fe97f5751 (patch) | |
| tree | 44b8a72b0dc0b1696d5d0443c65af382e794303e | |
| parent | 5753ee59af7f5dcf1e3d61faffdc408d358853ff (diff) | |
| parent | c18b1c42f31ed81e072373dbbff25279cf4da94e (diff) | |
| download | latinime-2f3db0f38102f05d4c42bb39936e3b5fe97f5751.tar.gz latinime-2f3db0f38102f05d4c42bb39936e3b5fe97f5751.tar.xz latinime-2f3db0f38102f05d4c42bb39936e3b5fe97f5751.zip | |
am c18b1c42: Merge "Fix subtype count in unit test"
* commit 'c18b1c42f31ed81e072373dbbff25279cf4da94e':
Fix subtype count in unit test
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java index 13955b8fc..26402f8c7 100644 --- a/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java +++ b/tests/src/com/android/inputmethod/keyboard/KeyboardLayoutSetSubtypesCountTests.java @@ -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; diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindiCompact.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindiCompact.java index 2e676df26..6380da524 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindiCompact.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsHindiCompact.java @@ -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)); diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java index b937629b0..d45d99d10 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMarathiIN.java @@ -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)); diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMyanmarMM.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMyanmarMM.java index e6d3b3b92..a0bd50c9a 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMyanmarMM.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsMyanmarMM.java @@ -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)); |