From f35d9b67f6362da416c8588a2f3b4818d81eb0bb Mon Sep 17 00:00:00 2001
From: Alisa Seletskaya <sealisaa@yandex.ru>
Date: Thu, 27 Apr 2023 09:38:34 +0300
Subject: [PATCH 1/3] add GenresListTest

---
 app/build.gradle                              |  3 +-
 .../com/example/moviepicker/GenresListTest.kt | 47 +++++++++++++++++++
 .../moviepicker/screens/GenresScreen.kt       | 29 ++++++++++++
 .../example/moviepicker/screens/HomeScreen.kt | 18 +++++++
 app/src/main/res/layout/genre_card.xml        |  1 +
 5 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 app/src/androidTest/java/com/example/moviepicker/GenresListTest.kt
 create mode 100644 app/src/androidTest/java/com/example/moviepicker/screens/GenresScreen.kt
 create mode 100644 app/src/androidTest/java/com/example/moviepicker/screens/HomeScreen.kt

diff --git a/app/build.gradle b/app/build.gradle
index bc65ed5..8dd4b50 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,5 +51,6 @@ dependencies {
     implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'com.kaspersky.android-components:kaspresso:1.4.2'
+    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
 }
diff --git a/app/src/androidTest/java/com/example/moviepicker/GenresListTest.kt b/app/src/androidTest/java/com/example/moviepicker/GenresListTest.kt
new file mode 100644
index 0000000..e5aa1f2
--- /dev/null
+++ b/app/src/androidTest/java/com/example/moviepicker/GenresListTest.kt
@@ -0,0 +1,47 @@
+package com.example.moviepicker
+
+import androidx.test.ext.junit.rules.activityScenarioRule
+import com.example.moviepicker.screens.GenresScreen
+import com.example.moviepicker.screens.HomeScreen
+import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
+import org.junit.Assert
+import org.junit.Rule
+import org.junit.Test
+
+class GenresListTest : TestCase() {
+    private val genres = listOf(
+        "Мультфильмы",
+        "Триллеры",
+        "Комедии",
+        "Ужасы"
+    )
+
+    @get:Rule
+    val activityRule = activityScenarioRule<MainActivity>()
+
+    @Test
+    fun checkGenresScreen() = run {
+        step("Open genres screen") {
+            HomeScreen {
+                goToGenres()
+            }
+        }
+        step("Check genres count") {
+            GenresScreen {
+                Assert.assertEquals(genres.size, rvGenres.getSize())
+            }
+        }
+        step("Check genres list") {
+            GenresScreen {
+                rvGenres {
+                    for (i in 1 until genres.size) {
+                        childAt<GenresScreen.GenreScreen>(i) {
+                            genreButton.isVisible()
+                            genreButton.hasText(genres[i])
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/example/moviepicker/screens/GenresScreen.kt b/app/src/androidTest/java/com/example/moviepicker/screens/GenresScreen.kt
new file mode 100644
index 0000000..86759a6
--- /dev/null
+++ b/app/src/androidTest/java/com/example/moviepicker/screens/GenresScreen.kt
@@ -0,0 +1,29 @@
+package com.example.moviepicker.screens
+
+import android.view.View
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import com.example.moviepicker.R
+import com.kaspersky.kaspresso.screens.KScreen
+import io.github.kakaocup.kakao.common.views.KView
+import io.github.kakaocup.kakao.recycler.KRecyclerItem
+import io.github.kakaocup.kakao.recycler.KRecyclerView
+import io.github.kakaocup.kakao.text.KButton
+import org.hamcrest.Matcher
+
+object GenresScreen : KScreen<GenresScreen>() {
+    override val layoutId: Int?
+        get() = R.layout.fragment_genres
+    override val viewClass: Class<*>?
+        get() = null
+
+    val rvGenres = KRecyclerView(
+        builder = { withId(R.id.genresRecyclerView) },
+        itemTypeBuilder = { itemType(::GenreScreen) }
+    )
+
+    class GenreScreen(matcher: Matcher<View>): KRecyclerItem<GenresScreen>(matcher) {
+        val genreContainer = KView(matcher) { withId(R.id.genreContainer) }
+        val genreButton = KButton(matcher) { withId(R.id.genreButton) }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/example/moviepicker/screens/HomeScreen.kt b/app/src/androidTest/java/com/example/moviepicker/screens/HomeScreen.kt
new file mode 100644
index 0000000..f9f0a4c
--- /dev/null
+++ b/app/src/androidTest/java/com/example/moviepicker/screens/HomeScreen.kt
@@ -0,0 +1,18 @@
+package com.example.moviepicker.screens
+
+import com.example.moviepicker.R
+import com.kaspersky.kaspresso.screens.KScreen
+import io.github.kakaocup.kakao.tabs.KTabLayout
+
+object HomeScreen : KScreen<HomeScreen>() {
+    override val layoutId: Int?
+        get() = R.layout.fragment_home
+    override val viewClass: Class<*>?
+        get() = null
+
+    private val tabLayout = KTabLayout { withId(R.id.homeTabLayout) }
+
+    fun goToGenres() {
+        this.tabLayout.selectTab(1);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/genre_card.xml b/app/src/main/res/layout/genre_card.xml
index bcad1ca..9fe224b 100644
--- a/app/src/main/res/layout/genre_card.xml
+++ b/app/src/main/res/layout/genre_card.xml
@@ -3,6 +3,7 @@
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
              xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:id="@+id/genreContainer"
 >
     <Button
             android:id="@+id/genreButton"

From b4a70440d5b8bd86c72cb7cf77fbdfeadd5a2abf Mon Sep 17 00:00:00 2001
From: Alisa Seletskaya <sealisaa@yandex.ru>
Date: Thu, 27 Apr 2023 12:47:26 +0300
Subject: [PATCH 2/3] add PopularMovieTest

---
 .../com/example/moviepicker/GenresListTest.kt |  6 +--
 .../example/moviepicker/PopularMovieTest.kt   | 31 +++++++++++++
 .../{screens => pages}/GenresScreen.kt        |  8 +---
 .../example/moviepicker/pages/HomeScreen.kt   | 43 +++++++++++++++++++
 .../example/moviepicker/pages/MovieScreen.kt  | 14 ++++++
 .../example/moviepicker/screens/HomeScreen.kt | 18 --------
 .../main/res/layout/vertical_movie_card.xml   |  1 +
 7 files changed, 94 insertions(+), 27 deletions(-)
 create mode 100644 app/src/androidTest/java/com/example/moviepicker/PopularMovieTest.kt
 rename app/src/androidTest/java/com/example/moviepicker/{screens => pages}/GenresScreen.kt (74%)
 create mode 100644 app/src/androidTest/java/com/example/moviepicker/pages/HomeScreen.kt
 create mode 100644 app/src/androidTest/java/com/example/moviepicker/pages/MovieScreen.kt
 delete mode 100644 app/src/androidTest/java/com/example/moviepicker/screens/HomeScreen.kt

diff --git a/app/src/androidTest/java/com/example/moviepicker/GenresListTest.kt b/app/src/androidTest/java/com/example/moviepicker/GenresListTest.kt
index e5aa1f2..6866d73 100644
--- a/app/src/androidTest/java/com/example/moviepicker/GenresListTest.kt
+++ b/app/src/androidTest/java/com/example/moviepicker/GenresListTest.kt
@@ -1,8 +1,8 @@
 package com.example.moviepicker
 
 import androidx.test.ext.junit.rules.activityScenarioRule
-import com.example.moviepicker.screens.GenresScreen
-import com.example.moviepicker.screens.HomeScreen
+import com.example.moviepicker.pages.GenresScreen
+import com.example.moviepicker.pages.HomeScreen
 import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
 import org.junit.Assert
 import org.junit.Rule
@@ -23,7 +23,7 @@ class GenresListTest : TestCase() {
     fun checkGenresScreen() = run {
         step("Open genres screen") {
             HomeScreen {
-                goToGenres()
+                goToGenresTab()
             }
         }
         step("Check genres count") {
diff --git a/app/src/androidTest/java/com/example/moviepicker/PopularMovieTest.kt b/app/src/androidTest/java/com/example/moviepicker/PopularMovieTest.kt
new file mode 100644
index 0000000..e3c2568
--- /dev/null
+++ b/app/src/androidTest/java/com/example/moviepicker/PopularMovieTest.kt
@@ -0,0 +1,31 @@
+package com.example.moviepicker
+
+import androidx.test.ext.junit.rules.activityScenarioRule
+import com.example.moviepicker.pages.HomeScreen
+import com.example.moviepicker.pages.MovieScreen
+import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
+import org.junit.Rule
+import org.junit.Test
+
+class PopularMovieTest : TestCase() {
+    private val movieIndex = 0
+    private var title = "Звёздные войны: Эпизод 1 — Скрытая угроза"
+
+    @get:Rule
+    val activityRule = activityScenarioRule<MainActivity>()
+
+    @Test
+    fun checkPopularMovieDescription() = run {
+        step("Open popular movie description") {
+            HomeScreen {
+                goToMovieDescription(movieIndex)
+            }
+        }
+        step("Check title in description") {
+            MovieScreen {
+                movieTitle.isVisible()
+                movieTitle.containsText(title)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/example/moviepicker/screens/GenresScreen.kt b/app/src/androidTest/java/com/example/moviepicker/pages/GenresScreen.kt
similarity index 74%
rename from app/src/androidTest/java/com/example/moviepicker/screens/GenresScreen.kt
rename to app/src/androidTest/java/com/example/moviepicker/pages/GenresScreen.kt
index 86759a6..edffb96 100644
--- a/app/src/androidTest/java/com/example/moviepicker/screens/GenresScreen.kt
+++ b/app/src/androidTest/java/com/example/moviepicker/pages/GenresScreen.kt
@@ -1,17 +1,15 @@
-package com.example.moviepicker.screens
+package com.example.moviepicker.pages
 
 import android.view.View
-import androidx.test.espresso.matcher.ViewMatchers.withId
 import com.example.moviepicker.R
 import com.kaspersky.kaspresso.screens.KScreen
-import io.github.kakaocup.kakao.common.views.KView
 import io.github.kakaocup.kakao.recycler.KRecyclerItem
 import io.github.kakaocup.kakao.recycler.KRecyclerView
 import io.github.kakaocup.kakao.text.KButton
 import org.hamcrest.Matcher
 
 object GenresScreen : KScreen<GenresScreen>() {
-    override val layoutId: Int?
+    override val layoutId: Int
         get() = R.layout.fragment_genres
     override val viewClass: Class<*>?
         get() = null
@@ -22,8 +20,6 @@ object GenresScreen : KScreen<GenresScreen>() {
     )
 
     class GenreScreen(matcher: Matcher<View>): KRecyclerItem<GenresScreen>(matcher) {
-        val genreContainer = KView(matcher) { withId(R.id.genreContainer) }
         val genreButton = KButton(matcher) { withId(R.id.genreButton) }
     }
-
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/example/moviepicker/pages/HomeScreen.kt b/app/src/androidTest/java/com/example/moviepicker/pages/HomeScreen.kt
new file mode 100644
index 0000000..8ee4b99
--- /dev/null
+++ b/app/src/androidTest/java/com/example/moviepicker/pages/HomeScreen.kt
@@ -0,0 +1,43 @@
+package com.example.moviepicker.pages
+
+import android.view.View
+import com.example.moviepicker.R
+import com.kaspersky.kaspresso.screens.KScreen
+import io.github.kakaocup.kakao.common.views.KView
+import io.github.kakaocup.kakao.recycler.KRecyclerItem
+import io.github.kakaocup.kakao.recycler.KRecyclerView
+import io.github.kakaocup.kakao.tabs.KTabLayout
+import io.github.kakaocup.kakao.text.KTextView
+import org.hamcrest.Matcher
+
+
+object HomeScreen : KScreen<HomeScreen>() {
+    override val layoutId
+        get() = R.layout.fragment_home
+    override val viewClass: Class<*>?
+        get() = null
+
+    private val tabLayout = KTabLayout { withId(R.id.homeTabLayout) }
+
+    private val rvPopularMovies = KRecyclerView(
+        builder = { withId(R.id.popularMoviesRecyclerView) },
+        itemTypeBuilder = { itemType(::PopularMovieScreen) }
+    )
+
+    class PopularMovieScreen(matcher: Matcher<View>): KRecyclerItem<PopularMovieScreen>(matcher) {
+        val movieCard = KView(matcher) { withId(R.id.movieCard) }
+        val movieTitle = KTextView(matcher) { withId(R.id.movieTitle) }
+    }
+
+    fun goToGenresTab() {
+        this.tabLayout.selectTab(1)
+    }
+
+    fun goToMovieDescription(index: Int) {
+        rvPopularMovies.childAt<PopularMovieScreen>(index) {
+            movieCard.isVisible()
+            movieCard.click()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/example/moviepicker/pages/MovieScreen.kt b/app/src/androidTest/java/com/example/moviepicker/pages/MovieScreen.kt
new file mode 100644
index 0000000..70aad15
--- /dev/null
+++ b/app/src/androidTest/java/com/example/moviepicker/pages/MovieScreen.kt
@@ -0,0 +1,14 @@
+package com.example.moviepicker.pages
+
+import com.example.moviepicker.R
+import com.kaspersky.kaspresso.screens.KScreen
+import io.github.kakaocup.kakao.text.KTextView
+
+object MovieScreen : KScreen<MovieScreen>() {
+    override val layoutId: Int
+        get() = R.layout.fragment_description
+    override val viewClass: Class<*>?
+        get() = null
+
+    val movieTitle = KTextView { withId(R.id.movieName) }
+}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/example/moviepicker/screens/HomeScreen.kt b/app/src/androidTest/java/com/example/moviepicker/screens/HomeScreen.kt
deleted file mode 100644
index f9f0a4c..0000000
--- a/app/src/androidTest/java/com/example/moviepicker/screens/HomeScreen.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.example.moviepicker.screens
-
-import com.example.moviepicker.R
-import com.kaspersky.kaspresso.screens.KScreen
-import io.github.kakaocup.kakao.tabs.KTabLayout
-
-object HomeScreen : KScreen<HomeScreen>() {
-    override val layoutId: Int?
-        get() = R.layout.fragment_home
-    override val viewClass: Class<*>?
-        get() = null
-
-    private val tabLayout = KTabLayout { withId(R.id.homeTabLayout) }
-
-    fun goToGenres() {
-        this.tabLayout.selectTab(1);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/vertical_movie_card.xml b/app/src/main/res/layout/vertical_movie_card.xml
index 4c6621e..48a20b8 100644
--- a/app/src/main/res/layout/vertical_movie_card.xml
+++ b/app/src/main/res/layout/vertical_movie_card.xml
@@ -5,6 +5,7 @@
              xmlns:app="http://schemas.android.com/apk/res-auto"
              android:paddingLeft="12dp"
              android:paddingRight="12dp"
+             android:id="@+id/movieCardContainer"
 >
     <LinearLayout
             android:id="@+id/movieCard"

From c9ee743587648e7ade89805e4e70cb6a5d26555a Mon Sep 17 00:00:00 2001
From: Alisa Seletskaya <sealisaa@yandex.ru>
Date: Thu, 27 Apr 2023 13:08:34 +0300
Subject: [PATCH 3/3] fixes

---
 .../java/com/example/moviepicker/GenresListTest.kt            | 2 +-
 .../java/com/example/moviepicker/pages/HomeScreen.kt          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/com/example/moviepicker/GenresListTest.kt b/app/src/androidTest/java/com/example/moviepicker/GenresListTest.kt
index 6866d73..db3efe1 100644
--- a/app/src/androidTest/java/com/example/moviepicker/GenresListTest.kt
+++ b/app/src/androidTest/java/com/example/moviepicker/GenresListTest.kt
@@ -34,7 +34,7 @@ class GenresListTest : TestCase() {
         step("Check genres list") {
             GenresScreen {
                 rvGenres {
-                    for (i in 1 until genres.size) {
+                    for (i in genres.indices) {
                         childAt<GenresScreen.GenreScreen>(i) {
                             genreButton.isVisible()
                             genreButton.hasText(genres[i])
diff --git a/app/src/androidTest/java/com/example/moviepicker/pages/HomeScreen.kt b/app/src/androidTest/java/com/example/moviepicker/pages/HomeScreen.kt
index 8ee4b99..3cb7ad4 100644
--- a/app/src/androidTest/java/com/example/moviepicker/pages/HomeScreen.kt
+++ b/app/src/androidTest/java/com/example/moviepicker/pages/HomeScreen.kt
@@ -12,6 +12,8 @@ import org.hamcrest.Matcher
 
 
 object HomeScreen : KScreen<HomeScreen>() {
+    private val genresTabId = 1
+
     override val layoutId
         get() = R.layout.fragment_home
     override val viewClass: Class<*>?
@@ -30,7 +32,7 @@ object HomeScreen : KScreen<HomeScreen>() {
     }
 
     fun goToGenresTab() {
-        this.tabLayout.selectTab(1)
+        this.tabLayout.selectTab(genresTabId)
     }
 
     fun goToMovieDescription(index: Int) {