Merge pull request #135 from pravinyo/development

UI fixes and documentation update

Author: pravinyo

.github/workflows/Build-InstrumentationTest.yml

@@ -0,0 +1,35 @@
+name: AudioBook InstrumentationTest
+
+on:
+  push:
+    branches:
+      - 'ci_instrumentation_test'
+
+jobs:
+  instrumentationJob:
+    name: Run Instrumentation Tests
+    runs-on: ubuntu-18.04
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      
+      - uses: malinskiy/action-android/install-sdk@release/0.0.6
+      - run: adb devices
+      - run: echo $ANDROID_HOME
+      
+      - uses: malinskiy/action-android/emulator-run-cmd@release/0.0.6
+        with:
+          cmd: ./gradlew connectedDebugAndroidTest
+          api: 25
+          tag: default
+          abi: x86
+      - name: Save logcat output
+        uses: actions/upload-artifact@master
+        if: failure()
+        with:
+          name: logcat
+          path: artifacts/logcat.log

README.md

@@ -1,5 +1,5 @@
 # AudioBook App
-`Current Major Version : 6` , [`Privacy Policy for Published App`](http://privacy.audiobooks.allsoftdroid.com/)`
+`Current Major Version : 6` , [`Privacy Policy for Published App`](http://privacy.audiobooks.allsoftdroid.com/)
 
 ![AudioBook Feature UnitTest](https://github.com/pravinyo/AudioBook/workflows/AudioBook%20Feature%20UnitTest/badge.svg) ![AudioBook Dependency Graph Generator](https://github.com/pravinyo/AudioBook/workflows/AudioBook%20Dependency%20Graph%20Generator/badge.svg) ![Issues](https://img.shields.io/github/issues-closed/pravinyo/AudioBook)  ![Closed Pull Request](https://img.shields.io/github/issues-pr-closed/pravinyo/AudioBook) ![top language](https://img.shields.io/github/languages/top/pravinyo/AudioBook) ![license](https://img.shields.io/github/license/pravinyo/AudioBook)
 
@@ -31,6 +31,26 @@ This App is based on Single Activity Navigation. Each Fragment screen is develop
 # Dependency Graph of the Project:
 ![AudioBook](/photos/dependencies_graph.png)
 
+# Screenshots
+<p float="left">
+  <img src="/photos/mainscreen.png" width="200" />
+  <img src="/photos/bookdetails.png" width="200" />
+  <img src="/photos/listen_later.png" width="200" />
+  <img src="/photos/mybooks.png" width="200" />
+</p>
+
+
+# Release: 6.2.2
+## :beetle: Bug Fixes
+
+- UI fixes and testing enhancement [#133](https://github.com/pravinyo/AudioBook/pull/133)
+
+## :heart: Contributors
+
+We'd like to thank all the contributors who worked on this release!
+
+- [@pravinyo](https://github.com/pravinyo)
+
 # Release: 6.2.0
 ## :star: New Features
 

app/build.gradle

@@ -56,6 +56,10 @@ android {
         returnDefaultValues = true
     }
 
+    adbOptions {
+        installOptions '-g', '-r'
+    }
+
 //    dynamicFeatures = [":feature_book", ":feature_book_details"]
 
 
@@ -99,4 +103,38 @@ dependencies {
     androidTestImplementation(TestLibraryDependency.ANDROID_X_EXT_TESTING)
     androidTestImplementation(TestLibraryDependency.ESPRESSO_CORE)
     androidTestImplementation(TestLibraryDependency.ESPRESSO_CONTRIB)
-}
+}
+
+def reportsDirectory = "$buildDir/reports/androidTests/connected"
+
+def clearScreenshotsTask = task('clearScreenshots', type: Exec) {
+    executable "${android.getAdbExe().toString()}"
+    args 'shell', 'rm', '-r', '/sdcard/Pictures/audioBook_test_folder'
+}
+
+def createScreenshotDirectoryTask = task('createScreenshotDirectory', type: Exec, group: 'reporting') {
+    executable "${android.getAdbExe().toString()}"
+    args 'shell', 'mkdir', '-p', '/sdcard/Pictures/audioBook_test_folder'
+}
+
+def fetchScreenshotsTask = task('fetchScreenshots', type: Exec, group: 'reporting') {
+    executable "${android.getAdbExe().toString()}"
+    args 'pull', '/sdcard/Pictures/audioBook_test_folder/.', reportsDirectory
+    finalizedBy {
+        clearScreenshotsTask
+    }
+
+    dependsOn {
+        createScreenshotDirectoryTask
+    }
+
+    doFirst {
+        new File(reportsDirectory).mkdirs()
+    }
+}
+
+task copyScreenshotToMachine{ task ->
+    task.finalizedBy {
+        fetchScreenshotsTask
+    }
+}

app/src/androidTest/java/com/allsoftdroid/audiobook/presentation/MainActivityTest.kt

@@ -7,12 +7,14 @@ import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.action.ViewActions.*
 import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.NavigationViewActions
 import androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition
 import androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition
 import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import com.allsoftdroid.audiobook.R
+import com.allsoftdroid.audiobook.presentation.utils.TakeScreenshotUtils.takeScreenshot
 import com.allsoftdroid.common.test.DataBindingIdlingResource
 import com.allsoftdroid.common.test.EspressoIdlingResource
 import com.allsoftdroid.common.test.monitorActivity
@@ -46,7 +48,10 @@ class MainActivityTest{
 
         onView(withId(R.id.toolbar_title)).check(matches(withText("Latest Audio Books")))
 
-        onView(withId(R.id.toolbar_downloads)).perform(click())
+        onView(withId(R.id.toolbar_nav_hamburger)).perform(click())
+
+        onView(withId(R.id.nav_view))
+            .perform(NavigationViewActions.navigateTo(R.id.nav_item_downloads))
 
         pressBack()
 
@@ -70,13 +75,16 @@ class MainActivityTest{
         onView(withId(R.id.toolbar_book_search)).perform(click())
 
         onView(withId(R.id.et_toolbar_search)).check(matches(isDisplayed()))
-        onView(withId(R.id.et_toolbar_search)).perform(clearText(), typeText("poem"))
+        onView(withId(R.id.et_toolbar_search)).perform(clearText(), typeText("penny catechism"))
 
         onView(withId(R.id.iv_search)).check(matches(isDisplayed()))
         onView(withId(R.id.iv_search)).perform(click())
 
 
-        Thread.sleep(7000)
+        Thread.sleep(4000)
+
+        takeScreenshot(parentFolderPath = "Search", screenShotName = "search_results")
+
         onView(withId(R.id.recycler_view_books))
             .check(matches(hasMinimumChildCount(1)))
 
@@ -89,14 +97,20 @@ class MainActivityTest{
         dataBindingIdlingResource.monitorActivity(activityScenario)
 
         Thread.sleep(10000)
+
+        takeScreenshot(parentFolderPath = "MainScreen", screenShotName = "MainScreen")
+
         onView(withId(R.id.recycler_view_books))
-            .perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(0,click()))
+            .perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(3,click()))
 
         onView(withId(R.id.tv_toolbar_title)).check(matches(isDisplayed()))
 
         onView(withId(R.id.btn_toolbar_back_arrow)).check(matches(isDisplayed()))
 
-        onView(withId(R.id.textView_description)).check(matches(isDisplayed()))
+        onView(withId(R.id.textView_book_intro)).check(matches(isDisplayed()))
+
+        Thread.sleep(4000)
+        takeScreenshot(parentFolderPath = "Book details", screenShotName = "BookDetails")
 
         pressBack()
 
@@ -126,22 +140,38 @@ class MainActivityTest{
 
         Thread.sleep(10000)
         onView(withId(R.id.recycler_view_books))
-            .perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(0,click()))
+            .perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(3,click()))
 
         onView(withId(R.id.tv_toolbar_title)).check(matches(isDisplayed()))
 
         onView(withId(R.id.btn_toolbar_back_arrow)).check(matches(isDisplayed()))
 
-        onView(withId(R.id.textView_description)).check(matches(isDisplayed()))
+        onView(withId(R.id.textView_book_intro)).check(matches(isDisplayed()))
 
         Thread.sleep(4000)
         onView(withId(R.id.recyclerView))
             .perform(actionOnItemAtPosition<RecyclerView.ViewHolder>(0,click()))
 
 
         Thread.sleep(2000)
-        onView(withId(R.id.miniPlayerContainer)).check(matches(isDisplayed()))
+        takeScreenshot(parentFolderPath = "MiniPlayer", screenShotName = "MiniPlayer")
+
+        activityScenario.close()
+    }
+
+    @Test
+    fun listen_later_from_BookDetailsScreen_DisplayInUi(){
+        val activityScenario = ActivityScenario.launch(MainActivity::class.java)
+        dataBindingIdlingResource.monitorActivity(activityScenario)
+
+        onView(withId(R.id.toolbar_nav_hamburger)).perform(click())
+
+        onView(withId(R.id.nav_view))
+            .perform(NavigationViewActions.navigateTo(R.id.nav_item_listen_later))
+
+        Thread.sleep(2000)
 
+        takeScreenshot(parentFolderPath = "Listenlater", screenShotName = "listen_later")
 
         activityScenario.close()
     }

app/src/androidTest/java/com/allsoftdroid/audiobook/presentation/utils/ScreenCaptureProcessor.kt

@@ -0,0 +1,21 @@
+package com.allsoftdroid.audiobook.presentation.utils
+
+import android.os.Environment.DIRECTORY_PICTURES
+import android.os.Environment.getExternalStoragePublicDirectory
+import androidx.test.runner.screenshot.BasicScreenCaptureProcessor
+import java.io.File
+
+class ScreenCaptureProcessor(parentFolderPath: String) : BasicScreenCaptureProcessor() {
+
+    init {
+        this.mDefaultScreenshotPath = File(
+            File(
+                getExternalStoragePublicDirectory(DIRECTORY_PICTURES),
+                "audioBook_test_folder"
+            ).absolutePath,
+            "screenshots/$parentFolderPath"
+        )
+    }
+
+    override fun getFilename(prefix: String): String = prefix
+}

app/src/androidTest/java/com/allsoftdroid/audiobook/presentation/utils/TakeScreenshotUtils.kt

@@ -0,0 +1,22 @@
+package com.allsoftdroid.audiobook.presentation.utils
+
+import androidx.test.runner.screenshot.Screenshot
+import timber.log.Timber
+import java.io.IOException
+
+object TakeScreenshotUtils {
+    fun takeScreenshot(parentFolderPath: String = "", screenShotName: String) {
+        Timber.d("Taking screenshot of '$screenShotName'")
+        val screenCapture = Screenshot.capture()
+        val processors = setOf(ScreenCaptureProcessor(parentFolderPath))
+        try {
+            screenCapture.apply {
+                name = screenShotName
+                process(processors)
+            }
+            Timber.d("Screenshot taken")
+        } catch (ex: IOException) {
+            Timber.d("Could not take the screenshot: $ex")
+        }
+    }
+}