Skip to content

Add internet permission for espresso device gradle tests #2377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions build_extensions/axt_released_versions.bzl
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
"""Defines current released AXT versions."""

RUNNER_VERSION = "1.7.0-alpha01"
RULES_VERSION = "1.7.0-alpha01"
MONITOR_VERSION = "1.8.0-alpha01"
ESPRESSO_VERSION = "3.7.0-alpha01"
CORE_VERSION = "1.7.0-alpha01"
ESPRESSO_DEVICE_VERSION = "1.1.0-alpha01"
ANDROIDX_JUNIT_VERSION = "1.3.0-alpha01"
ANDROIDX_TRUTH_VERSION = "1.7.0-alpha01"
ORCHESTRATOR_VERSION = "1.6.0-alpha02"
SERVICES_VERSION = "1.6.0-alpha02"
RUNNER_VERSION = "1.7.0-alpha02"
RULES_VERSION = "1.7.0-alpha02"
MONITOR_VERSION = "1.8.0-alpha02"
ESPRESSO_VERSION = "3.7.0-alpha02"
CORE_VERSION = "1.7.0-alpha02"
ESPRESSO_DEVICE_VERSION = "1.1.0-alpha02"
ANDROIDX_JUNIT_VERSION = "1.3.0-alpha02"
ANDROIDX_TRUTH_VERSION = "1.7.0-alpha02"
ORCHESTRATOR_VERSION = "1.6.0-alpha03"
SERVICES_VERSION = "1.6.0-alpha03"
20 changes: 10 additions & 10 deletions build_extensions/axt_versions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ Use tools/release/validate_and_propagate_versions.sh to propagate these versions
//:axt_m2_repository and gradle-tests/settings.gradle
"""

RUNNER_VERSION = "1.7.0-alpha02"
RULES_VERSION = "1.7.0-alpha02"
MONITOR_VERSION = "1.8.0-alpha02"
ESPRESSO_VERSION = "3.7.0-alpha02"
CORE_VERSION = "1.7.0-alpha02"
ESPRESSO_DEVICE_VERSION = "1.1.0-alpha02"
ANDROIDX_JUNIT_VERSION = "1.3.0-alpha02"
ANDROIDX_TRUTH_VERSION = "1.7.0-alpha02"
ORCHESTRATOR_VERSION = "1.6.0-alpha03"
SERVICES_VERSION = "1.6.0-alpha03"
RUNNER_VERSION = "1.7.0-alpha03"
RULES_VERSION = "1.7.0-alpha03"
MONITOR_VERSION = "1.8.0-alpha03"
ESPRESSO_VERSION = "3.7.0-alpha03"
CORE_VERSION = "1.7.0-alpha03"
ESPRESSO_DEVICE_VERSION = "1.1.0-alpha03"
ANDROIDX_JUNIT_VERSION = "1.3.0-alpha03"
ANDROIDX_TRUTH_VERSION = "1.7.0-alpha03"
ORCHESTRATOR_VERSION = "1.6.0-alpha04"
SERVICES_VERSION = "1.6.0-alpha04"

# Full maven artifact strings for apks.
SERVICES_APK_ARTIFACT = "androidx.test.services:test-services:%s" % SERVICES_VERSION
Expand Down
1 change: 1 addition & 0 deletions gradle-tests/espresso/device/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET"/>

<application>
<activity
Expand Down
24 changes: 12 additions & 12 deletions gradle-tests/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ dependencyResolutionManagement {
}
versionCatalogs {
libs {
library('core', 'androidx.test:core:1.7.0-alpha02')
library('runner', 'androidx.test:runner:1.7.0-alpha02')
library('ext.junit', 'androidx.test.ext:junit:1.3.0-alpha02')
library('ext.truth', 'androidx.test.ext:truth:1.7.0-alpha02')
library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:3.7.0-alpha02')
library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.7.0-alpha02')
library('espresso.core', 'androidx.test.espresso:espresso-core:3.7.0-alpha02')
library('espresso.device', 'androidx.test.espresso:espresso-device:1.1.0-alpha02')
library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.7.0-alpha02')
library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.7.0-alpha02')
library('espresso.web', 'androidx.test.espresso:espresso-web:3.7.0-alpha02')
library('orchestrator', 'androidx.test:orchestrator:1.6.0-alpha03')
library('core', 'androidx.test:core:1.7.0-alpha03')
library('runner', 'androidx.test:runner:1.7.0-alpha03')
library('ext.junit', 'androidx.test.ext:junit:1.3.0-alpha03')
library('ext.truth', 'androidx.test.ext:truth:1.7.0-alpha03')
library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:3.7.0-alpha03')
library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.7.0-alpha03')
library('espresso.core', 'androidx.test.espresso:espresso-core:3.7.0-alpha03')
library('espresso.device', 'androidx.test.espresso:espresso-device:1.1.0-alpha03')
library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.7.0-alpha03')
library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.7.0-alpha03')
library('espresso.web', 'androidx.test.espresso:espresso-web:3.7.0-alpha03')
library('orchestrator', 'androidx.test:orchestrator:1.6.0-alpha04')

}
}
Expand Down
2 changes: 1 addition & 1 deletion kokoro/test_artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ export JAVA_HOME="$(update-java-alternatives -l | grep "1.21" | head -n 1 | tr -

cd gradle-tests
# TODO(b/406071564): remove exclusion of espresso-device tests once they work in kokoro env
./gradlew nexusOneDebugAndroidTest --stacktrace -Pandroid.testoptions.manageddevices.emulator.gpu=swiftshader_indirect -Dandroid.experimental.androidTest.numManagedDeviceShards=1 -x :espresso:device:nexusOneDebugAndroidTest
./gradlew nexusOneDebugAndroidTest --stacktrace -Pandroid.testoptions.manageddevices.emulator.gpu=swiftshader_indirect -Dandroid.experimental.androidTest.numManagedDeviceShards=1
Loading