Add hasHint(resId: Int) and hasError(resId: Int) for KEditTextLayout

* Added hasHint(@StringRes resId: Int) * Update hint * Add hasError(@StringRes resId: Int) * Add hasError(@StringRes resId: Int) tests * Extract getResource Co-authored-by: Konstantin Aksenov <aksenov.kostya@gmail.com>
agoda-com · Jun 6, 2020 · 951360b · 951360b
1 parent a2aabc5
commit 951360b
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 2 deletions.
diff --git a/kakao/src/main/kotlin/com/agoda/kakao/common/utilities/ContextUtils.kt b/kakao/src/main/kotlin/com/agoda/kakao/common/utilities/ContextUtils.kt
@@ -0,0 +1,10 @@
+package com.agoda.kakao.common.utilities
+
+import android.content.Context
+import androidx.annotation.StringRes
+import androidx.test.platform.app.InstrumentationRegistry
+
+fun getResourceString(@StringRes resId: Int): String {
+    val targetContext: Context = InstrumentationRegistry.getInstrumentation().targetContext
+    return targetContext.resources.getString(resId)
+}
diff --git a/kakao/src/main/kotlin/com/agoda/kakao/edit/TextInputLayoutAssertions.kt b/kakao/src/main/kotlin/com/agoda/kakao/edit/TextInputLayoutAssertions.kt
@@ -2,12 +2,16 @@
 
 package com.agoda.kakao.edit
 
+import android.content.Context
+import androidx.annotation.StringRes
 import androidx.test.espresso.ViewAssertion
 import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.platform.app.InstrumentationRegistry
 import com.agoda.kakao.common.assertions.BaseAssertions
 import com.agoda.kakao.common.matchers.TextInputLayoutCounterEnabledMatcher
 import com.agoda.kakao.common.matchers.TextInputLayoutErrorEnabledMatcher
 import com.agoda.kakao.common.matchers.TextInputLayoutHintEnabledMatcher
+import com.agoda.kakao.common.utilities.getResourceString
 import com.google.android.material.textfield.TextInputLayout
 
 /**
@@ -34,6 +38,10 @@ interface TextInputLayoutAssertions : BaseAssertions {
         })
     }
 
+    fun hasHint(@StringRes resId: Int) {
+        hasHint(getResourceString(resId))
+    }
+
     fun isHintEnabled() {
         view.check(ViewAssertions.matches(TextInputLayoutHintEnabledMatcher(true)))
     }
@@ -42,6 +50,10 @@ interface TextInputLayoutAssertions : BaseAssertions {
         view.check(ViewAssertions.matches(TextInputLayoutHintEnabledMatcher(false)))
     }
 
+    fun hasError(@StringRes resId: Int) {
+        hasError(getResourceString(resId))
+    }
+
     fun hasError(error: String) {
         view.check(ViewAssertion { view, notFoundException ->
             if (view is TextInputLayout) {

diff --git a/sample/src/androidTest/kotlin/com/agoda/sample/TextInputLayoutTest.kt b/sample/src/androidTest/kotlin/com/agoda/sample/TextInputLayoutTest.kt
@@ -20,7 +20,9 @@ class TextInputLayoutTest {
             inputLayout {
                 hasCounterMaxLength(50)
                 hasHint("This is the HINT!")
+                hasHint(R.string.hint)
                 hasError("This is the ERROR!")
+                hasError(R.string.error)
                 isCounterEnabled()
                 isHintEnabled()
                 isErrorEnabled()

diff --git a/sample/src/main/kotlin/com/agoda/sample/TextInputLayoutActivity.kt b/sample/src/main/kotlin/com/agoda/sample/TextInputLayoutActivity.kt
@@ -15,8 +15,8 @@ class TextInputLayoutActivity : AppCompatActivity() {
             isHintEnabled = true
             isErrorEnabled = true
             counterMaxLength = 50
-            hint = "This is the HINT!"
-            error = "This is the ERROR!"
+            hint = resources.getString(R.string.hint)
+            error = resources.getString(R.string.error)
         }
 
         findViewById<Button>(R.id.toggle_counter).setOnClickListener {

diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="hint">This is the HINT!</string>
+  <string name="error">This is the ERROR!</string>
+</resources>