From 925a54bf6dc4a013bae811df17358ebca2ad6565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 9 Mar 2021 15:06:55 +0100 Subject: [PATCH 1/7] Add NoError asserts --- .../assertion/BaristaErrorAssertions.kt | 29 +++++++++++++++++++ .../barista/sample/HintAndErrorTest.java | 18 ++++++++++++ .../barista/sample/HintAndErrorActivity.java | 6 ++-- .../res/layout/activity_hintanderrortext.xml | 7 +++++ 4 files changed, 57 insertions(+), 3 deletions(-) diff --git a/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt b/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt index 0a18907c3..1ae485adb 100644 --- a/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt +++ b/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt @@ -26,6 +26,17 @@ object BaristaErrorAssertions { ViewMatchers.withId(viewId).assertAny(matchError(text)) } + @JvmStatic + fun assertNoError(@IdRes viewId: Int, @StringRes text: Int) { + val resourceString = ApplicationProvider.getApplicationContext().resources.getString(text) + assertNoError(viewId, resourceString) + } + + @JvmStatic + fun assertNoError(@IdRes viewId: Int, text: String) { + ViewMatchers.withId(viewId).assertAny(matchNoError(text)) + } + private fun matchError(expectedError: String): Matcher { return object : TypeSafeMatcher() { override fun describeTo(description: Description) { @@ -43,4 +54,22 @@ object BaristaErrorAssertions { } } } + + private fun matchNoError(notExpectedError: String): Matcher { + return object : TypeSafeMatcher() { + override fun describeTo(description: Description) { + description.appendText("without error: ").appendText(notExpectedError) + } + + override fun matchesSafely(item: View): Boolean { + return when (item) { + is TextView -> item.error == null || notExpectedError != item.error.toString() + is TextInputLayout -> item.error == null || notExpectedError != item.error.toString() + else -> { + throw UnsupportedOperationException("View of class ${item.javaClass.simpleName} not supported") + } + } + } + } + } } \ No newline at end of file diff --git a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java index fda84732e..b7be02011 100644 --- a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java +++ b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java @@ -7,7 +7,9 @@ import org.junit.runner.RunWith; import static com.schibsted.spain.barista.assertion.BaristaErrorAssertions.assertError; +import static com.schibsted.spain.barista.assertion.BaristaErrorAssertions.assertNoError; import static com.schibsted.spain.barista.assertion.BaristaHintAssertions.assertHint; +import static com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn; @RunWith(AndroidJUnit4.class) public class HintAndErrorTest { @@ -31,6 +33,7 @@ public void assertHintByResource() { @Test public void assertErrorByString() { + clickOn(R.id.showErrors); assertError(R.id.hintanderror_inputlayout, "TextInputLayout error"); assertError(R.id.hintanderror_inputedittext, "TextInputEditText error"); assertError(R.id.hintanderror_edittext, "EditText error"); @@ -38,8 +41,23 @@ public void assertErrorByString() { @Test public void assertErrorByResource() { + clickOn(R.id.showErrors); assertError(R.id.hintanderror_inputlayout, R.string.hintanderror_inputlayout_error); assertError(R.id.hintanderror_inputedittext, R.string.hintanderror_inputedittext_error); assertError(R.id.hintanderror_edittext, R.string.hintanderror_edittext_error); } + + @Test + public void assertNoErrorByString() { + assertNoError(R.id.hintanderror_inputlayout, "TextInputLayout NoError"); + assertNoError(R.id.hintanderror_inputedittext, "TextInputEditText NoError"); + assertNoError(R.id.hintanderror_edittext, "EditText NoError"); + } + + @Test + public void assertNoErrorByResource() { + assertNoError(R.id.hintanderror_inputlayout, R.string.hintanderror_inputlayout_error); + assertNoError(R.id.hintanderror_inputedittext, R.string.hintanderror_inputedittext_error); + assertNoError(R.id.hintanderror_edittext, R.string.hintanderror_edittext_error); + } } diff --git a/sample/src/main/java/com/schibsted/spain/barista/sample/HintAndErrorActivity.java b/sample/src/main/java/com/schibsted/spain/barista/sample/HintAndErrorActivity.java index b9c2be06b..f5109b751 100644 --- a/sample/src/main/java/com/schibsted/spain/barista/sample/HintAndErrorActivity.java +++ b/sample/src/main/java/com/schibsted/spain/barista/sample/HintAndErrorActivity.java @@ -1,11 +1,11 @@ package com.schibsted.spain.barista.sample; import android.os.Bundle; +import android.widget.EditText; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; -import androidx.appcompat.app.AppCompatActivity; -import android.widget.EditText; public class HintAndErrorActivity extends AppCompatActivity { @Override @@ -13,7 +13,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_hintanderrortext); - showError(); + findViewById(R.id.showErrors).setOnClickListener(v -> showError()); } private void showError() { diff --git a/sample/src/main/res/layout/activity_hintanderrortext.xml b/sample/src/main/res/layout/activity_hintanderrortext.xml index f3d69934e..77ce0ab19 100644 --- a/sample/src/main/res/layout/activity_hintanderrortext.xml +++ b/sample/src/main/res/layout/activity_hintanderrortext.xml @@ -7,6 +7,13 @@ android:padding="16dp" > + + Date: Tue, 9 Mar 2021 15:19:48 +0100 Subject: [PATCH 2/7] Add failure cases --- .../assertion/BaristaErrorAssertions.kt | 4 +++- .../barista/sample/HintAndErrorTest.java | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt b/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt index 1ae485adb..131a0e261 100644 --- a/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt +++ b/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt @@ -64,7 +64,9 @@ object BaristaErrorAssertions { override fun matchesSafely(item: View): Boolean { return when (item) { is TextView -> item.error == null || notExpectedError != item.error.toString() - is TextInputLayout -> item.error == null || notExpectedError != item.error.toString() + is TextInputLayout -> { + item.error == null || notExpectedError != item.error.toString() + } else -> { throw UnsupportedOperationException("View of class ${item.javaClass.simpleName} not supported") } diff --git a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java index b7be02011..9da758d21 100644 --- a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java +++ b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java @@ -2,6 +2,7 @@ import androidx.test.rule.ActivityTestRule; import androidx.test.runner.AndroidJUnit4; +import com.schibsted.spain.barista.internal.failurehandler.BaristaException; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,6 +48,20 @@ public void assertErrorByResource() { assertError(R.id.hintanderror_edittext, R.string.hintanderror_edittext_error); } + @Test(expected = BaristaException.class) + public void assertErrorByStringFails() { + assertError(R.id.hintanderror_inputlayout, "TextInputLayout error"); + assertError(R.id.hintanderror_inputedittext, "TextInputEditText error"); + assertError(R.id.hintanderror_edittext, "EditText error"); + } + + @Test(expected = BaristaException.class) + public void assertErrorByResourceFails() { + assertError(R.id.hintanderror_inputlayout, R.string.hintanderror_inputlayout_error); + assertError(R.id.hintanderror_inputedittext, R.string.hintanderror_inputedittext_error); + assertError(R.id.hintanderror_edittext, R.string.hintanderror_edittext_error); + } + @Test public void assertNoErrorByString() { assertNoError(R.id.hintanderror_inputlayout, "TextInputLayout NoError"); @@ -60,4 +75,12 @@ public void assertNoErrorByResource() { assertNoError(R.id.hintanderror_inputedittext, R.string.hintanderror_inputedittext_error); assertNoError(R.id.hintanderror_edittext, R.string.hintanderror_edittext_error); } + + @Test(expected = BaristaException.class) + public void assertNoErrorByResourceFails() { + clickOn(R.id.showErrors); + assertNoError(R.id.hintanderror_inputlayout, R.string.hintanderror_inputlayout_error); + assertNoError(R.id.hintanderror_inputedittext, R.string.hintanderror_inputedittext_error); + assertNoError(R.id.hintanderror_edittext, R.string.hintanderror_edittext_error); + } } From 72260ab42ae3fa39a26650ba3a49a47e1128fe5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 9 Mar 2021 15:21:25 +0100 Subject: [PATCH 3/7] Update readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 65fced83a..42b4fd1f3 100644 --- a/README.md +++ b/README.md @@ -275,6 +275,9 @@ assertHint(R.id.edittext, "Hint"); ```java assertError(R.id.edittext, R.string.error); assertError(R.id.edittext, "Error message"); + +assertNoError(R.id.edittext, R.string.error); +assertNoError(R.id.edittext, "Error message"); ``` #### Check TextInputLayout's assistive helper text From 811ea4a4830015857188ae8336334d44f6552ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 9 Mar 2021 16:13:38 +0100 Subject: [PATCH 4/7] Remove text param --- .../assertion/BaristaErrorAssertions.kt | 28 +++++++------------ .../barista/sample/HintAndErrorTest.java | 19 ++++--------- 2 files changed, 16 insertions(+), 31 deletions(-) diff --git a/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt b/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt index 131a0e261..0ccd2c69a 100644 --- a/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt +++ b/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt @@ -1,13 +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.espresso.matcher.ViewMatchers import android.view.View import android.widget.TextView +import androidx.annotation.IdRes +import androidx.annotation.StringRes import androidx.test.core.app.ApplicationProvider +import androidx.test.espresso.matcher.ViewMatchers +import com.google.android.material.textfield.TextInputLayout import com.schibsted.spain.barista.internal.assertAny import org.hamcrest.Description import org.hamcrest.Matcher @@ -27,14 +27,8 @@ object BaristaErrorAssertions { } @JvmStatic - fun assertNoError(@IdRes viewId: Int, @StringRes text: Int) { - val resourceString = ApplicationProvider.getApplicationContext().resources.getString(text) - assertNoError(viewId, resourceString) - } - - @JvmStatic - fun assertNoError(@IdRes viewId: Int, text: String) { - ViewMatchers.withId(viewId).assertAny(matchNoError(text)) + fun assertNoError(@IdRes viewId: Int) { + ViewMatchers.withId(viewId).assertAny(matchNoError()) } private fun matchError(expectedError: String): Matcher { @@ -55,18 +49,16 @@ object BaristaErrorAssertions { } } - private fun matchNoError(notExpectedError: String): Matcher { + private fun matchNoError(): Matcher { return object : TypeSafeMatcher() { override fun describeTo(description: Description) { - description.appendText("without error: ").appendText(notExpectedError) + description.appendText("without error") } override fun matchesSafely(item: View): Boolean { return when (item) { - is TextView -> item.error == null || notExpectedError != item.error.toString() - is TextInputLayout -> { - item.error == null || notExpectedError != item.error.toString() - } + is TextView -> item.error.isNullOrEmpty() + is TextInputLayout -> item.error.isNullOrEmpty() else -> { throw UnsupportedOperationException("View of class ${item.javaClass.simpleName} not supported") } diff --git a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java index 9da758d21..65af0b89e 100644 --- a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java +++ b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java @@ -62,25 +62,18 @@ public void assertErrorByResourceFails() { assertError(R.id.hintanderror_edittext, R.string.hintanderror_edittext_error); } - @Test - public void assertNoErrorByString() { - assertNoError(R.id.hintanderror_inputlayout, "TextInputLayout NoError"); - assertNoError(R.id.hintanderror_inputedittext, "TextInputEditText NoError"); - assertNoError(R.id.hintanderror_edittext, "EditText NoError"); - } - @Test public void assertNoErrorByResource() { - assertNoError(R.id.hintanderror_inputlayout, R.string.hintanderror_inputlayout_error); - assertNoError(R.id.hintanderror_inputedittext, R.string.hintanderror_inputedittext_error); - assertNoError(R.id.hintanderror_edittext, R.string.hintanderror_edittext_error); + assertNoError(R.id.hintanderror_inputlayout); + assertNoError(R.id.hintanderror_inputedittext); + assertNoError(R.id.hintanderror_edittext); } @Test(expected = BaristaException.class) public void assertNoErrorByResourceFails() { clickOn(R.id.showErrors); - assertNoError(R.id.hintanderror_inputlayout, R.string.hintanderror_inputlayout_error); - assertNoError(R.id.hintanderror_inputedittext, R.string.hintanderror_inputedittext_error); - assertNoError(R.id.hintanderror_edittext, R.string.hintanderror_edittext_error); + assertNoError(R.id.hintanderror_inputlayout); + assertNoError(R.id.hintanderror_inputedittext); + assertNoError(R.id.hintanderror_edittext); } } From aadc9385be40fb46611c8e76aaad1462ef0a800d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 9 Mar 2021 16:14:08 +0100 Subject: [PATCH 5/7] Rename methods --- .../assertion/BaristaErrorAssertions.kt | 8 ++-- .../barista/sample/HintAndErrorTest.java | 43 ++++++++++--------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt b/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt index 0ccd2c69a..295c26bd0 100644 --- a/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt +++ b/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt @@ -16,18 +16,18 @@ import org.hamcrest.TypeSafeMatcher object BaristaErrorAssertions { @JvmStatic - fun assertError(@IdRes viewId: Int, @StringRes text: Int) { + fun assertErrorDisplayed(@IdRes viewId: Int, @StringRes text: Int) { val resourceString = ApplicationProvider.getApplicationContext().resources.getString(text) - assertError(viewId, resourceString) + assertErrorDisplayed(viewId, resourceString) } @JvmStatic - fun assertError(@IdRes viewId: Int, text: String) { + fun assertErrorDisplayed(@IdRes viewId: Int, text: String) { ViewMatchers.withId(viewId).assertAny(matchError(text)) } @JvmStatic - fun assertNoError(@IdRes viewId: Int) { + fun assertNoErrorDisplayed(@IdRes viewId: Int) { ViewMatchers.withId(viewId).assertAny(matchNoError()) } diff --git a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java index 65af0b89e..2940a234e 100644 --- a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java +++ b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java @@ -2,13 +2,16 @@ import androidx.test.rule.ActivityTestRule; import androidx.test.runner.AndroidJUnit4; +import com.schibsted.spain.barista.assertion.BaristaErrorAssertions; import com.schibsted.spain.barista.internal.failurehandler.BaristaException; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import static com.schibsted.spain.barista.assertion.BaristaErrorAssertions.assertError; -import static com.schibsted.spain.barista.assertion.BaristaErrorAssertions.assertNoError; +import static com.schibsted.spain.barista.assertion.BaristaErrorAssertions.assertErrorDisplayed; +import static com.schibsted.spain.barista.assertion.BaristaErrorAssertions.assertNoErrorDisplayed; +import static com.schibsted.spain.barista.assertion.assertErrorDisplayed; +import static com.schibsted.spain.barista.assertion.assertNoErrorDisplayed; import static com.schibsted.spain.barista.assertion.BaristaHintAssertions.assertHint; import static com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn; @@ -35,45 +38,45 @@ public void assertHintByResource() { @Test public void assertErrorByString() { clickOn(R.id.showErrors); - assertError(R.id.hintanderror_inputlayout, "TextInputLayout error"); - assertError(R.id.hintanderror_inputedittext, "TextInputEditText error"); - assertError(R.id.hintanderror_edittext, "EditText error"); + assertErrorDisplayed(R.id.hintanderror_inputlayout, "TextInputLayout error"); + assertErrorDisplayed(R.id.hintanderror_inputedittext, "TextInputEditText error"); + assertErrorDisplayed(R.id.hintanderror_edittext, "EditText error"); } @Test public void assertErrorByResource() { clickOn(R.id.showErrors); - assertError(R.id.hintanderror_inputlayout, R.string.hintanderror_inputlayout_error); - assertError(R.id.hintanderror_inputedittext, R.string.hintanderror_inputedittext_error); - assertError(R.id.hintanderror_edittext, R.string.hintanderror_edittext_error); + assertErrorDisplayed(R.id.hintanderror_inputlayout, R.string.hintanderror_inputlayout_error); + assertErrorDisplayed(R.id.hintanderror_inputedittext, R.string.hintanderror_inputedittext_error); + assertErrorDisplayed(R.id.hintanderror_edittext, R.string.hintanderror_edittext_error); } @Test(expected = BaristaException.class) public void assertErrorByStringFails() { - assertError(R.id.hintanderror_inputlayout, "TextInputLayout error"); - assertError(R.id.hintanderror_inputedittext, "TextInputEditText error"); - assertError(R.id.hintanderror_edittext, "EditText error"); + assertErrorDisplayed(R.id.hintanderror_inputlayout, "TextInputLayout error"); + assertErrorDisplayed(R.id.hintanderror_inputedittext, "TextInputEditText error"); + assertErrorDisplayed(R.id.hintanderror_edittext, "EditText error"); } @Test(expected = BaristaException.class) public void assertErrorByResourceFails() { - assertError(R.id.hintanderror_inputlayout, R.string.hintanderror_inputlayout_error); - assertError(R.id.hintanderror_inputedittext, R.string.hintanderror_inputedittext_error); - assertError(R.id.hintanderror_edittext, R.string.hintanderror_edittext_error); + assertErrorDisplayed(R.id.hintanderror_inputlayout, R.string.hintanderror_inputlayout_error); + assertErrorDisplayed(R.id.hintanderror_inputedittext, R.string.hintanderror_inputedittext_error); + assertErrorDisplayed(R.id.hintanderror_edittext, R.string.hintanderror_edittext_error); } @Test public void assertNoErrorByResource() { - assertNoError(R.id.hintanderror_inputlayout); - assertNoError(R.id.hintanderror_inputedittext); - assertNoError(R.id.hintanderror_edittext); + assertNoErrorDisplayed(R.id.hintanderror_inputlayout); + assertNoErrorDisplayed(R.id.hintanderror_inputedittext); + assertNoErrorDisplayed(R.id.hintanderror_edittext); } @Test(expected = BaristaException.class) public void assertNoErrorByResourceFails() { clickOn(R.id.showErrors); - assertNoError(R.id.hintanderror_inputlayout); - assertNoError(R.id.hintanderror_inputedittext); - assertNoError(R.id.hintanderror_edittext); + assertNoErrorDisplayed(R.id.hintanderror_inputlayout); + assertNoErrorDisplayed(R.id.hintanderror_inputedittext); + assertNoErrorDisplayed(R.id.hintanderror_edittext); } } From d0baecf259a9779438e4204395358df11d664bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 9 Mar 2021 16:15:01 +0100 Subject: [PATCH 6/7] Update readme --- README.md | 8 ++++---- .../schibsted/spain/barista/sample/HintAndErrorTest.java | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 42b4fd1f3..c89738c4f 100644 --- a/README.md +++ b/README.md @@ -273,11 +273,11 @@ assertHint(R.id.edittext, "Hint"); #### Check TextInputLayout and EditText's errors ```java -assertError(R.id.edittext, R.string.error); -assertError(R.id.edittext, "Error message"); +assertErrorDisplayed(R.id.edittext, R.string.error); +assertErrorDisplayed(R.id.edittext, "Error message"); -assertNoError(R.id.edittext, R.string.error); -assertNoError(R.id.edittext, "Error message"); +assertNoErrorDisplayed(R.id.edittext, R.string.error); +assertNoErrorDisplayed(R.id.edittext, "Error message"); ``` #### Check TextInputLayout's assistive helper text diff --git a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java index 2940a234e..e6fd553bf 100644 --- a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java +++ b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java @@ -2,7 +2,6 @@ import androidx.test.rule.ActivityTestRule; import androidx.test.runner.AndroidJUnit4; -import com.schibsted.spain.barista.assertion.BaristaErrorAssertions; import com.schibsted.spain.barista.internal.failurehandler.BaristaException; import org.junit.Rule; import org.junit.Test; @@ -10,8 +9,6 @@ import static com.schibsted.spain.barista.assertion.BaristaErrorAssertions.assertErrorDisplayed; import static com.schibsted.spain.barista.assertion.BaristaErrorAssertions.assertNoErrorDisplayed; -import static com.schibsted.spain.barista.assertion.assertErrorDisplayed; -import static com.schibsted.spain.barista.assertion.assertNoErrorDisplayed; import static com.schibsted.spain.barista.assertion.BaristaHintAssertions.assertHint; import static com.schibsted.spain.barista.interaction.BaristaClickInteractions.clickOn; From cf312bdd611ce1b6042bb79c8211ed17bc3723d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Wed, 10 Mar 2021 09:16:18 +0100 Subject: [PATCH 7/7] Rollback old errors, redirwect to new ones --- .../assertion/BaristaErrorAssertions.kt | 24 +++++++++++++++++++ .../barista/sample/HintAndErrorTest.java | 1 + 2 files changed, 25 insertions(+) diff --git a/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt b/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt index 295c26bd0..84d48e1b8 100644 --- a/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt +++ b/library/src/main/java/com/schibsted/spain/barista/assertion/BaristaErrorAssertions.kt @@ -15,6 +15,30 @@ import org.hamcrest.TypeSafeMatcher object BaristaErrorAssertions { + @Deprecated( + message = "Use assertErrorDisplayed(id, text)", + replaceWith = ReplaceWith( + "assertErrorDisplayed(viewId, text)", + "com.schibsted.spain.barista.assertion.BaristaErrorAssertions.assertErrorDisplayed" + ) + ) + @JvmStatic + fun assertError(@IdRes viewId: Int, @StringRes text: Int) { + assertErrorDisplayed(viewId, text) + } + + @Deprecated( + message = "Use assertErrorDisplayed(id, text)", + replaceWith = ReplaceWith( + "assertErrorDisplayed(viewId, text)", + "com.schibsted.spain.barista.assertion.BaristaErrorAssertions.assertErrorDisplayed" + ) + ) + @JvmStatic + fun assertError(@IdRes viewId: Int, text: String) { + assertErrorDisplayed(viewId, text) + } + @JvmStatic fun assertErrorDisplayed(@IdRes viewId: Int, @StringRes text: Int) { val resourceString = ApplicationProvider.getApplicationContext().resources.getString(text) diff --git a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java index e6fd553bf..0304d2989 100644 --- a/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java +++ b/sample/src/androidTest/java/com/schibsted/spain/barista/sample/HintAndErrorTest.java @@ -36,6 +36,7 @@ public void assertHintByResource() { public void assertErrorByString() { clickOn(R.id.showErrors); assertErrorDisplayed(R.id.hintanderror_inputlayout, "TextInputLayout error"); + assertErrorDisplayed(R.id.hintanderror_inputlayout, "TextInputLayout error"); assertErrorDisplayed(R.id.hintanderror_inputedittext, "TextInputEditText error"); assertErrorDisplayed(R.id.hintanderror_edittext, "EditText error"); }