From 74f259a74ee600d742072361d074493f892eb1b7 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Fri, 14 Mar 2014 15:53:26 +0900
Subject: [PATCH] Add moreKeys helper method for unit test

Bug: 13017434
Change-Id: Icfaa4093686e2d8dec00d5acce894bfc6a2474b7
---
 .../keyboard/layout/expected/AbstractLayoutBase.java        | 6 ++++++
 .../inputmethod/keyboard/layout/tests/LayoutTestsBase.java  | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java b/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
index d8d66c236..066bcc0be 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
@@ -76,6 +76,12 @@ public abstract class AbstractLayoutBase {
         return ExpectedKey.newInstance(label, code);
     }
 
+    // Helper method to create {@link ExpectedKey} array by joining {@link ExpectedKey},
+    // {@link ExpectedKey} array, and {@link String}.
+    public static ExpectedKey[] moreKeys(final Object ... moreKeys) {
+        return joinKeys(moreKeys);
+    }
+
     // Helper method to create {@link ExpectedKey} array by joining {@link ExpectedKey},
     // {@link ExpectedKey} array, and {@link String}.
     public static ExpectedKey[] joinKeys(final Object ... keys) {
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
index b9678444b..9c9f74890 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/LayoutTestsBase.java
@@ -83,6 +83,12 @@ abstract class LayoutTestsBase extends KeyboardLayoutSetTestsBase {
         return AbstractLayoutBase.moreKey(label, outputText);
     }
 
+    // Helper method to create {@link ExpectedKey} array by joining {@link ExpectedKey},
+    // {@link ExpectedKey} array, and {@link String}.
+    static ExpectedKey[] moreKeys(final Object ... moreKeys) {
+        return AbstractLayoutBase.joinKeys(moreKeys);
+    }
+
     // Helper method to create {@link ExpectedKey} array by joining {@link ExpectedKey},
     // {@link ExpectedKey} array, and {@link String}.
     static ExpectedKey[] joinKeys(final Object ... keys) {