Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-Android into analysis/wordpress-main-deprecated-warnings-part-2

Author: ParaskP7

WordPress/src/androidTest/java/org/wordpress/android/util/StatsMocksReader.kt

@@ -5,11 +5,10 @@ import org.json.JSONObject
 import java.util.ArrayList
 
 class StatsMocksReader {
-    fun readDayStatsGenericFile(fileName: String, lastObjectName: String, keyName: String, valueName: String):
+    private fun readDayStatsGenericFile(fileName: String, lastObjectName: String, keyName: String, valueName: String):
             MutableList<StatsKeyValueData> {
-        val fileName = "mocks/mappings/wpcom/stats/$fileName.json"
         val todayMarker = "{{now format='yyyy-MM-dd'}}"
-        val readString = this.readAssetsFile(fileName)
+        val readString = this.readAssetsFile("mocks/mappings/wpcom/stats/$fileName.json")
         val wireMockJSON = JSONObject(readString)
         val arrayRaw = wireMockJSON
                 .getJSONObject("response")
@@ -58,7 +57,7 @@ class StatsMocksReader {
     }
 
     fun readDayCountriesToList(): MutableList<StatsKeyValueData> {
-        var countriesList = readDayStatsGenericFile(
+        val countriesList = readDayStatsGenericFile(
                 "stats_country-views-day", "views", "country_code", "views"
         )
 

WordPress/src/main/java/org/wordpress/android/ui/posts/adapters/PostListAdapter.kt

@@ -95,7 +95,7 @@ class PostListAdapter(
         }
         if (holder is LoadingViewHolder) {
             val item = getItem(position)
-            assert(item is LoadingItem) {
+            assert(item is LoadingItem?) {
                 "If we are presenting LoadingViewHolder, the item has to be of type LoadingItem " +
                         "for position: $position"
             }

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsUtils.kt

@@ -172,7 +172,7 @@ class StatsUtils @Inject constructor(
         entries: List<Line>
     ): List<String> {
         val contentDescriptions = mutableListOf<String>()
-        entries.forEachIndexed { _, bar ->
+        entries.forEach { bar ->
             val contentDescription = resourceProvider.getString(
                     R.string.stats_bar_chart_accessibility_entry,
                     bar.label,

WordPress/src/test/java/org/wordpress/android/BaseUnitTest.kt

@@ -8,5 +8,6 @@ import org.mockito.junit.MockitoJUnitRunner
 @Suppress("UnnecessaryAbstractClass")
 @RunWith(MockitoJUnitRunner::class)
 abstract class BaseUnitTest {
-    @Rule @JvmField val rule = InstantTaskExecutorRule()
+    @Rule
+    @JvmField val rule = InstantTaskExecutorRule()
 }

WordPress/src/test/java/org/wordpress/android/models/networkresource/ListStateTest.kt

@@ -1,8 +1,6 @@
 package org.wordpress.android.models.networkresource
 
-import org.hamcrest.CoreMatchers.`is`
-import org.hamcrest.CoreMatchers.equalTo
-import org.junit.Assert.assertThat
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import java.util.Locale
 
@@ -11,25 +9,25 @@ class ListStateTest {
     fun testInitState() {
         val initState: ListState<String> = ListState.Init()
 
-        assertThat(initState.data, `is`(emptyList()))
+        assertThat(initState.data).isEqualTo(emptyList<ListState<String>>())
 
-        assertThat(initState.isFetchingFirstPage(), `is`(false))
-        assertThat(initState.isLoadingMore(), `is`(false))
-        assertThat(initState.shouldFetch(true), `is`(false))
-        assertThat(initState.shouldFetch(false), `is`(false))
+        assertThat(initState.isFetchingFirstPage()).isEqualTo(false)
+        assertThat(initState.isLoadingMore()).isEqualTo(false)
+        assertThat(initState.shouldFetch(true)).isEqualTo(false)
+        assertThat(initState.shouldFetch(false)).isEqualTo(false)
     }
 
     @Test
     fun testReadyState() {
         val testData = listOf("item1", "item2")
         val readyState: ListState<String> = ListState.Ready(testData)
 
-        assertThat(readyState.data, `is`(equalTo(testData)))
+        assertThat(readyState.data).isEqualTo(testData)
 
-        assertThat(readyState.isFetchingFirstPage(), `is`(false))
-        assertThat(readyState.isLoadingMore(), `is`(false))
-        assertThat(readyState.shouldFetch(true), `is`(false))
-        assertThat(readyState.shouldFetch(false), `is`(true))
+        assertThat(readyState.isFetchingFirstPage()).isEqualTo(false)
+        assertThat(readyState.isLoadingMore()).isEqualTo(false)
+        assertThat(readyState.shouldFetch(true)).isEqualTo(false)
+        assertThat(readyState.shouldFetch(false)).isEqualTo(true)
     }
 
     @Test
@@ -38,12 +36,12 @@ class ListStateTest {
         val readyState: ListState<String> = ListState.Ready(testData)
         val loadingState: ListState<String> = ListState.Loading(readyState)
 
-        assertThat(loadingState.data, `is`(equalTo(testData)))
+        assertThat(loadingState.data).isEqualTo(testData)
 
-        assertThat(loadingState.isFetchingFirstPage(), `is`(true))
-        assertThat(loadingState.isLoadingMore(), `is`(false))
-        assertThat(loadingState.shouldFetch(true), `is`(false))
-        assertThat(loadingState.shouldFetch(false), `is`(false))
+        assertThat(loadingState.isFetchingFirstPage()).isEqualTo(true)
+        assertThat(loadingState.isLoadingMore()).isEqualTo(false)
+        assertThat(loadingState.shouldFetch(true)).isEqualTo(false)
+        assertThat(loadingState.shouldFetch(false)).isEqualTo(false)
     }
 
     @Test
@@ -52,30 +50,30 @@ class ListStateTest {
         val readyState: ListState<String> = ListState.Ready(testData)
         val loadingState: ListState<String> = ListState.Loading(readyState, true)
 
-        assertThat(loadingState.data, `is`(equalTo(testData)))
+        assertThat(loadingState.data).isEqualTo(testData)
 
-        assertThat(loadingState.isFetchingFirstPage(), `is`(false))
-        assertThat(loadingState.isLoadingMore(), `is`(true))
-        assertThat(loadingState.shouldFetch(true), `is`(false))
-        assertThat(loadingState.shouldFetch(false), `is`(false))
+        assertThat(loadingState.isFetchingFirstPage()).isEqualTo(false)
+        assertThat(loadingState.isLoadingMore()).isEqualTo(true)
+        assertThat(loadingState.shouldFetch(true)).isEqualTo(false)
+        assertThat(loadingState.shouldFetch(false)).isEqualTo(false)
     }
 
     @Test
     fun testSuccessStateWhereAllDataIsLoaded() {
         val testData = listOf("item7")
 
         val successState = ListState.Success(testData)
-        assertThat(successState.data, `is`(equalTo(testData)))
-        assertThat(successState.canLoadMore, `is`(false))
+        assertThat(successState.data).isEqualTo(testData)
+        assertThat(successState.canLoadMore).isEqualTo(false)
     }
 
     @Test
     fun testSuccessStatesWhereMoreDataCanBeLoaded() {
         val testData = listOf("item8")
 
         val successState2 = ListState.Success(testData, true)
-        assertThat(successState2.data, `is`(equalTo(testData)))
-        assertThat(successState2.canLoadMore, `is`(true))
+        assertThat(successState2.data).isEqualTo(testData)
+        assertThat(successState2.canLoadMore).isEqualTo(true)
     }
 
     @Test
@@ -86,8 +84,8 @@ class ListStateTest {
 
         val errorMessage = "Some error message"
         val errorState = ListState.Error(loadingState, errorMessage)
-        assertThat(errorState.errorMessage, `is`(equalTo(errorMessage)))
-        assertThat(errorState.data, `is`(testDataReady))
+        assertThat(errorState.errorMessage).isEqualTo(errorMessage)
+        assertThat(errorState.data).isEqualTo(testDataReady)
     }
 
     @Test
@@ -98,9 +96,9 @@ class ListStateTest {
             list.map { it.uppercase(Locale.getDefault()) }
         }
         val transformedReadyState = readyState.transform(toUpperCase)
-        assertThat(transformedReadyState.data, `is`(equalTo(toUpperCase(testData))))
-        assertThat(transformedReadyState.data.size, `is`(3))
-        assertThat(transformedReadyState is ListState.Ready, `is`(true))
+        assertThat(transformedReadyState.data).isEqualTo(toUpperCase(testData))
+        assertThat(transformedReadyState.data.size).isEqualTo(3)
+        assertThat(transformedReadyState is ListState.Ready).isEqualTo(true)
     }
 
     @Test
@@ -112,8 +110,8 @@ class ListStateTest {
             list.filter { it != "not-item" }
         }
         val transformedLoadingState = loadingState.transform(filterNotItem)
-        assertThat(transformedLoadingState.data, `is`(equalTo(filterNotItem(testData))))
-        assertThat(transformedLoadingState.data.size, `is`(2))
-        assertThat(transformedLoadingState is ListState.Loading, `is`(true))
+        assertThat(transformedLoadingState.data).isEqualTo(filterNotItem(testData))
+        assertThat(transformedLoadingState.data.size).isEqualTo(2)
+        assertThat(transformedLoadingState is ListState.Loading).isEqualTo(true)
     }
 }