Commit Graph

17 Commits (2cafc09ed6e8e43286ae2eb17e3def46ddb3825c)

Author SHA1 Message Date
Paul Duffin 8a45a970ab Add android.test.base/stubs dependency
In preparation for the removal of the non-junit classes in the
android.test.base library from the android.jar this adds a dependency
on android.test.base/stubs to ensure this code will continue to
compile.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    LatinIMETests's will need them in order to compile once its classes
    are removed from the current SDK on which it currently depends.

Bug: 30188076
Test: make dist
Change-Id: I9f2244d4b5711620dc02dd24dc407807d726480e
2017-12-15 07:22:38 +00:00
Paul Duffin 2ccdf50ae2 Flatten dependency hierarchy of legacy-android-test
Previous changes statically included legacy-android-test in preparation
for removing android.test.* and junit.* classes from the android.jar.
Unfortunately, that lead to duplicate classes between APKs and the
bootclasspath which caused build problems (Proguard) and also runtime
problems (when targeting and running on older releases).

Switching from statically including the classes to using the runtime
libraries cannot be done in one step because legacy-android-test is
statically included in libraries which are used in many APKs and so
removing it from those libraries requires that all APKs be updated at
once. Doing that atomically across dozens of projects is not practical.

This change modifies APKS that statically include the
legacy-android-test library indirectly.

* If the APK manifest uses the android.test.runner library then the APK
  is modified to stop statically including legacy-android-test and
  instead build against android.test.base/mock/runner libraries instead.

* Otherwise, the APK statically includes legacy-android-test.

Also, any libraries that statically include are modified to stop
statically including it and if it has source dependencies on the classes
is changed to build against the android.test.base/mock/runner libraries.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
    Replaced 'legacy-android-test' with 'android.test.runner.stubs' in
    LOCAL_JAVA_LIBRARIES because LatinIMETests's source depends on its
    classes. The classes do not need to be statically included because
    the classes will be provided by the runtime, either from the
    default bootclasspath or from the android.test.runner library that
    LatinIMETests specifies in its manifest.

Bug: 30188076
Test: make checkbuild
Change-Id: I3c70889b35d402626f79c986771b9c2ea8823b8a
2017-12-05 18:36:57 +00:00
Paul Duffin 097130d198 Use a.t.mock.stubs instead of a.t.mock.sdk
Remove dependencies on android.test.mock.sdk as it is a duplicate of
android.test.mock.stubs and will be removed.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
    Replaced 'android.test.mock.sdk' with 'android.test.mock.stubs' in
    LOCAL_JAVA_LIBRARIES because android.test.mock.sdk has been
    deprecated.

Bug: 30188076
Test: make checkbuild
Change-Id: I50a306c3bb80a9d7cdf2d19744734f304abf3bd1
2017-11-16 12:57:31 +00:00
Paul Duffin 6767e05934 Fix dependencies of packages that target earlier releases
A previous change added legacy-android-test as a static dependency to
all packages that build against the current, test_current or
system_current and failed to compile when the junit and android.test
classes were removed from the API. Unfortunately, those changes did not
take into account that some of those packages target earlier API
versions and so will always have the classes available at runtime.

This change replaces those static dependencies with dynamic dependencies
for any package that targets an earlier API version. The file changes
were made automatically by a tool that constructed and then analyzed a
full dependency graph of all the Android Java modules. The individual
changes were checked manually to ensure that the changes matched the
intent. The affected modules were built against an API with the junit
and android.test classes removed. Any issues found during this process
resulted in either the tool being updated to address the issue or a
separate change being made to fix an existing problem with the build. A
sample of the affected packages were run to ensure that they worked as
expected at runtime; no issues were found during testing.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* tests/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because LatinIMETests's manifest file (AndroidManifest.xml) targets
    API level 21 and dynamically includes the android.test.runner
    library at runtime so there is no point in statically including the
    classes.

    Added 'android.test.mock.sdk' and 'legacy-android-test' to
    LOCAL_JAVA_LIBRARIES because module LatinIMETests builds against
    'LOCAL_SDK_VERSION := current' and uses classes from packages
    android.test and android.test.mock (possibly indirectly) so will no
    longer compile once they are removed from the API.

    Dependency 'android.test.mock.sdk' is used instead of
    'android.test.mock' because module LatinIMETests builds against the
    API not internal jars and so should use libraries that build
    against the API not internal jars.

    A future change will replace the dependency on
    'legacy-android-test', which builds against the internal jars with
    a dependency on 'android.legacy.test' which will build against the
    API.

Bug: 30188076
Test: make checkbuild and ran a sample of tests
Change-Id: Icab8a4c4801536f112e29dfd2dc66be8b90b811d
2017-06-13 16:13:10 +01:00
Paul Duffin 381c38a127 Prepare for removal of junit and android.test classes from Android API (step 1)
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.

Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.

Bug: 30188076
Test: make checkbuild
Change-Id: Icf844999082db141cffcb099aa4004afc7a7c749
Merged-In: I743f9e20e1e60836ceba9b9051fa17835deba3a2
2017-05-10 09:45:07 +01:00
Guang Zhu d8539fbb9b Avoid JUnit4 collision in android-support-test, mockito-target
Bug: 31072145
Test: make droid checkbuild

Change-Id: I507b476694f88cc960804904feff330e6f9358c4
2016-08-25 19:43:11 +00:00
Ken Wakasa d158c43070 Just tiny cosmetic fixes in makefile
Change-Id: I470ba8a03d70aa520311c50f5d21979f476798b7
2014-11-11 03:26:38 +09:00
Ken Wakasa 88a92103bc Fix unit test failure due to IllegalAccessError
java.lang.IllegalAccessError: Class ref in pre-verified class resolved
to unexpected implementation because of latinime-common reference added
two times.

Change-Id: I4ce1185c10b9a217022e830b02aec4f1ea50f2eb
2014-10-24 15:24:30 +09:00
Ken Wakasa 54a1b8ec54 Add latinime-common local lib
This is just a placeholder in this CL. It will be shared by LatinIME,
dicttool, and tests.

Change-Id: I6fb3516a5061555f6f24b29141c2871d2319b023
2014-10-22 19:26:21 +09:00
Adrian Velicu 329dbe2239 Switching to AndroidJUnitRunner instrumentation
Bug: 16864527
Change-Id: I8a79a78f24cbc52935743311f5f0dceeb780358f
2014-09-18 19:57:18 +09:00
Tadashi G. Takaoka 53da9b1208 Remove android.test.runner from tests app
Bug: 8132168
Change-Id: I7ed84de27a4436539fca0ca4f0efb5e6448480cb
2013-02-05 16:07:31 -08:00
Ken Wakasa d5e35acffb Reorganize LatinIME native build directory structure. Now it got NDK friendly.
Change-Id: I0f62ce8a6a4d2b6134db698f8b8d0576616e524d
2011-12-13 21:16:20 +09:00
Tadashi G. Takaoka 5cb4eaeec0 Reorganize suggestion related unit test
Bug: 3414081
Change-Id: Ie98c7935b25d17f1547955f8fb6ba2c5c1edb997
2011-02-14 12:00:42 +09:00
Ken Wakasa debd74c678 Prepare for master merge
- Rename the jni library name
- Revert the local cert
- LatinIme2Google -> LatinIME
Please note that we'll use the new package name: com.google.android.inputmethod.latin

Change-Id: Ibbab07e8102ade5a93660c0723cd86f600c14a7d
2010-07-20 16:37:12 +09:00
satok 928ebfeaf8 Add aggressive cancellation for auto suggestion
- Add ring buffer
- Count separator for auto suggestion
- Add a test for ring buffer

Change-Id: Id4a0aa00ceb1b055b8fc96c45e100d318cceb2ab
2010-06-02 12:59:35 +09:00
Ken Wakasa a25324fbe1 Change the package name to override the current LatinIME.
Change-Id: I9fa0740ddd47cb3a4ee13bc38e82957b7cc07f13
2010-05-17 18:24:02 +09:00
Amith Yamasani e4e1130d00 Tests and some new constructors to help in testing.
Added tests for the dictionary lookup and correction logic on the primary dictionary.
This exercises part of the Suggest class and the native dictionary lookup code.
2010-05-07 13:40:20 -07:00