From c753ad3dd301be7355836535374daeb050dad41b Mon Sep 17 00:00:00 2001
From: Leo Neat <lneat@google.com>
Date: Fri, 29 May 2020 12:19:18 -0700
Subject: [PATCH 1/5] Iterations for test suites

---
 .../mediacontroller/MediaAppTestSuite.kt      | 207 ++++++++++++------
 .../MediaAppTestingActivity.kt                |  42 ++--
 .../res/layout/media_test_suite_result.xml    |   7 -
 .../main/res/layout/run_suite_iter_dialog.xml |  38 ++++
 .../src/main/res/values/testing_strings.xml   |   5 +-
 5 files changed, 201 insertions(+), 98 deletions(-)
 create mode 100644 mediacontroller/src/main/res/layout/run_suite_iter_dialog.xml

diff --git a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt
index c536e0f..43df6a7 100644
--- a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt
+++ b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt
@@ -15,6 +15,7 @@
  */
 package com.example.android.mediacontroller
 
+import android.animation.ArgbEvaluator
 import android.app.Dialog
 import android.content.Context
 import android.content.SharedPreferences
@@ -26,20 +27,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.Window
-import android.widget.Button
-import android.widget.LinearLayout
-import android.widget.ScrollView
-import android.widget.TextView
+import android.widget.*
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.animation.ArgbEvaluatorCompat
 import kotlinx.android.synthetic.main.media_test_option.view.card_header
 import kotlinx.android.synthetic.main.media_test_option.view.card_text
-import kotlinx.android.synthetic.main.media_test_suite_result.view.tests_passing_header
-import kotlinx.android.synthetic.main.media_test_suite_result.view.loading_bar
-import kotlinx.android.synthetic.main.media_test_suite_result.view.tests_passing
-import kotlinx.android.synthetic.main.media_test_suite_result.view.total_tests
+import kotlinx.android.synthetic.main.media_test_suite_result.view.*
 import java.util.concurrent.Semaphore
 import kotlin.concurrent.thread
 
@@ -47,34 +43,56 @@ import kotlin.concurrent.thread
 class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, testList:
     Array<TestOptionDetails>, private val testSuiteResultsLayout: RecyclerView, context: Context) {
 
+    private val SLEEP_TIME = 1000L
+    private val TAG = "MediaAppTestSuite"
+    private val PASSING_COLOR = ContextCompat.getColor(context, R.color.test_result_pass)
+    private val FAILING_COLOR = ContextCompat.getColor(context, R.color.test_result_fail)
+
     val name = testSuiteName
     val description = testSuiteDescription
     private val singleSuiteTestList = testList
     val context = context
-    private val resultsAdapter = ResultsAdapter(singleSuiteTestList)
+    private var resultsAdapter = ResultsAdapter(singleSuiteTestList)
     private val testSemaphore = Semaphore(1)
     private val mHandler = Handler(Looper.getMainLooper())
-    private val iDToPositionMap = hashMapOf<Int, Int>()
-    private val TAG = "MediaAppTestSuite"
+    private val positionToIDMap = hashMapOf<Int, Int>()
+    private val iDToResultsMap = hashMapOf<Int, TestCaseResults>()
     private var suiteRunning = false
-    private var screenHeight = 0
-    private val SLEEP_TIME = 1000L
+    private var argbEvaluator = ArgbEvaluator()
     private val sharedPreferences: SharedPreferences
+    private lateinit var suiteThread: Thread
+
 
     init {
         for (i in testList.indices) {
-            iDToPositionMap[testList[i].id] = i
+            positionToIDMap[i] = testList[i].id
+            iDToResultsMap[testList[i].id] = TestCaseResults()
         }
-        context.applicationContext
         sharedPreferences = context.getSharedPreferences(MediaAppTestingActivity.SHARED_PREF_KEY_SUITE_CONFIG, Context.MODE_PRIVATE)
     }
 
-    val callback = { result: TestResult, testId: Int, testLogs: ArrayList<String> ->
-        val index = iDToPositionMap[testId]
-        Log.d(TAG, "Finished Test: " + testList[index!!].name + " with result " + result)
-        testList[index].testResult = result
-        testList[index].testLogs = testLogs
-        mHandler.post { resultsAdapter.notifyItemChanged(index) }
+    private val callback = { result: TestResult, testId: Int, testLogs: ArrayList<String> ->
+        val testCaseResults = iDToResultsMap[testId]!!
+        Log.d(TAG, "Finished Test: $testId with result $result")
+        testCaseResults.totalRuns += 1
+        when (result) {
+            TestResult.PASS -> {
+                testCaseResults.numPassing += 1
+                testCaseResults.passingLogs.add(testLogs)
+            }
+            TestResult.FAIL -> {
+                testCaseResults.failingLogs.add(testLogs)
+            }
+            TestResult.OPTIONAL_FAIL -> {
+                testCaseResults.failingLogs.add(testLogs)
+            }
+            TestResult.CONFIG_REQUIRED -> {
+                testCaseResults.totalRuns -= 1
+            }
+            else -> {
+                Log.d(TAG, "There was an error with $testId return code")
+            }
+        }
         testSemaphore.release()
     }
 
@@ -93,48 +111,108 @@ class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, tes
     }
 
     fun runSuite(numIter: Int) {
-        suiteRunning = true
         resetTests()
-        thread(start = true) {
+        var progressBar :ProgressBar
+        val dialog = Dialog(context)
+        dialog.apply {
+            setCancelable(false)
+            requestWindowFeature(Window.FEATURE_NO_TITLE)
+            setContentView(R.layout.run_suite_iter_dialog)
+            progressBar = findViewById<ProgressBar>(R.id.suite_iter_progress_bar).apply {
+                max = numIter * singleSuiteTestList.size
+                progress = -1
+            }
+            findViewById<Button>(R.id.quit_suite_iter_button).setOnClickListener{
+                interrupt()
+                dismiss()
+            }
+            window.setLayout(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+        }.show()
+        runSuiteImpl(dialog, progressBar, numIter)
+    }
+
+    private fun runSuiteImpl(dialog: Dialog, progressBar: ProgressBar, numIter: Int){
+        resultsAdapter = ResultsAdapter(singleSuiteTestList)
+        suiteRunning = true
+        suiteThread = thread(start = true) {
             Looper.prepare()
-            for (test in singleSuiteTestList) {
-                // Flush out any residual media control commands from previous test
-                Thread.sleep(SLEEP_TIME)
-
-                // In the event that a query is not specified, don't run the test.
-                var query = sharedPreferences.getString(test.name, MediaAppTestingActivity.NO_CONFIG)
-                if (test.queryRequired && query == MediaAppTestingActivity.NO_CONFIG) {
-                    test.testResult = TestResult.CONFIG_REQUIRED
-                    val index = iDToPositionMap[test.id]
-                    mHandler.post { resultsAdapter.notifyItemChanged(index!!) }
-                    continue
-                }
+            try {
+                for(i in 0 until numIter) {
+                    for (test in singleSuiteTestList) {
+                        resetSingleResults()
+                        progressBar.incrementProgressBy(1)
+
+                        // Flush out any residual media control commands from previous test
+                        Thread.sleep(SLEEP_TIME)
+
+                        // In the event that a query is not specified, don't run the test.
+                        var query = sharedPreferences.getString(test.name, MediaAppTestingActivity.NO_CONFIG)
+                        if (test.queryRequired && query == MediaAppTestingActivity.NO_CONFIG) {
+                            test.testResult = TestResult.CONFIG_REQUIRED
+                            val index = positionToIDMap[test.id]
+                            mHandler.post { resultsAdapter.notifyItemChanged(index!!) }
+                            continue
+                        }
 
-                if (query == MediaAppTestingActivity.NO_CONFIG){
-                    query = ""
+                        if (query == MediaAppTestingActivity.NO_CONFIG) {
+                            query = ""
+                        }
+                        testSemaphore.acquire()
+                        test.runTest(query, callback, test.id)
+                    }
                 }
-                testSemaphore.acquire()
-                test.runTest(query, callback, test.id)
+            } catch(e: InterruptedException){
+                Thread.currentThread().interrupt()
             }
             suiteRunning = false
+            mHandler.post {
+                Log.i(TAG, "Starting to display results")
+                displayResults()
+                Log.i(TAG, "Finished displaying results")
+                dialog.dismiss()
+            }
         }
-        displayResults()
     }
 
-    private fun resetTests() {
+    private fun interrupt(){
+        if (!this::suiteThread.isInitialized){
+            return
+        }
+        suiteThread.interrupt()
+        suiteRunning = false
+        resetTests()
+    }
+
+    private fun resetSingleResults(){
         for (test in singleSuiteTestList) {
             test.testResult = TestResult.NONE
             test.testLogs = Test.NO_LOGS
-            mHandler.post { resultsAdapter.notifyItemChanged(test.id) }
         }
     }
 
+    private fun resetTests() {
+        resetSingleResults()
+        for (test in singleSuiteTestList) {
+            iDToResultsMap[test.id] = TestCaseResults()
+        }
+        resultsAdapter = ResultsAdapter(arrayOf<TestOptionDetails>())
+        testSuiteResultsLayout.removeAllViews()
+        displayResults()
+    }
+
     private fun displayResults() {
         testSuiteResultsLayout.layoutManager = LinearLayoutManager(context)
         testSuiteResultsLayout.setHasFixedSize(true)
         testSuiteResultsLayout.adapter = resultsAdapter
     }
 
+    inner class TestCaseResults() {
+        var totalRuns = 0
+        var numPassing = 0
+        var passingLogs = arrayListOf<ArrayList<String>>()
+        var failingLogs = arrayListOf<ArrayList<String>>()
+    }
+
     // Adapter to display test result details
     inner class ResultsAdapter(
             private val tests: Array<TestOptionDetails>
@@ -151,44 +229,28 @@ class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, tes
         }
 
         override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+            val testID = positionToIDMap[position]
+            val testCaseResults = iDToResultsMap[testID]!!
             holder.cardView.card_header.text = tests[position].name
             holder.cardView.card_text.text = tests[position].desc
-            holder.cardView.total_tests.text = "1"
-            when (tests[position].testResult) {
-                TestResult.PASS -> {
-                    holder.cardView.tests_passing.text = "1"
-                    holder.cardView.loading_bar.visibility = View.INVISIBLE
-                    holder.cardView.tests_passing_header.text = context.getString(R.string.test_suite_results_passing_header)
-                    holder.cardView.setCardBackgroundColor(ContextCompat.getColor(context, R.color.test_result_pass))
-                }
-                TestResult.FAIL -> {
-                    holder.cardView.tests_passing.text = "0"
-                    holder.cardView.loading_bar.visibility = View.INVISIBLE
-                    holder.cardView.tests_passing_header.text = context.getString(R.string.test_suite_results_passing_header)
-                    holder.cardView.setCardBackgroundColor(ContextCompat.getColor(context, R.color.test_result_fail))
-                }
-                TestResult.CONFIG_REQUIRED -> {
-                    holder.cardView.tests_passing.text = context.getString(R.string.test_suite_unknown)
-                    holder.cardView.tests_passing_header.text = context.getString(R.string.test_suite_config_needed_header)
-                    holder.cardView.loading_bar.visibility = View.INVISIBLE
-                    holder.cardView.setCardBackgroundColor(Color.GRAY)
-                }
-                else -> {
-                    holder.cardView.tests_passing.text = context.getString(R.string.test_suite_unknown)
-                    holder.cardView.loading_bar.visibility = View.VISIBLE
-                    holder.cardView.tests_passing_header.text = context.getString(R.string.test_suite_results_passing_header)
-                    holder.cardView.setCardBackgroundColor(Color.WHITE)
-                }
+            holder.cardView.total_tests.text = testCaseResults.totalRuns.toString()
+            holder.cardView.tests_passing.text = testCaseResults.numPassing.toString()
+            if(testCaseResults.totalRuns == 0){
+                holder.cardView.tests_passing_header.text = context.getString(R.string.test_suite_config_needed_header)
+                holder.cardView.setCardBackgroundColor(Color.GRAY)
+                return
             }
-            val onResultsClickedListener = OnResultsClickedListener(tests[position], this@MediaAppTestSuite.context)
-            holder.cardView.setOnClickListener(onResultsClickedListener)
+            val passPercentage = testCaseResults.numPassing.toFloat() / testCaseResults.totalRuns.toFloat()
+            holder.cardView.setCardBackgroundColor((argbEvaluator.evaluate(passPercentage, FAILING_COLOR, PASSING_COLOR )) as Int)
+            //val onResultsClickedListener = OnResultsClickedListener(testID, this@MediaAppTestSuite.context)
+            //holder.cardView.setOnClickListener(onResultsClickedListener)
         }
 
         override fun getItemCount() = tests.size
     }
 
-
-    inner class OnResultsClickedListener(private val testDetails: TestOptionDetails, val context: Context) : View.OnClickListener {
+/*
+    inner class OnResultsClickedListener(private val testId: Int, val context: Context) : View.OnClickListener {
 
         override fun onClick(p0: View?) {
             var dialog = Dialog(context)
@@ -215,4 +277,5 @@ class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, tes
             dialog.show()
         }
     }
+    */
 }
\ No newline at end of file
diff --git a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt
index 577a525..cb85290 100644
--- a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt
+++ b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt
@@ -34,13 +34,7 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.util.DisplayMetrics
 import android.util.Log
-import android.view.View
-import android.view.ViewGroup
-import android.view.MenuItem
-import android.view.Menu
-import android.view.LayoutInflater
-import android.view.Window
-import android.view.WindowManager
+import android.view.*
 import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -89,11 +83,7 @@ import kotlinx.android.synthetic.main.media_test_suites.test_suite_num_iter
 import kotlinx.android.synthetic.main.media_tests.test_results_container
 import kotlinx.android.synthetic.main.media_tests.tests_query
 import kotlinx.android.synthetic.main.media_tests.test_options_list
-import kotlinx.android.synthetic.main.test_suite_configure_dialog.test_to_configure_list
-import kotlinx.android.synthetic.main.test_suite_configure_dialog.reset_results_button
-import kotlinx.android.synthetic.main.test_suite_configure_dialog.subtitle
-import kotlinx.android.synthetic.main.test_suite_configure_dialog.title
-import kotlinx.android.synthetic.main.test_suite_configure_dialog.done_button
+import kotlinx.android.synthetic.main.test_suite_configure_dialog.*
 
 
 class MediaAppTestingActivity : AppCompatActivity() {
@@ -501,7 +491,7 @@ class MediaAppTestingActivity : AppCompatActivity() {
                 if (numIter == null) {
                     Toast.makeText(this@MediaAppTestingActivity, getText(R.string.test_suite_error_invalid_iter), Toast.LENGTH_SHORT).show()
 
-                } else if (numIter > 100 || numIter < 1) {
+                } else if (numIter > MAX_NUM_ITER || numIter < 1) {
                     Toast.makeText(this@MediaAppTestingActivity, getText(R.string.test_suite_error_invalid_iter), Toast.LENGTH_SHORT).show()
                 } else if (isSuiteRunning()) {
                     Toast.makeText(this@MediaAppTestingActivity, getText(R.string.test_suite_already_running), Toast.LENGTH_SHORT).show()
@@ -545,9 +535,12 @@ class MediaAppTestingActivity : AppCompatActivity() {
             holder.cardView.test_query_config.addTextChangedListener(object : TextWatcher {
 
                 override fun afterTextChanged(s: Editable) {
-                    sharedPreferences.edit().apply {
-                        putString(test.name, holder.cardView.test_query_config.text.toString())
-                    }.apply()
+                    val newText = holder.cardView.test_query_config.text.toString()
+                    if (newText != "") {
+                        sharedPreferences.edit().apply {
+                            putString(test.name, holder.cardView.test_query_config.text.toString())
+                        }.apply()
+                    }
                 }
 
                 override fun beforeTextChanged(s: CharSequence, start: Int,
@@ -933,9 +926,9 @@ class MediaAppTestingActivity : AppCompatActivity() {
         val commonTests = arrayOf(
                 browseTreeDepthTest,
                 mediaArtworkTest,
-                contentStyleTest,
+                //TODO FIX contentStyleTest,
                 customActionIconTypeTest,
-                supportsSearchTest,
+                //TODO: FIX supportsSearchTest,
                 initialPlaybackStateTest
         )
 
@@ -1237,6 +1230,9 @@ class MediaAppTestingActivity : AppCompatActivity() {
         private const val APP_DETAILS_EXTRA =
                 "com.example.android.mediacontroller.APP_DETAILS_EXTRA"
 
+        // The max number of test suite iterations
+        private const val MAX_NUM_ITER = 10
+
         // Key name used for saving/restoring instance state.
         private const val STATE_APP_DETAILS_KEY =
                 "com.example.android.mediacontroller.STATE_APP_DETAILS_KEY"
@@ -1272,5 +1268,15 @@ class MediaAppTestingActivity : AppCompatActivity() {
             display.getMetrics(displayMetrics)
             return displayMetrics.heightPixels
         }
+
+        // Gets the current screen width in pixels
+        fun getScreenWidthPx(context: Context): Int {
+            val displayMetrics = DisplayMetrics()
+            val windowManager = getSystemService(context, WindowManager::class.java)
+                    ?: throw IllegalStateException("Could not get WindowManager")
+            val display = windowManager.defaultDisplay
+            display.getMetrics(displayMetrics)
+            return displayMetrics.widthPixels
+        }
     }
 }
diff --git a/mediacontroller/src/main/res/layout/media_test_suite_result.xml b/mediacontroller/src/main/res/layout/media_test_suite_result.xml
index 53b16c3..b6beb77 100644
--- a/mediacontroller/src/main/res/layout/media_test_suite_result.xml
+++ b/mediacontroller/src/main/res/layout/media_test_suite_result.xml
@@ -45,13 +45,6 @@
                 android:layout_weight="1"
                 style="@style/SubHeader"/>
 
-            <ProgressBar
-                android:id="@+id/loading_bar"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="visible"
-                android:layout_weight="4" />
-
         </LinearLayout>
 
         <TextView
diff --git a/mediacontroller/src/main/res/layout/run_suite_iter_dialog.xml b/mediacontroller/src/main/res/layout/run_suite_iter_dialog.xml
new file mode 100644
index 0000000..6723db3
--- /dev/null
+++ b/mediacontroller/src/main/res/layout/run_suite_iter_dialog.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/run_suite_iter_dialog"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ProgressBar
+        android:id="@+id/suite_iter_progress_bar"
+        android:layout_margin="@dimen/activity_horizontal_margin"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@android:style/Widget.ProgressBar.Horizontal"/>
+
+
+    <Button
+        android:id="@+id/quit_suite_iter_button"
+        android:layout_width="match_parent"
+        android:layout_margin="@dimen/activity_horizontal_margin"
+        android:layout_height="wrap_content"
+        android:text="@string/cancel_suite_button" />
+</LinearLayout>
\ No newline at end of file
diff --git a/mediacontroller/src/main/res/values/testing_strings.xml b/mediacontroller/src/main/res/values/testing_strings.xml
index 1711e93..5c97a02 100644
--- a/mediacontroller/src/main/res/values/testing_strings.xml
+++ b/mediacontroller/src/main/res/values/testing_strings.xml
@@ -44,12 +44,13 @@
     <string name="test_suite_results_passing_header">Passing: </string>
     <string name="test_suite_results_passing_default">0</string>
     <string name="test_suite_config_needed_header">Configuration Required for testing: </string>
+    <string name="test_suite_optional_fail_header">Optional test: </string>
     <string name="test_suite_results_total_default">0</string>
     <string name="test_suite_open_paren">(</string>
     <string name="test_suite_close_paren">)</string>
     <string name="test_suite_divide">/</string>
     <string name="test_suite_unknown">?</string>
-    <string name= "test_suite_error_invalid_iter">Invalid iteration number, must be between (1..100).</string>
+    <string name= "test_suite_error_invalid_iter">Invalid iteration number, must be between (1..10).</string>
     <string name= "test_suite_already_running">Please wait for current test suite to finish.</string>
     <string name="close_results_button">Close</string>
     <string name="configure_button">Configure</string>
@@ -57,6 +58,7 @@
     <string name="reset_button_text">Reset</string>
     <string name="query_hint">Query</string>
     <string name="run_suite_button">Run Suite</string>
+    <string name="cancel_suite_button">Cancel Suite</string>
 
 
     <!-- Logs Toggle -->
@@ -205,4 +207,5 @@
     <!-- For example, the command `adb shell input text hello%sworld` will add the string "hello world" to the input field (%s indicates a space) -->
     <string name="tv_text_input">%s\nSelect this test to open the query input field. To input text via adb, enter `adb shell input text [query]`.</string>
     <string name="tv_text_input_with_query">%s\nSelect this test to open the query input field. To input text via adb, enter `adb shell input text [query]`.\n\nEntered query: [%s]</string>
+
 </resources>

From 3f78b240e14f4c94ade64cd68e173314f0d563e1 Mon Sep 17 00:00:00 2001
From: Leo Neat <lneat@google.com>
Date: Fri, 29 May 2020 14:41:03 -0700
Subject: [PATCH 2/5] Documentation

---
 .../mediacontroller/MediaAppTestSuite.kt      | 265 +++++++++++++-----
 .../MediaAppTestingActivity.kt                |  10 +-
 .../main/res/layout/run_suite_iter_dialog.xml |   9 +
 .../res/layout/test_suite_results_dialog.xml  |  36 ++-
 .../src/main/res/values/testing_strings.xml   |   5 +
 5 files changed, 244 insertions(+), 81 deletions(-)

diff --git a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt
index 43df6a7..7e98c73 100644
--- a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt
+++ b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt
@@ -23,16 +23,12 @@ import android.graphics.Color
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.Window
+import android.view.*
 import android.widget.*
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.animation.ArgbEvaluatorCompat
 import kotlinx.android.synthetic.main.media_test_option.view.card_header
 import kotlinx.android.synthetic.main.media_test_option.view.card_text
 import kotlinx.android.synthetic.main.media_test_suite_result.view.*
@@ -40,30 +36,73 @@ import java.util.concurrent.Semaphore
 import kotlin.concurrent.thread
 
 
-class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, testList:
-    Array<TestOptionDetails>, private val testSuiteResultsLayout: RecyclerView, context: Context) {
+class MediaAppTestSuite(val testSuiteName: String, val testSuiteDescription: String, private val testList:
+    Array<TestOptionDetails>, private val testSuiteResultsLayout: RecyclerView, val context: Context) {
+    
+    private val TAG = "MediaAppTestSuite"
 
+    /**
+     * Sleep time after a single test was run. Assures that all steps are flushed out.
+     */
     private val SLEEP_TIME = 1000L
-    private val TAG = "MediaAppTestSuite"
+
+    /**
+     * The color that is associated with passing tests.
+     */
     private val PASSING_COLOR = ContextCompat.getColor(context, R.color.test_result_pass)
+
+    /**
+     * The color that is associated with failing tests.
+     */
     private val FAILING_COLOR = ContextCompat.getColor(context, R.color.test_result_fail)
 
-    val name = testSuiteName
-    val description = testSuiteDescription
-    private val singleSuiteTestList = testList
-    val context = context
-    private var resultsAdapter = ResultsAdapter(singleSuiteTestList)
+    /**
+     * Adapter for displaying individual tests results.
+     */
+    private var resultsAdapter = ResultsAdapter(this.testList)
+
+    /**
+     * Semaphore to prevent two tests from being run at the same time and interfering with each other.
+     */
     private val testSemaphore = Semaphore(1)
+
+    /**
+     * Main thread handler.
+     */
     private val mHandler = Handler(Looper.getMainLooper())
+
+    /**
+     * Map relating tests positioning in the adapter to the tests ID.
+     */
     private val positionToIDMap = hashMapOf<Int, Int>()
+
+    /**
+     * Map relating the tests ID to the result struct.
+     */
     private val iDToResultsMap = hashMapOf<Int, TestCaseResults>()
+
+    /**
+     * Boolean to prevent more than one suite from being running at a single time
+     */
     private var suiteRunning = false
+
+    /**
+     * Object that is used to generate colors for partly passing tests.
+     */
     private var argbEvaluator = ArgbEvaluator()
+
+    /**
+     * Used to retrieve test configurations.
+     */
     private val sharedPreferences: SharedPreferences
-    private lateinit var suiteThread: Thread
 
+    /**
+     * Thread to handle all of the test suite operations.
+     */
+    private lateinit var suiteThread: Thread
 
     init {
+        // Resets all of the test case results and gets config data.
         for (i in testList.indices) {
             positionToIDMap[i] = testList[i].id
             iDToResultsMap[testList[i].id] = TestCaseResults()
@@ -71,34 +110,12 @@ class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, tes
         sharedPreferences = context.getSharedPreferences(MediaAppTestingActivity.SHARED_PREF_KEY_SUITE_CONFIG, Context.MODE_PRIVATE)
     }
 
-    private val callback = { result: TestResult, testId: Int, testLogs: ArrayList<String> ->
-        val testCaseResults = iDToResultsMap[testId]!!
-        Log.d(TAG, "Finished Test: $testId with result $result")
-        testCaseResults.totalRuns += 1
-        when (result) {
-            TestResult.PASS -> {
-                testCaseResults.numPassing += 1
-                testCaseResults.passingLogs.add(testLogs)
-            }
-            TestResult.FAIL -> {
-                testCaseResults.failingLogs.add(testLogs)
-            }
-            TestResult.OPTIONAL_FAIL -> {
-                testCaseResults.failingLogs.add(testLogs)
-            }
-            TestResult.CONFIG_REQUIRED -> {
-                testCaseResults.totalRuns -= 1
-            }
-            else -> {
-                Log.d(TAG, "There was an error with $testId return code")
-            }
-        }
-        testSemaphore.release()
-    }
-
+    /**
+     * Gets all of the tests that can be configured from a specific suite.
+     */
     fun getConfigurableTests(): ArrayList<TestOptionDetails> {
         var configTests = ArrayList<TestOptionDetails>()
-        for (test in singleSuiteTestList) {
+        for (test in testList) {
             if (test.queryRequired) {
                 configTests.add(test)
             }
@@ -106,10 +123,18 @@ class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, tes
         return configTests
     }
 
+    /**
+     * Returns true if the test suite is currently running.
+     */
     fun suiteIsRunning(): Boolean {
         return suiteRunning
     }
 
+    /**
+     * Runs a single test suite a specified number of iterations.
+     *
+     * @param numIter - The number of iterations to run the test suite.
+     */
     fun runSuite(numIter: Int) {
         resetTests()
         var progressBar :ProgressBar
@@ -119,7 +144,7 @@ class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, tes
             requestWindowFeature(Window.FEATURE_NO_TITLE)
             setContentView(R.layout.run_suite_iter_dialog)
             progressBar = findViewById<ProgressBar>(R.id.suite_iter_progress_bar).apply {
-                max = numIter * singleSuiteTestList.size
+                max = numIter * testList.size
                 progress = -1
             }
             findViewById<Button>(R.id.quit_suite_iter_button).setOnClickListener{
@@ -131,14 +156,21 @@ class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, tes
         runSuiteImpl(dialog, progressBar, numIter)
     }
 
+    /**
+     * Runs the full test suite a fixed number of times.
+     *
+     * @param dialog - The loading dialog to close when the suite is finished running.
+     * @param progressBar - The progress bar to update with the suites status.
+     * @param numIter - The number of times to run the test suite.
+     */
     private fun runSuiteImpl(dialog: Dialog, progressBar: ProgressBar, numIter: Int){
-        resultsAdapter = ResultsAdapter(singleSuiteTestList)
+        resultsAdapter = ResultsAdapter(testList)
         suiteRunning = true
         suiteThread = thread(start = true) {
             Looper.prepare()
             try {
                 for(i in 0 until numIter) {
-                    for (test in singleSuiteTestList) {
+                    for (test in testList) {
                         resetSingleResults()
                         progressBar.incrementProgressBy(1)
 
@@ -174,6 +206,41 @@ class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, tes
         }
     }
 
+    /**
+     * A call back function for when a test has finished. Releases the test semaphore
+     *
+     * @param result - A TestResult result code.
+     * @param testId - The specific identifier associated with the finished tests.
+     * @param testLogs - The logs associated with the finished test.
+     */
+    private val callback = { result: TestResult, testId: Int, testLogs: ArrayList<String> ->
+        val testCaseResults = iDToResultsMap[testId]!!
+        Log.d(TAG, "Finished Test: $testId with result $result")
+        testCaseResults.totalRuns += 1
+        when (result) {
+            TestResult.PASS -> {
+                testCaseResults.numPassing += 1
+                testCaseResults.passingLogs.add(testLogs)
+            }
+            TestResult.FAIL -> {
+                testCaseResults.failingLogs.add(testLogs)
+            }
+            TestResult.OPTIONAL_FAIL -> {
+                testCaseResults.failingLogs.add(testLogs)
+            }
+            TestResult.CONFIG_REQUIRED -> {
+                testCaseResults.totalRuns -= 1
+            }
+            else -> {
+                Log.d(TAG, "There was an error with $testId return code")
+            }
+        }
+        testSemaphore.release()
+    }
+
+    /**
+     * Interrupts the test suite and resets its all of its results.
+     */
     private fun interrupt(){
         if (!this::suiteThread.isInitialized){
             return
@@ -183,16 +250,22 @@ class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, tes
         resetTests()
     }
 
+    /**
+     * Resets a single test result.
+     */
     private fun resetSingleResults(){
-        for (test in singleSuiteTestList) {
+        for (test in testList) {
             test.testResult = TestResult.NONE
             test.testLogs = Test.NO_LOGS
         }
     }
 
+    /**
+     * Resets all of the test results associated with the suite.
+     */
     private fun resetTests() {
         resetSingleResults()
-        for (test in singleSuiteTestList) {
+        for (test in testList) {
             iDToResultsMap[test.id] = TestCaseResults()
         }
         resultsAdapter = ResultsAdapter(arrayOf<TestOptionDetails>())
@@ -200,12 +273,19 @@ class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, tes
         displayResults()
     }
 
+
+    /**
+     * Displays the test suite results using a RecyclerView.
+     */
     private fun displayResults() {
         testSuiteResultsLayout.layoutManager = LinearLayoutManager(context)
         testSuiteResultsLayout.setHasFixedSize(true)
         testSuiteResultsLayout.adapter = resultsAdapter
     }
 
+    /**
+     * Class to store all of a tests resulting info.
+     */
     inner class TestCaseResults() {
         var totalRuns = 0
         var numPassing = 0
@@ -213,7 +293,9 @@ class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, tes
         var failingLogs = arrayListOf<ArrayList<String>>()
     }
 
-    // Adapter to display test result details
+    /**
+     *  Adapter to display each test and the number of associated successes.
+     */
     inner class ResultsAdapter(
             private val tests: Array<TestOptionDetails>
     ) : RecyclerView.Adapter<ResultsAdapter.ViewHolder>() {
@@ -229,53 +311,90 @@ class MediaAppTestSuite(testSuiteName: String, testSuiteDescription: String, tes
         }
 
         override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-            val testID = positionToIDMap[position]
+            val testID = positionToIDMap[position]!!
             val testCaseResults = iDToResultsMap[testID]!!
             holder.cardView.card_header.text = tests[position].name
             holder.cardView.card_text.text = tests[position].desc
             holder.cardView.total_tests.text = testCaseResults.totalRuns.toString()
             holder.cardView.tests_passing.text = testCaseResults.numPassing.toString()
             if(testCaseResults.totalRuns == 0){
+                holder.cardView.setOnClickListener{}
                 holder.cardView.tests_passing_header.text = context.getString(R.string.test_suite_config_needed_header)
                 holder.cardView.setCardBackgroundColor(Color.GRAY)
                 return
             }
             val passPercentage = testCaseResults.numPassing.toFloat() / testCaseResults.totalRuns.toFloat()
             holder.cardView.setCardBackgroundColor((argbEvaluator.evaluate(passPercentage, FAILING_COLOR, PASSING_COLOR )) as Int)
-            //val onResultsClickedListener = OnResultsClickedListener(testID, this@MediaAppTestSuite.context)
-            //holder.cardView.setOnClickListener(onResultsClickedListener)
+            val onResultsClickedListener = OnResultsClickedListener(testID, tests[position].name, tests[position].desc, this@MediaAppTestSuite.context)
+            holder.cardView.setOnClickListener(onResultsClickedListener)
         }
 
         override fun getItemCount() = tests.size
     }
 
-/*
-    inner class OnResultsClickedListener(private val testId: Int, val context: Context) : View.OnClickListener {
+    /**
+     *  Listener for when a specific test result is clicked from the results adapter. Shows logs
+     * for runs associated with the specific tests.
+     */
+    inner class OnResultsClickedListener(private val testId: Int, private val name: String, private val description: String, val context: Context) : View.OnClickListener {
 
         override fun onClick(p0: View?) {
-            var dialog = Dialog(context)
-            dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-            dialog.setContentView(R.layout.test_suite_results_dialog)
-            val results_title = dialog.findViewById(R.id.results_title) as TextView
-            results_title.text = testDetails.name
-            val results_subtitle = dialog.findViewById(R.id.results_subtitle) as TextView
-            results_subtitle.text = testDetails.desc
-            val results_log = dialog.findViewById(R.id.results_log) as LinearLayout
-            if (testDetails.testLogs != Test.NO_LOGS) {
-                results_log.removeAllViews()
-                for (line in testDetails.testLogs) {
-                    val tv_newLine = TextView(context)
-                    tv_newLine.text = line
-                    tv_newLine.setTextAppearance(context, R.style.SubText)
-                    results_log.addView(tv_newLine)
+            var dialog = Dialog(context).apply {
+                requestWindowFeature(Window.FEATURE_NO_TITLE)
+                setContentView(R.layout.test_suite_results_dialog)
+                findViewById<TextView>(R.id.results_title).text = name
+                findViewById<TextView>(R.id.results_subtitle).text = description
+
+                // Add the passing text log section
+                if(iDToResultsMap[testId]!!.passingLogs.isNotEmpty()) {
+                    val passing_results_log = findViewById<LinearLayout>(R.id.passing_results_log)
+                    passing_results_log.removeAllViews()
+                    for (logsList in iDToResultsMap[testId]!!.passingLogs) {
+                        passing_results_log.addView(TextView(context).apply {
+                            text = resources.getString(R.string.test_iter_divider)
+                            setTextAppearance(context, R.style.SubHeader)
+                            gravity = Gravity.CENTER
+                            setTextColor(PASSING_COLOR)
+                        })
+                        for (line in logsList) {
+                            var logLine = TextView(context).apply {
+                                text = line
+
+                                setTextAppearance(context, R.style.SubText)
+                            }
+                            passing_results_log.addView(logLine)
+                        }
+                    }
+                } else {
+                    findViewById<TextView>(R.id.passing_logs_header).visibility = View.GONE
                 }
-            }
-            val close_button = dialog.findViewById(R.id.close_results_button) as Button
-            val results_scroll_view = dialog.findViewById(R.id.results_scroll_view) as ScrollView
-            results_scroll_view.layoutParams.height = (MediaAppTestingActivity.getScreenHeightPx(context) / 2).toInt()
-            close_button.setOnClickListener(View.OnClickListener { dialog.dismiss() })
-            dialog.show()
+
+                // Add the passing text log section
+                if(iDToResultsMap[testId]!!.failingLogs.isNotEmpty()) {
+                    val failing_results_log = findViewById<LinearLayout>(R.id.failing_results_log)
+                    failing_results_log.removeAllViews()
+                    for (logsList in iDToResultsMap[testId]!!.failingLogs) {
+                        failing_results_log.addView(TextView(context).apply {
+                            text = resources.getString(R.string.test_iter_divider)
+                            setTextAppearance(context, R.style.SubHeader)
+                            gravity = Gravity.CENTER
+                            setTextColor(FAILING_COLOR)
+                        })
+                        for (line in logsList) {
+                            var logLine = TextView(context).apply {
+                                text = line
+                                setTextAppearance(context, R.style.SubText)
+                            }
+                            failing_results_log.addView(logLine)
+                        }
+                    }
+                }
+                else {
+                    findViewById<TextView>(R.id.failing_logs_header).visibility = View.GONE
+                }
+                findViewById<ScrollView>(R.id.results_scroll_view).layoutParams.height = (MediaAppTestingActivity.getScreenHeightPx(context) / 2).toInt()
+                findViewById<Button>(R.id.close_results_button).setOnClickListener(View.OnClickListener { dismiss() })
+            }.show()
         }
     }
-    */
 }
\ No newline at end of file
diff --git a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt
index cb85290..db5dda4 100644
--- a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt
+++ b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt
@@ -447,8 +447,8 @@ class MediaAppTestingActivity : AppCompatActivity() {
 
         override fun onBindViewHolder(holder: ViewHolder, position: Int) {
             val testSuite = testSuites[position]
-            holder.cardView.card_header.text = testSuite.name
-            holder.cardView.card_text.text = testSuite.description
+            holder.cardView.card_header.text = testSuite.testSuiteName
+            holder.cardView.card_text.text = testSuite.testSuiteDescription
             holder.cardView.card_button.text = resources.getText(R.string.run_suite_button)
 
             val configurableTests = testSuite.getConfigurableTests()
@@ -461,10 +461,11 @@ class MediaAppTestingActivity : AppCompatActivity() {
                         // Init dialog
                         requestWindowFeature(Window.FEATURE_NO_TITLE)
                         setContentView(R.layout.test_suite_configure_dialog)
-                        title.text = testSuite.name + " Configuration"
-                        subtitle.text = testSuite.description
+                        title.text = testSuite.testSuiteName + " Configuration"
+                        subtitle.text = testSuite.testSuiteDescription
                         test_to_configure_list.layoutManager = LinearLayoutManager(this@MediaAppTestingActivity)
                         test_to_configure_list.layoutParams.height = getScreenHeightPx(this@MediaAppTestingActivity) / 2
+                        test_to_configure_list.setHasFixedSize(true)
                         test_to_configure_list.adapter = configAdapter
 
                         // Reset config button clicked
@@ -525,6 +526,7 @@ class MediaAppTestingActivity : AppCompatActivity() {
         ): ConfigurationAdapter.ViewHolder {
             val cardView = LayoutInflater.from(parent.context)
                     .inflate(R.layout.config_item, parent, false) as CardView
+
             return ViewHolder(cardView)
         }
 
diff --git a/mediacontroller/src/main/res/layout/run_suite_iter_dialog.xml b/mediacontroller/src/main/res/layout/run_suite_iter_dialog.xml
index 6723db3..c64b9d1 100644
--- a/mediacontroller/src/main/res/layout/run_suite_iter_dialog.xml
+++ b/mediacontroller/src/main/res/layout/run_suite_iter_dialog.xml
@@ -21,6 +21,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/suite_is_running_title"
+        style="@style/Header">
+
+    </TextView>
+
     <ProgressBar
         android:id="@+id/suite_iter_progress_bar"
         android:layout_margin="@dimen/activity_horizontal_margin"
diff --git a/mediacontroller/src/main/res/layout/test_suite_results_dialog.xml b/mediacontroller/src/main/res/layout/test_suite_results_dialog.xml
index 0001418..e4e7fe9 100644
--- a/mediacontroller/src/main/res/layout/test_suite_results_dialog.xml
+++ b/mediacontroller/src/main/res/layout/test_suite_results_dialog.xml
@@ -48,13 +48,41 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1">
-
         <LinearLayout
-            android:orientation="vertical"
-            android:id="@+id/results_log"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/tests_details_text_size"/>
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/passing_logs_header"
+                android:text="@string/passing_logs_header"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/tests_subheader_text_size"
+                style="@style/SubHeader"/>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/passing_results_log"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/tests_details_text_size"/>
+
+            <TextView
+                android:id="@+id/failing_logs_header"
+                android:text="@string/failing_logs_header"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/tests_subheader_text_size"
+                style="@style/SubHeader"/>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:id="@+id/failing_results_log"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/tests_details_text_size"/>
+        </LinearLayout>
     </ScrollView>
 
     <Button
diff --git a/mediacontroller/src/main/res/values/testing_strings.xml b/mediacontroller/src/main/res/values/testing_strings.xml
index 5c97a02..2a6eca3 100644
--- a/mediacontroller/src/main/res/values/testing_strings.xml
+++ b/mediacontroller/src/main/res/values/testing_strings.xml
@@ -59,6 +59,10 @@
     <string name="query_hint">Query</string>
     <string name="run_suite_button">Run Suite</string>
     <string name="cancel_suite_button">Cancel Suite</string>
+    <string name="suite_is_running_title">Suite is running...</string>
+    <string name="failing_logs_header">Failing Logs:</string>
+    <string name="passing_logs_header">Passing Logs:</string>
+    <string name="test_iter_divider">--- Iteration ---</string>
 
 
     <!-- Logs Toggle -->
@@ -208,4 +212,5 @@
     <string name="tv_text_input">%s\nSelect this test to open the query input field. To input text via adb, enter `adb shell input text [query]`.</string>
     <string name="tv_text_input_with_query">%s\nSelect this test to open the query input field. To input text via adb, enter `adb shell input text [query]`.\n\nEntered query: [%s]</string>
 
+
 </resources>

From e489d486cf205b9b3efd4201f08181b913d4d8d0 Mon Sep 17 00:00:00 2001
From: Leo Neat <lneat@google.com>
Date: Fri, 29 May 2020 14:43:32 -0700
Subject: [PATCH 3/5] Documentation

---
 .../com/example/android/mediacontroller/MediaAppTestSuite.kt    | 2 +-
 mediacontroller/src/main/res/values/testing_strings.xml         | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt
index 7e98c73..af15d15 100644
--- a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt
+++ b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt
@@ -38,7 +38,7 @@ import kotlin.concurrent.thread
 
 class MediaAppTestSuite(val testSuiteName: String, val testSuiteDescription: String, private val testList:
     Array<TestOptionDetails>, private val testSuiteResultsLayout: RecyclerView, val context: Context) {
-    
+
     private val TAG = "MediaAppTestSuite"
 
     /**
diff --git a/mediacontroller/src/main/res/values/testing_strings.xml b/mediacontroller/src/main/res/values/testing_strings.xml
index 2a6eca3..dedc0c2 100644
--- a/mediacontroller/src/main/res/values/testing_strings.xml
+++ b/mediacontroller/src/main/res/values/testing_strings.xml
@@ -211,6 +211,4 @@
     <!-- For example, the command `adb shell input text hello%sworld` will add the string "hello world" to the input field (%s indicates a space) -->
     <string name="tv_text_input">%s\nSelect this test to open the query input field. To input text via adb, enter `adb shell input text [query]`.</string>
     <string name="tv_text_input_with_query">%s\nSelect this test to open the query input field. To input text via adb, enter `adb shell input text [query]`.\n\nEntered query: [%s]</string>
-
-
 </resources>

From 75aa336991c5ff79f0c2416efa7410d11c642c94 Mon Sep 17 00:00:00 2001
From: Leo Neat <lneat@google.com>
Date: Fri, 29 May 2020 14:55:55 -0700
Subject: [PATCH 4/5] Import fix

---
 .../mediacontroller/MediaAppTestSuite.kt        | 17 ++++++++++++++---
 .../mediacontroller/MediaAppTestingActivity.kt  | 15 +++++++++++++--
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt
index af15d15..c433903 100644
--- a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt
+++ b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestSuite.kt
@@ -23,15 +23,26 @@ import android.graphics.Color
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
-import android.view.*
-import android.widget.*
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import android.view.LayoutInflater
+import android.view.Window
+import android.widget.LinearLayout
+import android.widget.TextView
+import android.widget.ProgressBar
+import android.widget.Button
+import android.widget.ScrollView
 import androidx.cardview.widget.CardView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.media_test_option.view.card_header
 import kotlinx.android.synthetic.main.media_test_option.view.card_text
-import kotlinx.android.synthetic.main.media_test_suite_result.view.*
+import kotlinx.android.synthetic.main.media_test_suite_result.view.tests_passing
+import kotlinx.android.synthetic.main.media_test_suite_result.view.tests_passing_header
+import kotlinx.android.synthetic.main.media_test_suite_result.view.total_tests
+
 import java.util.concurrent.Semaphore
 import kotlin.concurrent.thread
 
diff --git a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt
index db5dda4..4cbe890 100644
--- a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt
+++ b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt
@@ -34,7 +34,14 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.util.DisplayMetrics
 import android.util.Log
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.view.Window
+import android.view.WindowManager
+
 import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -83,7 +90,11 @@ import kotlinx.android.synthetic.main.media_test_suites.test_suite_num_iter
 import kotlinx.android.synthetic.main.media_tests.test_results_container
 import kotlinx.android.synthetic.main.media_tests.tests_query
 import kotlinx.android.synthetic.main.media_tests.test_options_list
-import kotlinx.android.synthetic.main.test_suite_configure_dialog.*
+import kotlinx.android.synthetic.main.test_suite_configure_dialog.done_button
+import kotlinx.android.synthetic.main.test_suite_configure_dialog.reset_results_button
+import kotlinx.android.synthetic.main.test_suite_configure_dialog.title
+import kotlinx.android.synthetic.main.test_suite_configure_dialog.subtitle
+import kotlinx.android.synthetic.main.test_suite_configure_dialog.test_to_configure_list
 
 
 class MediaAppTestingActivity : AppCompatActivity() {

From 8ef3de582809ec77ffdc2cee8480eb0e2454283c Mon Sep 17 00:00:00 2001
From: Leo Neat <lneat@google.com>
Date: Mon, 1 Jun 2020 10:15:03 -0700
Subject: [PATCH 5/5] String template

---
 .../example/android/mediacontroller/MediaAppTestingActivity.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt
index 4cbe890..0999263 100644
--- a/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt
+++ b/mediacontroller/src/main/java/com/example/android/mediacontroller/MediaAppTestingActivity.kt
@@ -472,7 +472,7 @@ class MediaAppTestingActivity : AppCompatActivity() {
                         // Init dialog
                         requestWindowFeature(Window.FEATURE_NO_TITLE)
                         setContentView(R.layout.test_suite_configure_dialog)
-                        title.text = testSuite.testSuiteName + " Configuration"
+                        title.text = "${testSuite.testSuiteName} Configuration"
                         subtitle.text = testSuite.testSuiteDescription
                         test_to_configure_list.layoutManager = LinearLayoutManager(this@MediaAppTestingActivity)
                         test_to_configure_list.layoutParams.height = getScreenHeightPx(this@MediaAppTestingActivity) / 2