Merge lp:~kejun-zhou/lava-android-test/ime into lp:lava-android-test

[Kejun ZHOU]

This test is for checking which input methods are running in the Android system. The test runs the tool /system/bin/ime to show all the input method services.

[Yongqin Liu (liuyq0307)]

68 + echo "ime = pass"

this line seems not match the pattern defined in
43 +PATTERN = "^\s*(?P<test_case_id>\w+)=(?P<result>\w+)\s*$"

I think you can change to [echo "ime=pass"]

[Yongqin Liu (liuyq0307)]

also, you should modify MANIFEST.in file

review: Needs Fixing

[Le Chi Thu (le-chi-thu)]

Please describe the purpose of this test and what the test perform. Which input is required and expect conditions /outputs to detect when the test is pass or not.

echo "ime=unexist" should be echo "ime=fail"

review: Needs Fixing

[Le Chi Thu (le-chi-thu)]

Please describe the purpose of this test and what the test perform. Which input is required and expect conditions /outputs to detect when the test is pass or not.

review: Needs Fixing

[Alexander Sack (asac)]

Kenjun resubmitted, can someone review?

[Alexander Sack (asac)]

sorry... wrong merge request... ignore my previous comment here.

[Kejun ZHOU (kejun-zhou)]

The MANIFEST.in had been modify at 2012-04-26 03:16:07 UTC

include lava_android_test/test_definitions/gatortest/*
+include lava_android_test/test_definitions/ime/*

review: Needs Resubmitting

[Yongqin Liu (liuyq0307)]

By this line
51 +PATTERN = "^\s*(?P<test_case_id>\w+)=(?P<result>\w+)\s*$"
many lines of the output will be matched.
Because the output of "/system/bin/ime list -a" like below:

com.android.inputmethod.latin/.LatinIME:
  mId=com.android.inputmethod.latin/.LatinIME mSettingsActivityName=com.android.inputmethod.latin.Settings
  mIsDefaultResId=0x7f080000
  Service:
    priority=0 preferredOrder=0 match=0x108000 specificIndex=-1 isDefault=false
    ServiceInfo:
      name=com.android.inputmethod.latin.LatinIME
      packageName=com.android.inputmethod.latin
      labelRes=0x7f0b0075 nonLocalizedLabel=null icon=0x0
      enabled=true exported=true processName=com.android.inputmethod.latin
      permission=android.permission.BIND_INPUT_METHOD
      flags=0x0
jp.co.omronsoft.openwnn/.OpenWnnJAJP:
  mId=jp.co.omronsoft.openwnn/.OpenWnnJAJP mSettingsActivityName=jp.co.omronsoft.openwnn.OpenWnnControlPanelJAJP
  mIsDefaultResId=0x0
  Service:
    priority=0 preferredOrder=0 match=0x108000 specificIndex=-1 isDefault=false
    ServiceInfo:
      name=jp.co.omronsoft.openwnn.OpenWnnJAJP
      packageName=jp.co.omronsoft.openwnn
      labelRes=0x0 nonLocalizedLabel=Japanese IME icon=0x0
      enabled=true exported=true processName=jp.co.omronsoft.openwnn
      permission=android.permission.BIND_INPUT_METHOD
      flags=0x0
com.android.inputmethod.pinyin/.PinyinIME:
  mId=com.android.inputmethod.pinyin/.PinyinIME mSettingsActivityName=com.android.inputmethod.pinyin.SettingsActivity
  mIsDefaultResId=0x7f060000
  Service:
    priority=0 preferredOrder=0 match=0x108000 specificIndex=-1 isDefault=false
    ServiceInfo:
      name=com.android.inputmethod.pinyin.PinyinIME
      packageName=com.android.inputmethod.pinyin
      labelRes=0x7f090000 nonLocalizedLabel=null icon=0x0
      enabled=true exported=true processName=com.android.inputmethod.pinyin
      permission=android.permission.BIND_INPUT_METHOD
      flags=0x0
$

Please confirm what is you want.

review: Needs Fixing

[lp:~kejun-zhou/lava-android-test/ime]

152. By Ke Jun ZHOU <dp583@stebjsxu0119> on 2012-05-25

Change imp.py to:
PATTERN = "^\s*(?P<test_case_id>ime)=(?P<result>\w+)\s*$"

[Yongqin Liu (liuyq0307)]

Except the conflict in 'MANIFEST.in'，
others seems ok for me.
Will resolve the conflict during merge

review: Approve

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2012-05-24 11:34:49 +0000
+++ MANIFEST.in	2012-05-25 09:08:17 +0000
@@ -7,4 +7,8 @@
 include lava_android_test/test_definitions/cts/*
 include lava_android_test/test_definitions/glmark2/*
 include lava_android_test/test_definitions/gatortest/*
+<<<<<<< TREE
 include lava_android_test/test_definitions/usbhardware/*
+=======
+include lava_android_test/test_definitions/ime/*
+>>>>>>> MERGE-SOURCE
 
=== added directory 'lava_android_test/test_definitions/ime'
=== added file 'lava_android_test/test_definitions/ime.py'
--- lava_android_test/test_definitions/ime.py	1970-01-01 00:00:00 +0000
+++ lava_android_test/test_definitions/ime.py	2012-05-25 09:08:17 +0000
@@ -0,0 +1,47 @@
+# Copyright (c) 2011 Linaro
+
+# Author: Linaro Validation Team <[e-mail]>
+#
+# This file is part of LAVA Android Test.
+#
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import os
+import lava_android_test.testdef
+from lava_android_test.config import get_config
+
+test_name = 'ime'
+config = get_config()
+curdir = os.path.realpath(os.path.dirname(__file__))
+test_sh_name = 'ime_test.sh'
+test_sh_path = os.path.join(curdir, test_name, test_sh_name)
+test_sh_android_path = os.path.join(config.installdir_android,
+                                    test_name, test_sh_name)
+
+INSTALL_STEPS_ADB_PRE = ['push %s %s ' % (test_sh_path,
+                                          test_sh_android_path),
+                          'shell chmod 777 %s' % test_sh_android_path]
+
+ADB_SHELL_STEPS = [test_sh_android_path]
+PATTERN = "^\s*(?P<test_case_id>ime)=(?P<result>\w+)\s*$"
+
+inst = lava_android_test.testdef.AndroidTestInstaller(
+                                steps_adb_pre=INSTALL_STEPS_ADB_PRE)
+run = lava_android_test.testdef.AndroidTestRunner(
+                                    adbshell_steps=ADB_SHELL_STEPS)
+parser = lava_android_test.testdef.AndroidTestParser(PATTERN)
+testobj = lava_android_test.testdef.AndroidTest(testname=test_name,
+                                    installer=inst,
+                                    runner=run,
+                                    parser=parser)
 
=== added file 'lava_android_test/test_definitions/ime/ime_test.sh'
--- lava_android_test/test_definitions/ime/ime_test.sh	1970-01-01 00:00:00 +0000
+++ lava_android_test/test_definitions/ime/ime_test.sh	2012-05-25 09:08:17 +0000
@@ -0,0 +1,13 @@
+#!/system/bin/sh
+
+test_func(){
+    if [ ! -f /system/bin/ime ]; then
+         echo "ime=fail"
+         exit
+    fi  
+
+    /system/bin/ime list -a
+    echo "ime=pass"
+}
+
+test_func