Master

.github/workflows/composescreenshot.yml

@@ -0,0 +1,24 @@
+# Workflow name
+name: Compose Preview Screenshot
+on:
+  # When it will be triggered
+  # And in which branch
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set Up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu' # See 'Supported distributions' for available options
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Build project and run screenshot tests
+        working-directory: ./ui/PreviewScreenshot
+        run: ./gradlew validateDebugScreenshotTest

.github/workflows/gradle-wrapper-validation.yml

@@ -0,0 +1,16 @@
+name: Validate Gradle Wrapper
+
+on:
+  push:
+    branches: [ main ]
+
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  validation:
+    name: Validation
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1

.github/workflows/test-all.yml

@@ -0,0 +1,43 @@
+# Workflow name
+name: Build + Test all
+on:
+  # When it will be triggered
+  # And in which branch
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+          ls /dev/kvm
+
+      - name: Set Up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu' # See 'Supported distributions' for available options
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Build project and run local and device tests
+        run: ./test_all.sh
+
+      - name: Upload test reports
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-reports
+          path: '**/app/build/reports/androidTests'

.gitignore

@@ -8,3 +8,4 @@ build
 .settings/	
 .classpath
 bazel-*
+.DS_Store

BUILD.bazel

@@ -46,5 +46,9 @@ platform(
             name: "dockerPrivileged"
             value: "true"
         }
+        properties: {
+            name: "gceMachineType"
+            value: "n1-standard-2"
+        }
 """,
 )

README.md

@@ -5,46 +5,48 @@ A collection of samples demonstrating different frameworks and techniques for au
 
 ### Espresso Samples
 
-**[BasicSample](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/BasicSample)** - Basic Espresso sample
+**[BasicSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/BasicSample)** - Basic Espresso sample
 
-**[CustomMatcherSample](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/CustomMatcherSample)** - Shows how to extend Espresso to match the *hint* property of an EditText
+**[CustomMatcherSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/CustomMatcherSample)** - Shows how to extend Espresso to match the *hint* property of an EditText
 
-**[DataAdapterSample](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/DataAdapterSample)** - Showcases the `onData()` entry point for Espresso, for lists and AdapterViews
+**[DataAdapterSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/DataAdapterSample)** - Showcases the `onData()` entry point for Espresso, for lists and AdapterViews
 
-**[FragmentScenarioSample](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/FragmentScenarioSample)** - Basic usage of `FragmentScenario` with Espresso. 
+**[FragmentScenarioSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/FragmentScenarioSample)** - Basic usage of `FragmentScenario` with Espresso.
 
-**[IdlingResourceSample](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/IdlingResourceSample)** - Synchronization with background jobs
+**[IdlingResourceSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/IdlingResourceSample)** - Synchronization with background jobs
 
-**[IntentsBasicSample](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/IntentsBasicSample)** - Basic usage of `intended()` and `intending()`
+**[IntentsBasicSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/IntentsBasicSample)** - Basic usage of `intended()` and `intending()`
 
-**[IntentsAdvancedSample](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/IntentsAdvancedSample)** - Simulates a user fetching a bitmap using the camera
+**[IntentsAdvancedSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/IntentsAdvancedSample)** - Simulates a user fetching a bitmap using the camera
 
-**[MultiWindowSample](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/MultiWindowSample)** - Shows how to point Espresso to different windows
+**[MultiWindowSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/MultiWindowSample)** - Shows how to point Espresso to different windows
 
-**[RecyclerViewSample](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/RecyclerViewSample)** - RecyclerView actions for Espresso
+**[RecyclerViewSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/RecyclerViewSample)** - RecyclerView actions for Espresso
 
-**[WebBasicSample](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/WebBasicSample)** - Use Espresso-web to interact with WebViews
+**[ScreenshotSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/ScreenshotSample)** - Screenshot capturing and saving using Espresso and androidx.test.core APIs
 
-**[BasicSampleBundled](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/BasicSampleBundled)** - Basic sample for Eclipse and other IDEs
+**[WebBasicSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/WebBasicSample)** - Use Espresso-web to interact with WebViews
 
-**[MultiProcessSample](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/MultiProcessSample)** - Showcases how to use multiprocess Espresso.
+**[BasicSampleBundled](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/BasicSampleBundled)** - Basic sample for Eclipse and other IDEs
+
+**[MultiProcessSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/MultiProcessSample)** - Showcases how to use multiprocess Espresso.
 ### UiAutomator Sample
 
-**[BasicSample](https://github.com/googlesamples/android-testing/tree/master/ui/uiautomator/BasicSample)** - Basic UI Automator sample
+**[BasicSample](https://github.com/googlesamples/android-testing/tree/main/ui/uiautomator/BasicSample)** - Basic UI Automator sample
 
 ### AndroidJUnitRunner Sample
 
-**[AndroidJunitRunnerSample](https://github.com/googlesamples/android-testing/tree/master/runner/AndroidJunitRunnerSample)** - Showcases test annotations, parameterized tests and testsuite creation
+**[AndroidJunitRunnerSample](https://github.com/googlesamples/android-testing/tree/main/runner/AndroidJunitRunnerSample)** - Showcases test annotations, parameterized tests and testsuite creation
 
 ### JUnit4 Rules Sample
 
 **All previous samples use ActivityTestRule or IntentsTestRule but there's one specific to ServiceTestRule:
 
-**[BasicSample](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/BasicSample)** - Simple usage of `ActivityTestRule`
+**[BasicSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/BasicSample)** - Simple usage of `ActivityTestRule`
 
-**[IntentsBasicSample](https://github.com/googlesamples/android-testing/blob/master/ui/espresso/IntentsBasicSample)** - Simple usage of `IntentsTestRule`
+**[IntentsBasicSample](https://github.com/googlesamples/android-testing/blob/main/ui/espresso/IntentsBasicSample)** - Simple usage of `IntentsTestRule`
 
-**[ServiceTestRuleSample](https://github.com/googlesamples/android-testing/tree/master/integration/ServiceTestRuleSample)** - Simple usage of `ServiceTestRule`
+**[ServiceTestRuleSample](https://github.com/googlesamples/android-testing/tree/main/integration/ServiceTestRuleSample)** - Simple usage of `ServiceTestRule`
 
 Prerequisites
 --------------

WORKSPACE

@@ -2,12 +2,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")
 
 # Set the path to your local SDK installation, or use the ANDROID_HOME environment variable.
-android_sdk_repository(
-    name = "androidsdk",
-    api_level = 28,
-    build_tools_version = "28.0.2",
-    # path = "/path/to/sdk",
-)
+android_sdk_repository(name = "androidsdk")
 
 # Required for running emulator tests on RBE on Bazel CI
 android_ndk_repository(name = "androidndk")

bazelci/buildkite-pipeline.yml

@@ -1,24 +1,95 @@
 # https://github.com/googlesamples/android-testing#experimental-bazel-support
 ---
 platforms:
-  ubuntu1604:
-    build_targets:
-    - "//..."
-    test_flags:
-    - "--config=remote_android"
-    - "--flaky_test_attempts=3"
-    test_targets:
-    - "//..."
-    - "-//ui/espresso/AccessibilitySample/..."
   ubuntu1804:
     build_targets:
     - "//..."
+    - "-//ui/uiautomator/BasicSample:BasicSampleInstrumentationTest_23_x86" # BazelCI does not have Android Emulator
+    - "-//ui/uiautomator/BasicSample:BasicSampleInstrumentationTest_22_x86"
+    - "-//ui/uiautomator/BasicSample:BasicSampleInstrumentationTest_21_x86"
+    - "-//ui/uiautomator/BasicSample:BasicSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/RecyclerViewSample:RecyclerViewSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/RecyclerViewSample:RecyclerViewSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/RecyclerViewSample:RecyclerViewSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/RecyclerViewSample:RecyclerViewSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/MultiWindowSample:MultiWindowSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/MultiWindowSample:MultiWindowSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/MultiWindowSample:MultiWindowSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/MultiWindowSample:MultiWindowSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/IntentsBasicSample:IntentsBasicSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/IntentsBasicSample:IntentsBasicSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/IntentsBasicSample:IntentsBasicSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/IntentsBasicSample:IntentsBasicSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/IntentsAdvancedSample:IntentsAdvancedSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/IntentsAdvancedSample:IntentsAdvancedSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/IntentsAdvancedSample:IntentsAdvancedSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/IntentsAdvancedSample:IntentsAdvancedSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/IdlingResourceSample:IdlingResourceSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/IdlingResourceSample:IdlingResourceSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/IdlingResourceSample:IdlingResourceSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/IdlingResourceSample:IdlingResourceSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/DataAdapterSample:DataAdapterSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/DataAdapterSample:DataAdapterSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/DataAdapterSample:DataAdapterSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/DataAdapterSample:DataAdapterSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/CustomMatcherSample:CustomMatcherSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/CustomMatcherSample:CustomMatcherSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/CustomMatcherSample:CustomMatcherSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/CustomMatcherSample:CustomMatcherSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/BasicSample:BasicSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/BasicSample:BasicSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/BasicSample:BasicSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/BasicSample:BasicSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/AccessibilitySample:BasicSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/AccessibilitySample:BasicSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/AccessibilitySample:BasicSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/AccessibilitySample:BasicSampleInstrumentationTest_19_x86"
     test_flags:
     - "--config=remote_android"
     - "--flaky_test_attempts=3"
     test_targets:
     - "//..."
     - "-//ui/espresso/AccessibilitySample/..."
+    - "-//ui/uiautomator/BasicSample:BasicSampleInstrumentationTest_23_x86" # BazelCI does not have Android Emulator
+    - "-//ui/uiautomator/BasicSample:BasicSampleInstrumentationTest_22_x86"
+    - "-//ui/uiautomator/BasicSample:BasicSampleInstrumentationTest_21_x86"
+    - "-//ui/uiautomator/BasicSample:BasicSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/RecyclerViewSample:RecyclerViewSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/RecyclerViewSample:RecyclerViewSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/RecyclerViewSample:RecyclerViewSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/RecyclerViewSample:RecyclerViewSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/MultiWindowSample:MultiWindowSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/MultiWindowSample:MultiWindowSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/MultiWindowSample:MultiWindowSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/MultiWindowSample:MultiWindowSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/IntentsBasicSample:IntentsBasicSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/IntentsBasicSample:IntentsBasicSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/IntentsBasicSample:IntentsBasicSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/IntentsBasicSample:IntentsBasicSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/IntentsAdvancedSample:IntentsAdvancedSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/IntentsAdvancedSample:IntentsAdvancedSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/IntentsAdvancedSample:IntentsAdvancedSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/IntentsAdvancedSample:IntentsAdvancedSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/IdlingResourceSample:IdlingResourceSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/IdlingResourceSample:IdlingResourceSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/IdlingResourceSample:IdlingResourceSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/IdlingResourceSample:IdlingResourceSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/DataAdapterSample:DataAdapterSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/DataAdapterSample:DataAdapterSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/DataAdapterSample:DataAdapterSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/DataAdapterSample:DataAdapterSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/CustomMatcherSample:CustomMatcherSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/CustomMatcherSample:CustomMatcherSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/CustomMatcherSample:CustomMatcherSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/CustomMatcherSample:CustomMatcherSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/BasicSample:BasicSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/BasicSample:BasicSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/BasicSample:BasicSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/BasicSample:BasicSampleInstrumentationTest_19_x86"
+    - "-//ui/espresso/AccessibilitySample:BasicSampleInstrumentationTest_23_x86"
+    - "-//ui/espresso/AccessibilitySample:BasicSampleInstrumentationTest_22_x86"
+    - "-//ui/espresso/AccessibilitySample:BasicSampleInstrumentationTest_21_x86"
+    - "-//ui/espresso/AccessibilitySample:BasicSampleInstrumentationTest_19_x86"    
   macos:
     # Testing does not work for macos and windows yet
     build_targets: # Results of `bazel query 'kind(android_binary, //...)'

integration/ServiceTestRuleSample/app/build.gradle

@@ -1,28 +1,42 @@
-apply plugin: 'com.android.application'
+apply plugin: "com.android.application"
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion rootProject.buildToolsVersion
+    compileSdk 34
     defaultConfig {
         applicationId "com.example.android.testing.integrationtesting.ServiceTestRuleSample"
-        minSdkVersion 14
-        targetSdkVersion 30
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
-    lintOptions {
-        abortOnError false
-    }
     productFlavors {
     }
+    testOptions {
+        managedDevices {
+            devices {
+                // run with ../gradlew  nexusOneApi30DebugAndroidTest
+                nexusOneApi30(com.android.build.api.dsl.ManagedVirtualDevice) {
+                    // A lower resolution device is used here for better emulator performance
+                    device = "Nexus One"
+                    apiLevel = 30
+                    // Also use the AOSP ATD image for better emulator performance
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
+    namespace "com.example.android.testing.ServiceTestRuleSample"
+    lint {
+        abortOnError false
+    }
 }
 
 dependencies {
     // Testing-only dependencies
-    androidTestImplementation 'androidx.test:core:' + rootProject.coreVersion;
-    androidTestImplementation 'androidx.test.ext:junit:' + rootProject.extJUnitVersion;
-    androidTestImplementation 'androidx.test:runner:' + rootProject.runnerVersion;
-    androidTestImplementation 'androidx.test:rules:' + rootProject.rulesVersion;
+    androidTestImplementation "androidx.test:core:" + rootProject.coreVersion;
+    androidTestImplementation "androidx.test.ext:junit:" + rootProject.extJUnitVersion;
+    androidTestImplementation "androidx.test:runner:" + rootProject.runnerVersion;
+    androidTestImplementation "androidx.test:rules:" + rootProject.rulesVersion;
 }

integration/ServiceTestRuleSample/app/src/main/AndroidManifest.xml

@@ -16,8 +16,7 @@
   -->
 
 
-<manifest package="com.example.android.testing.ServiceTestRuleSample"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:icon="@mipmap/ic_launcher"

integration/ServiceTestRuleSample/build.gradle

@@ -1,13 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.agpVersion = "8.5.0"
     repositories {
         // Insert local test repo here
-        jcenter()
         google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath "com.android.tools.build:gradle:$agpVersion"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,15 +18,14 @@ buildscript {
 allprojects {
     repositories {
         // Insert local test repo here
-        jcenter()
         google()
+        mavenCentral()
     }
 }
 
 ext {
-    buildToolsVersion = "30.0.2"
-    coreVersion = "1.4.0-alpha04"
-    extJUnitVersion = "1.1.3-alpha04"
-    runnerVersion = "1.4.0-alpha04"
-    rulesVersion = "1.4.0-alpha04"
+    coreVersion = "1.6.1"
+    extJUnitVersion = "1.2.1"
+    runnerVersion = "1.6.1"
+    rulesVersion = "1.6.1"
 }