This is an automated email from the ASF dual-hosted git repository.
GitToTheHub pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git
The following commit(s) were added to refs/heads/master by this push:
new d1df0b76 test(android): update AndroidX instrumentation libraries
(#2037)
d1df0b76 is described below
commit d1df0b7645629d3312cff0bc02355f2c395ddc30
Author: Manuel Beck <[email protected]>
AuthorDate: Tue Nov 3 12:18:00 2026 +0100
test(android): update AndroidX instrumentation libraries (#2037)
Update the instrumentation test libraries so input injection works on recent
Android versions. Espresso 3.1.1 relies on the removed
InputManager.getInstance() method and can fail before exercising Cordova.
Upgrade Espresso core and web to 3.7.0, AndroidX Test runner and rules to
1.7.0, and the JUnit extension to 1.3.0. Replace the legacy dependency
blocks with explicit declarations and migrate the seven existing test
classes to androidx.test.ext.junit.runners.AndroidJUnit4.
These changes are limited to test dependencies and runner imports.
Validated together with the instrumentation build/theme repairs and the
companion navigation-fixture fixes: all 16 instrumentation tests pass on
Android 7.1.1 (API 25), Android 16 (API 36), and Android 17 (API 37),
without
test filtering or a blanket runner timeout. Repository lint, JavaScript
unit tests, and Java unit tests also pass. The library update alone does
not repair the legacy fixture failures addressed in #2038.
Generated-by: GPT-6.1 Sol
---
test/androidx/app/build.gradle | 12 +++++-------
.../org/apache/cordova/unittests/BackButtonDispatchTest.java | 2 +-
.../apache/cordova/unittests/BackButtonMultipageTest.java | 2 +-
.../org/apache/cordova/unittests/EmbeddedWebViewTest.java | 2 +-
.../java/org/apache/cordova/unittests/ErrorUrlTest.java | 2 +-
.../java/org/apache/cordova/unittests/IFrameTest.java | 2 +-
.../cordova/unittests/MessageChannelMultipageTest.java | 2 +-
.../org/apache/cordova/unittests/StandardActivityTest.java | 2 +-
8 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/test/androidx/app/build.gradle b/test/androidx/app/build.gradle
index ac25199b..3c453059 100644
--- a/test/androidx/app/build.gradle
+++ b/test/androidx/app/build.gradle
@@ -57,13 +57,11 @@ dependencies {
testImplementation 'org.json:json:20140107'
testImplementation 'junit:junit:4.12'
- androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1', {
- exclude group: 'androidx.test.espresso', module: 'androidx.annotation'
- })
-
- androidTestImplementation('androidx.test.espresso:espresso-web:3.1.1', {
- exclude group: 'androidx.test.espresso', module: 'androidx.annotation'
- })
+ androidTestImplementation 'androidx.test:runner:1.7.0'
+ androidTestImplementation 'androidx.test:rules:1.7.0'
+ androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-web:3.7.0'
}
repositories {
google()
diff --git
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonDispatchTest.java
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonDispatchTest.java
index 2db61f50..97c19410 100644
---
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonDispatchTest.java
+++
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonDispatchTest.java
@@ -26,7 +26,7 @@ import android.view.View;
import android.webkit.WebView;
import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java
index 2319392d..38c67342 100644
---
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java
+++
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java
@@ -21,7 +21,7 @@ package org.apache.cordova.unittests;
import android.content.Intent;
import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.apache.cordova.CordovaWebView;
import org.junit.Before;
diff --git
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/EmbeddedWebViewTest.java
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/EmbeddedWebViewTest.java
index 49d2a8f8..ce6dc724 100644
---
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/EmbeddedWebViewTest.java
+++
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/EmbeddedWebViewTest.java
@@ -20,7 +20,7 @@
package org.apache.cordova.unittests;
import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/ErrorUrlTest.java
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/ErrorUrlTest.java
index 93845193..19da6fde 100644
---
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/ErrorUrlTest.java
+++
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/ErrorUrlTest.java
@@ -22,7 +22,7 @@ package org.apache.cordova.unittests;
import android.content.Intent;
import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.apache.cordova.CordovaWebView;
import org.junit.Before;
diff --git
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/IFrameTest.java
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/IFrameTest.java
index f20dcc3a..6fd05ec7 100644
---
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/IFrameTest.java
+++
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/IFrameTest.java
@@ -23,7 +23,7 @@ package org.apache.cordova.unittests;
import android.content.Intent;
import androidx.test.espresso.web.webdriver.Locator;
import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.apache.cordova.CordovaWebView;
import org.junit.Before;
diff --git
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/MessageChannelMultipageTest.java
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/MessageChannelMultipageTest.java
index 527b0d98..8009717e 100644
---
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/MessageChannelMultipageTest.java
+++
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/MessageChannelMultipageTest.java
@@ -21,7 +21,7 @@ package org.apache.cordova.unittests;
import android.content.Intent;
import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.apache.cordova.CallbackContext;
import org.apache.cordova.CordovaWebView;
diff --git
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/StandardActivityTest.java
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/StandardActivityTest.java
index a0f3ff9f..86cb4107 100644
---
a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/StandardActivityTest.java
+++
b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/StandardActivityTest.java
@@ -22,7 +22,7 @@ package org.apache.cordova.unittests;
import android.content.Intent;
import android.graphics.Color;
import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import android.view.View;
import android.widget.LinearLayout;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
