Merge branch 'master' into enable_custom_list_child_interactions

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: "https://github.com/AdevintaSpain/Barista/issues/344"

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -8,7 +8,7 @@ about: Suggest an idea for this library
 
 **Description what you'd like to happen:**
 
-A clear description if the feature or behavior you'd like implemented.
+A clear description of the feature or behavior you'd like implemented.
 
 **Example espresso code if available**
 

.github/workflows/main.yml

@@ -0,0 +1,31 @@
+name: CI
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  tests:
+    runs-on: macOS-latest
+
+    steps:
+    - uses: actions/checkout@v1
+      name: Checkout
+    - uses: reactivecircus/[email protected]
+      name: Run tests
+      with:
+        api-level: 28
+        profile: Nexus 6
+        headless: true
+        disable-animations: true
+        script: ./gradlew connectedCheck
+
+    - uses: actions/cache@v1
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+        restore-keys: ${{ runner.os }}-gradle-

.travis.yml

@@ -9,15 +9,19 @@ env:
   global:
   - secure: "pus/Wv/014aNnUbUDNBpAk12o3w/zEO+/0oPomdnFs5034tsUOk53VbV69qKdWGKtH8Gm9LGBL50GLjSiB9Cxnc66BCPGj1ykBQ8RGGG/KHTDg22fuRVXmrSbEc+SqjwhpyUTpFjTf9RDmR2qlh427RbGofaNmkv7ePX14OHDjfVJW39jVNJv6+Jluyuh98zGpEbKq1SW+kNJsXUJMQjBtgyaQWN0qIjWflZWv4Rn97vxhyxFtRdGtJl1qCyhAcoIXNJyiYuabn/7sGsv4BjjmVBpFOU9npeJ/uMoXv8HQitjmV5wF9vq3VjmdPua9mrJwqG8BvREEA6r/Hj6vPpm0+qM62bDxpINZX3c9CjrvauaMeNSx3rfxK2yYfYO+f7cVaf0hsYS/pc9Pk0LeJy2FhycBt+WNlj/HSFu5Cvmh38kAj6Dm4HveF/CGFuhXYJAGr8IVH7aCPUeEC6JJLEoylNLglasitvNnfi/5f/smJWGf6e/XhFpAjlhoztRv6Hq7yRX3KZWWYmdl5blrsf6OWv7Z3R60IXfe4caPGMuBZNHToUyRmDfk89GXIJWTmVL4NLYSfO7fSaZ0YJ7nkDhoAgW/oRJuqEdbD404Sfzjp/o9YI6GoU9nxWD/RGRY/PGZ1pQs9djI6wny93kV/Y5W1h9BslEiKf1cxzj337M5s="
   - secure: "pqbCHzhC2ePQt22kFqwA5RqQiJiQmlT8BEv5cPn84FVtGX0x1Qaw6NQ9k5ap2h/KGD0Axif5AdpruYRp4bicpscYOMLpk4fznXkNAX6U6MaQXR0ITgC2JTDtAZnAYuXo377uvdtHT0zPPfv/9mv5qY1bKdaCcRCSL8GX60ywf1YspJZNo7gC9yDZ6TiGTFTKycQqx1lPuPvtTopbp9oP6gDTnGhHDCrnn4Xi1NyyFnKJYVqaHSR25WgWAevNLnOA1Rbc7T67mrzzfeVv6wgS5+lJOuLCY1OgUwGrNmfqKVL67vUWYm5KuGFuHrV5pSiL6Y0CzJuI5gQl4H2h5tpadaEqOV5PswaWbqRW3aQGMsOKsLwv0oJIBcjE0NjkMx4Jusa7f1ofBkXWN2S8ozPDF8oVpJohzl8p2Fnhdrj+2f0eR+MBWFagWFwFeEKFGB1HDqF+XDQW21/Mar6nKc4tj2/wEtBcwfXL0Jo4c6O1GrUanyXLh4fXxIyuetoYIqwkG6hAvshXyoe0RP6UdifWiWnyEKu5Db6JV8IzjuR1QHCbcXjtXpl7Z6JodkRMw5bQzW9rrXTybRqK+ha+p3e/d1iynhjerxzavMadqSamWv02wQYD+vmeuf58SwZcy6XJJtJZ4M6yVL8msiVpsxpX/ln1jWHFEUKwJRRxKBkTHZo="
+
+before_install:
+  - yes | sdkmanager "platforms;android-30"
+
 android:
   components:
   - tools
   - tools
   - platform-tools
   - build-tools-28.0.3
-  - android-29
+  - android-30
   - extra
-  - addon
+  - add-on
 
   licenses:
   - 'android-sdk-license-.+'

README.md

@@ -1,7 +1,7 @@
 # Barista
-**The guy who serves a great Espresso**
+**The one who serves a great Espresso**
 
-[![Travis](https://img.shields.io/travis/rust-lang/rust.svg?label=Travis+CI)](https://travis-ci.org/SchibstedSpain/Barista)
+[![Travis](https://img.shields.io/travis/rust-lang/rust.svg?label=Travis+CI)](https://travis-ci.org/github/AdevintaSpain/Barista)
 [![Download](https://api.bintray.com/packages/schibstedspain/maven/barista/images/download.svg)](https://bintray.com/schibstedspain/maven/barista/_latestVersion)
 [![Hex.pm](https://img.shields.io/hexpm/l/plug.svg)](LICENSE.md)
 
@@ -27,8 +27,7 @@ Barista makes developing UI test faster, easier and more predictable. Built on t
 
 Import Barista as a testing dependency:
 ```gradle
-androidTestImplementation('com.schibsted.spain:barista:3.2.0') {
-  exclude group: 'com.android.support'
+androidTestImplementation('com.schibsted.spain:barista:3.7.0') {
   exclude group: 'org.jetbrains.kotlin' // Only if you already use Kotlin in your project
 }
 ```
@@ -67,6 +66,11 @@ longClickOn("Next");
 clickMenu(R.id.menu_item);
 ```
 
+#### Open the overflow menu without clicking any item
+```java
+openMenu();
+```
+
 #### Writing into widgets
 ```java
 writeTo(R.id.edittext, "A great text");
@@ -80,13 +84,13 @@ clickListItem(R.id.list, 4);
 clickListItemChild(R.id.list, 3, R.id.row_button);
 doOnListItemChild(R.id.list, 5, R.id.edittext, replaceText("Yet another great text"));
 scrollListToPosition(R.id.list, 4);
-assertListItemCount(R.id.listId, 5)
-assertListNotEmpty(R.id.listId)
-assertDisplayedAtPosition(R.id.recycler, 0, "text");
-assertDisplayedAtPosition(R.id.listId, 0, R.id.text_field, "text");
-assertDisplayedAtPosition(R.id.recycler, 0, R.string.hello_world);
-assertDisplayedAtPosition(R.id.listId, 0, R.id.text_field, R.string.hello_world);
-assertCustomAssertionAtPosition(R.id.recycler, 0, customViewAssertion);
+assertListItemCount(R.id.list, 5)
+assertListNotEmpty(R.id.list)
+assertDisplayedAtPosition(R.id.list, 0, "text");
+assertDisplayedAtPosition(R.id.list, 0, R.id.text_field, "text");
+assertDisplayedAtPosition(R.id.list, 0, R.string.hello_world);
+assertDisplayedAtPosition(R.id.list, 0, R.id.text_field, R.string.hello_world);
+assertCustomAssertionAtPosition(R.id.list, 0, customViewAssertion);
 
 clickSpinnerItem(R.id.spinner, 1);
 ```
@@ -295,30 +299,31 @@ assertNotContains(R.id.textview, R.string.text);
 
 #### Check text is given color
 ```java
-assertTextColorIs(R.id.someRedText, R.color.red);
-assertTextColorIs(R.id.someColorListText, R.color.state_list);
+assertTextColorIs(R.id.some_red_text, R.color.red);
+assertTextColorIs(R.id.some_color_list_text, R.color.state_list);
 
 // ...or not?
-assertTextColorIsNot(R.id.someRedText, R.color.blue);
-assertTextColorIsNot(R.id.someColorListText, R.color.another_state_list);
+assertTextColorIsNot(R.id.some_red_text, R.color.blue);
+assertTextColorIsNot(R.id.some_color_list_text, R.color.another_state_list);
 ```
 
-#### Check recyclerView item count against expected item count
-```java
-assertRecyclerViewItemCount(R.id.recycler, 10);
-```
+`assertTextColorIs` and its variant `assertTextColorIsNot` work with:
 
-#### And another tricky feature
-```java
-assertThatBackButtonClosesTheApp();
-```
-#### Is this ImageView showing a drawable?
+- *Color int*: `Color.parse("#ff00ff")`
+- *Color resource*: `R.color.green`
+- *Color attribute*: `R.attr.colorPrimary`
+
+Also Barista can check colors parsed from `declarable-style` custom attribute:
 ```java
-assertHasAnyDrawable(R.id.image_view);
-assertHasDrawable(R.id.image_view, R.drawable.ic_barista);
+assertTextColorIs(R.id.customTextView, R.styleable.SampleCustomView, R.style.SampleCustomStyle, R.styleable.SampleCustomView_customColor);
 
 // ...or not?
-assertHasNoDrawable(R.id.image_view);
+assertTextColorIsNot(R.id.customTextView, R.styleable.SampleCustomView, R.style.SampleCustomStyle_Green, R.styleable.SampleCustomView_customColor);
+```
+
+#### Check recyclerView item count against expected item count
+```java
+assertRecyclerViewItemCount(R.id.recycler, 10);
 ```
 
 #### Is this ProgressBar/SeekBar progress?
@@ -328,6 +333,11 @@ assertProgressIsMin(R.id.seek_bar)
 assertProgressIsMax(R.id.seek_bar)
 ```
 
+#### And another tricky feature
+```java
+assertThatBackButtonClosesTheApp();
+```
+
 ### Custom assertions
 
 If you have a special case not covered by the given assertions API, we encourage you to assert these special cases with our custom assertions API. It's a convenient way to replace plain `Matcher`s with complex assertions. With Barista, you can match any kind of view by knowing its type and passing its `viewId`, `text`, or a `Matcher<View>`. Once you matched it, you will be able to assert all its properties without adding any complex `Matcher` to your project.
@@ -355,10 +365,17 @@ assertAny<RadioGroup>(R.id.radioGroup, "selected option is the second one") {
 }
 ```
 
-## Barista’s Intents API
+## Mocking the Intent results
+
+Mocking the Android Camera Intent is a tricky thing to do. To accomplish it in no time, Barista gives a way to do it in one line: the method `mockAndroidCamera()`. This method does all the magic to mock the result of the camera. One more thing to do: you have to call `Intents.init()` before calling `mockAndroidCamera()`, and `Intents.release()` after doing the action that launches the camera. You could also use `IntentsTestRule` instead of the common `ActivityTestRule` to skip it, but as we recommend the use of `BaristaRule`, it's easier to just call both methods manually when needed.
+
+Here's an example to copy paste:
+
 ```java
-// Creates a Bitmap on a camera provided URI
+Intents.init();
 mockAndroidCamera();
+clickOn(R.id.launch_camera);
+Intents.release();
 ```
 
 ## Runtime Permissions
@@ -367,6 +384,9 @@ The new Marshmallow permissions system requires checking for permissions at runt
 ```java
 PermissionGranter.allowPermissionsIfNeeded(Manifest.permission.GET_ACCOUNTS);
 ```
+```java
+PermissionGranter.allowPermissionOneTime(Manifest.permission.GET_ACCOUNTS);
+```
 
 ## Useful test rules
 Barista includes a set of useful test rules to help you:

build.gradle

@@ -23,9 +23,9 @@ task clean(type: Delete) {
 }
 
 ext.minSdkVersionDeclared = 19
-ext.compileSdkVersionDeclared = 29
+ext.compileSdkVersionDeclared = 30
 
 ext.supportLibVersion = '27.1.1'
 ext.espressoVersion = '3.0.2'
 ext.uiAutomatorVersion = '2.1.3'
-ext.baristaVersion = '3.2.0'
+ext.baristaVersion = '3.7.0'

gradle.properties

@@ -1,3 +1,2 @@
-android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m

library/build.gradle

@@ -15,6 +15,7 @@ android {
   lintOptions {
     disable 'InvalidPackage'
   }
+  kotlinOptions.freeCompilerArgs += ["-module-name", "barista"]
 }
 
 dependencies {
@@ -27,13 +28,16 @@ dependencies {
   implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
   implementation 'androidx.vectordrawable:vectordrawable-animated:1.0.0'
   implementation 'androidx.recyclerview:recyclerview:1.0.0'
+  api 'androidx.viewpager2:viewpager2:1.0.0'
+
+  implementation 'com.google.android.material:material:1.2.0'
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
   testImplementation 'junit:junit:4.12'
   testImplementation 'pl.pragmatists:JUnitParams:1.1.0'
   testImplementation 'org.assertj:assertj-core:1.7.0'
-  testImplementation 'org.mockito:mockito-core:2.13.0'
+  testImplementation 'org.mockito:mockito-core:2.28.2'
 }
 
 publish {

library/src/androidTest/java/com/schibsted/spain/barista/internal/util/BitmapComparatorTest.kt

@@ -1,7 +1,8 @@
 package com.schibsted.spain.barista.internal.util
 
+import android.content.Context
 import android.graphics.BitmapFactory
-import androidx.test.InstrumentationRegistry
+import androidx.test.core.app.ApplicationProvider
 import com.schibsted.spain.barista.test.R
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
@@ -11,8 +12,8 @@ class BitmapComparatorTest {
 
   @Test
   fun returnTrueWhenComparingTheSameDrawable() {
-    val aBitmap = BitmapFactory.decodeResource(InstrumentationRegistry.getTargetContext().resources, R.drawable.ic_barista)
-    val theSameBitmap = BitmapFactory.decodeResource(InstrumentationRegistry.getTargetContext().resources, R.drawable.ic_barista)
+    val aBitmap = BitmapFactory.decodeResource(ApplicationProvider.getApplicationContext<Context>().resources, R.drawable.ic_barista)
+    val theSameBitmap = BitmapFactory.decodeResource(ApplicationProvider.getApplicationContext<Context>().resources, R.drawable.ic_barista)
 
     val result = BitmapComparator.compare(aBitmap, theSameBitmap)
 
@@ -21,8 +22,8 @@ class BitmapComparatorTest {
 
   @Test
   fun returnFalseWhenComparingDifferentDrawables() {
-    val aBitmap = BitmapFactory.decodeResource(InstrumentationRegistry.getTargetContext().resources, R.drawable.ic_barista)
-    val aDifferentBitmap = BitmapFactory.decodeResource(InstrumentationRegistry.getTargetContext().resources, R.drawable.ic_launcher)
+    val aBitmap = BitmapFactory.decodeResource(ApplicationProvider.getApplicationContext<Context>().resources, R.drawable.ic_barista)
+    val aDifferentBitmap = BitmapFactory.decodeResource(ApplicationProvider.getApplicationContext<Context>().resources, R.drawable.ic_launcher)
 
     val result = BitmapComparator.compare(aBitmap, aDifferentBitmap)
 

library/src/main/java/com/schibsted/spain/barista/assertion/BaristaChipAssertions.kt

@@ -0,0 +1,16 @@
+package com.schibsted.spain.barista.assertion
+
+import android.view.View
+import androidx.annotation.IdRes
+import com.google.android.material.chip.ChipGroup
+import com.schibsted.spain.barista.assertion.BaristaAssertions.assertAny
+
+object BaristaChipAssertions {
+
+  @JvmStatic
+  fun assertAnyChipSelected(@IdRes viewId: Int) {
+    assertAny<ChipGroup>(viewId) {
+      it.checkedChipId != View.NO_ID
+    }
+  }
+}

library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt

@@ -1,12 +1,13 @@
 package com.schibsted.spain.barista.assertion
 
+import android.content.Context
 import androidx.annotation.IdRes
 import androidx.annotation.StringRes
 import com.google.android.material.textfield.TextInputLayout
-import androidx.test.InstrumentationRegistry
 import androidx.test.espresso.matcher.ViewMatchers
 import android.view.View
 import android.widget.TextView
+import androidx.test.core.app.ApplicationProvider
 import com.schibsted.spain.barista.internal.assertAny
 import org.hamcrest.Description
 import org.hamcrest.Matcher
@@ -16,7 +17,7 @@ object BaristaErrorAssertions {
 
   @JvmStatic
   fun assertError(@IdRes viewId: Int, @StringRes text: Int) {
-    val resourceString = InstrumentationRegistry.getTargetContext().resources.getString(text)
+    val resourceString = ApplicationProvider.getApplicationContext<Context>().resources.getString(text)
     assertError(viewId, resourceString)
   }
 

library/src/main/java/com/schibsted/spain/barista/assertion/BaristaHintAssertions.kt

@@ -1,14 +1,15 @@
 package com.schibsted.spain.barista.assertion
 
+import android.content.Context
 import androidx.annotation.IdRes
 import androidx.annotation.StringRes
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import androidx.test.InstrumentationRegistry
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import android.view.View
 import android.widget.EditText
 import android.widget.FrameLayout
+import androidx.test.core.app.ApplicationProvider
 import com.schibsted.spain.barista.internal.assertAny
 import org.hamcrest.Description
 import org.hamcrest.Matcher
@@ -18,7 +19,7 @@ object BaristaHintAssertions {
 
   @JvmStatic
   fun assertHint(@IdRes viewId: Int, @StringRes text: Int) {
-    val resourceString = InstrumentationRegistry.getTargetContext().resources.getString(text)
+    val resourceString = ApplicationProvider.getApplicationContext<Context>().resources.getString(text)
     assertHint(viewId, resourceString)
   }