Conversation
There was a problem hiding this comment.
Pull request overview
This PR aims to fix Android instrumentation test failures/regressions introduced by recent dependency/tooling changes, primarily around Mockito behavior on API 28+ and large instrumentation result bundles.
Changes:
- Updates Mockito-related Android test dependencies (Mockito version bump for SDK modules, adds dexmaker-mockito-inline, pins objenesis, disables test coverage/Jacoco).
- Adds Android Test Orchestrator execution for the
android-sdkmodule and updates CI emulator matrix. - Small test adjustments to improve stability/compatibility (timeouts, Mockito API updates, safer teardown, mocking interface instead of impl).
Reviewed changes
Copilot reviewed 18 out of 19 changed files in this pull request and generated 9 comments.
Show a summary per file
| File | Description |
|---|---|
build.gradle |
Bumps java_core_ver and mockito_ver_sdk_module. |
gradle.properties |
Changes fallback Maven/version value. |
android-sdk/build.gradle |
Adds orchestrator execution + deps, disables coverage, adds packaging pickFirsts, updates Android test deps. |
shared/build.gradle |
Disables coverage, adds packaging pickFirsts, updates Android test deps (dexmaker/objenesis). |
datafile-handler/build.gradle |
Disables coverage, adds packaging pickFirsts, updates Android test deps (dexmaker/objenesis). |
event-handler/build.gradle |
Disables coverage, adds packaging pickFirsts, updates Android test deps (dexmaker/objenesis). |
odp/build.gradle |
Disables coverage, adds packaging pickFirsts, updates Android test deps (dexmaker/objenesis). |
user-profile/build.gradle |
Disables coverage, adds packaging pickFirsts, updates Android test deps (dexmaker/objenesis). |
android-sdk/src/androidTest/resources/mockito-extensions/org.mockito.plugins.MockMaker |
Adds explicit Mockito MockMaker extension. |
shared/src/androidTest/resources/mockito-extensions/org.mockito.plugins.MockMaker |
Adds explicit Mockito MockMaker extension. |
datafile-handler/src/androidTest/resources/mockito-extensions/org.mockito.plugins.MockMaker |
Adds explicit Mockito MockMaker extension. |
event-handler/src/androidTest/resources/mockito-extensions/org.mockito.plugins.MockMaker |
Adds explicit Mockito MockMaker extension. |
odp/src/androidTest/resources/mockito-extensions/org.mockito.plugins.MockMaker |
Adds explicit Mockito MockMaker extension. |
user-profile/src/androidTest/resources/mockito-extensions/org.mockito.plugins.MockMaker |
Adds explicit Mockito MockMaker extension. |
android-sdk/src/androidTest/java/.../OptimizelyManagerTest.java |
Increases latch await timeouts for stability. |
android-sdk/src/androidTest/java/.../OptimizelyClientTest.java |
Updates deprecated Mockito interaction assertion API. |
android-sdk/src/androidTest/java/.../ODPIntegrationTest.java |
Mocks ODPApiManager interface instead of impl. |
datafile-handler/src/androidTest/java/.../BackgroundWatchersCacheTest.java |
Avoids NPE in teardown when setup fails. |
.github/workflows/android.yml |
Updates emulator API matrix and targets for CI. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix instrumentation tests on Android API 28+
Problem
TransactionTooLargeExceptioncrashed theandroid-sdktest process when 262+ test results were bundled into a single IPC parcel exceeding Android's 1MB limitMockito cannot mock this classfailures on API 28+ because the defaultmockito-androidmock maker uses a hidden/restricted API (BaseDexClassLoader#addDexPath()) blocked since API 28mockito_ver_sdk_modulefrom3.6.28→2.28.2, which is too old to work withdexmaker-mockito-inlineChanges
mockito_ver_sdk_moduleback to3.6.28dexmaker-mockito-inline:2.28.3to all 6 modules — uses JVMTI bytecode rewriting instead of restricted APIs, works on API 28+android-sdkmodule — runs each test class in its own process, preventing parcel overflow as the test suite growsobjenesis:2.6to maintain API 21 compatibility (objenesis 3.x requires API 26+)testCoverageEnabled falsein all modules to avoid JVMTI agent conflict between Jacoco and dexmakerTest plan
Existing tests will cover the changes.
Issues