From b12c2af32e09624e1298e0109441b0f4d74b74dd Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 15 Apr 2013 09:48:54 +0900
Subject: [PATCH] Tighten unit test condition of MoreKeysKeyboardBuilder
Bug: 8601979
Change-Id: Icf584f3b35adce69cc3dfc46f3aacfef05e5dd2a
---
.../keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java | 8 ++++----
.../keyboard/MoreKeysKeyboardBuilderTests.java | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java
index 8fef1de2a8..6bb5adab57 100644
--- a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java
+++ b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderFixedOrderTests.java
@@ -43,10 +43,10 @@ public class MoreKeysKeyboardBuilderFixedOrderTests extends AndroidTestCase {
super.setUp();
}
- private static MoreKeysKeyboardParams createParams(int numKeys, int columnNum,
- int coordXInParnet) {
+ private static MoreKeysKeyboardParams createParams(final int numKeys, final int columnNum,
+ final int coordXInParent) {
final MoreKeysKeyboardParams params = new MoreKeysKeyboardParams();
- params.setParameters(numKeys, columnNum, WIDTH, HEIGHT, coordXInParnet, KEYBOARD_WIDTH,
+ params.setParameters(numKeys, columnNum, WIDTH, HEIGHT, coordXInParent, KEYBOARD_WIDTH,
/* isFixedOrderColumn */true, /* dividerWidth */0);
return params;
}
@@ -55,7 +55,7 @@ public class MoreKeysKeyboardBuilderFixedOrderTests extends AndroidTestCase {
MoreKeysKeyboardParams params = null;
try {
final int fixColumns = KEYBOARD_WIDTH / WIDTH;
- params = createParams(10, fixColumns + 1, HEIGHT);
+ params = createParams(fixColumns + 1, fixColumns + 1, HEIGHT);
fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// Too small keyboard to hold more keys keyboard.
diff --git a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java
index ee4c72a85c..99da4812ad 100644
--- a/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java
+++ b/tests/src/com/android/inputmethod/keyboard/MoreKeysKeyboardBuilderTests.java
@@ -43,10 +43,10 @@ public class MoreKeysKeyboardBuilderTests extends AndroidTestCase {
super.setUp();
}
- private static MoreKeysKeyboardParams createParams(int numKeys, int maxColumns,
- int coordXInParnet) {
+ private static MoreKeysKeyboardParams createParams(final int numKeys, final int maxColumns,
+ final int coordXInParent) {
final MoreKeysKeyboardParams params = new MoreKeysKeyboardParams();
- params.setParameters(numKeys, maxColumns, WIDTH, HEIGHT, coordXInParnet, KEYBOARD_WIDTH,
+ params.setParameters(numKeys, maxColumns, WIDTH, HEIGHT, coordXInParent, KEYBOARD_WIDTH,
/* isFixedOrderColumn */false, /* dividerWidth */0);
return params;
}
@@ -55,7 +55,7 @@ public class MoreKeysKeyboardBuilderTests extends AndroidTestCase {
MoreKeysKeyboardParams params = null;
try {
final int maxColumns = KEYBOARD_WIDTH / WIDTH;
- params = createParams(10, maxColumns + 1, HEIGHT);
+ params = createParams(maxColumns + 1, maxColumns + 1, HEIGHT);
fail("Should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {
// Too small keyboard to hold more keys keyboard.
--
GitLab