Skip to content

Commit a53f95a

Browse files
ParaskP7ParaskP7
authored
Merge pull request #17300 from wordpress-mobile/analysis/wordpress-test-all-warnings
[Compile Warnings As Errors] WordPress Module - Resolve Test Warnings
2 parents 773955a + 42b38e8 commit a53f95a

52 files changed

Lines changed: 481 additions & 554 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ import org.json.JSONObject
55
import java.util.ArrayList
66

77
class StatsMocksReader {
8-
fun readDayStatsGenericFile(fileName: String, lastObjectName: String, keyName: String, valueName: String):
8+
private fun readDayStatsGenericFile(fileName: String, lastObjectName: String, keyName: String, valueName: String):
99
MutableList<StatsKeyValueData> {
10-
val fileName = "mocks/mappings/wpcom/stats/$fileName.json"
1110
val todayMarker = "{{now format='yyyy-MM-dd'}}"
12-
val readString = this.readAssetsFile(fileName)
11+
val readString = this.readAssetsFile("mocks/mappings/wpcom/stats/$fileName.json")
1312
val wireMockJSON = JSONObject(readString)
1413
val arrayRaw = wireMockJSON
1514
.getJSONObject("response")
@@ -58,7 +57,7 @@ class StatsMocksReader {
5857
}
5958

6059
fun readDayCountriesToList(): MutableList<StatsKeyValueData> {
61-
var countriesList = readDayStatsGenericFile(
60+
val countriesList = readDayStatsGenericFile(
6261
"stats_country-views-day", "views", "country_code", "views"
6362
)
6463

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class StatsUtils @Inject constructor(
172172
entries: List<Line>
173173
): List<String> {
174174
val contentDescriptions = mutableListOf<String>()
175-
entries.forEachIndexed { _, bar ->
175+
entries.forEach { bar ->
176176
val contentDescription = resourceProvider.getString(
177177
R.string.stats_bar_chart_accessibility_entry,
178178
bar.label,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ import org.mockito.junit.MockitoJUnitRunner
88
@Suppress("UnnecessaryAbstractClass")
99
@RunWith(MockitoJUnitRunner::class)
1010
abstract class BaseUnitTest {
11-
@Rule @JvmField val rule = InstantTaskExecutorRule()
11+
@Rule
12+
@JvmField val rule = InstantTaskExecutorRule()
1213
}

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

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
11
package org.wordpress.android.models.networkresource
22

3-
import org.hamcrest.CoreMatchers.`is`
4-
import org.hamcrest.CoreMatchers.equalTo
5-
import org.junit.Assert.assertThat
3+
import org.assertj.core.api.Assertions.assertThat
64
import org.junit.Test
75

86
class ListStateTest {
97
@Test
108
fun testInitState() {
119
val initState: ListState<String> = ListState.Init()
1210

13-
assertThat(initState.data, `is`(emptyList()))
11+
assertThat(initState.data).isEqualTo(emptyList<ListState<String>>())
1412

15-
assertThat(initState.isFetchingFirstPage(), `is`(false))
16-
assertThat(initState.isLoadingMore(), `is`(false))
17-
assertThat(initState.shouldFetch(true), `is`(false))
18-
assertThat(initState.shouldFetch(false), `is`(false))
13+
assertThat(initState.isFetchingFirstPage()).isEqualTo(false)
14+
assertThat(initState.isLoadingMore()).isEqualTo(false)
15+
assertThat(initState.shouldFetch(true)).isEqualTo(false)
16+
assertThat(initState.shouldFetch(false)).isEqualTo(false)
1917
}
2018

2119
@Test
2220
fun testReadyState() {
2321
val testData = listOf("item1", "item2")
2422
val readyState: ListState<String> = ListState.Ready(testData)
2523

26-
assertThat(readyState.data, `is`(equalTo(testData)))
24+
assertThat(readyState.data).isEqualTo(testData)
2725

28-
assertThat(readyState.isFetchingFirstPage(), `is`(false))
29-
assertThat(readyState.isLoadingMore(), `is`(false))
30-
assertThat(readyState.shouldFetch(true), `is`(false))
31-
assertThat(readyState.shouldFetch(false), `is`(true))
26+
assertThat(readyState.isFetchingFirstPage()).isEqualTo(false)
27+
assertThat(readyState.isLoadingMore()).isEqualTo(false)
28+
assertThat(readyState.shouldFetch(true)).isEqualTo(false)
29+
assertThat(readyState.shouldFetch(false)).isEqualTo(true)
3230
}
3331

3432
@Test
@@ -37,12 +35,12 @@ class ListStateTest {
3735
val readyState: ListState<String> = ListState.Ready(testData)
3836
val loadingState: ListState<String> = ListState.Loading(readyState)
3937

40-
assertThat(loadingState.data, `is`(equalTo(testData)))
38+
assertThat(loadingState.data).isEqualTo(testData)
4139

42-
assertThat(loadingState.isFetchingFirstPage(), `is`(true))
43-
assertThat(loadingState.isLoadingMore(), `is`(false))
44-
assertThat(loadingState.shouldFetch(true), `is`(false))
45-
assertThat(loadingState.shouldFetch(false), `is`(false))
40+
assertThat(loadingState.isFetchingFirstPage()).isEqualTo(true)
41+
assertThat(loadingState.isLoadingMore()).isEqualTo(false)
42+
assertThat(loadingState.shouldFetch(true)).isEqualTo(false)
43+
assertThat(loadingState.shouldFetch(false)).isEqualTo(false)
4644
}
4745

4846
@Test
@@ -51,30 +49,30 @@ class ListStateTest {
5149
val readyState: ListState<String> = ListState.Ready(testData)
5250
val loadingState: ListState<String> = ListState.Loading(readyState, true)
5351

54-
assertThat(loadingState.data, `is`(equalTo(testData)))
52+
assertThat(loadingState.data).isEqualTo(testData)
5553

56-
assertThat(loadingState.isFetchingFirstPage(), `is`(false))
57-
assertThat(loadingState.isLoadingMore(), `is`(true))
58-
assertThat(loadingState.shouldFetch(true), `is`(false))
59-
assertThat(loadingState.shouldFetch(false), `is`(false))
54+
assertThat(loadingState.isFetchingFirstPage()).isEqualTo(false)
55+
assertThat(loadingState.isLoadingMore()).isEqualTo(true)
56+
assertThat(loadingState.shouldFetch(true)).isEqualTo(false)
57+
assertThat(loadingState.shouldFetch(false)).isEqualTo(false)
6058
}
6159

6260
@Test
6361
fun testSuccessStateWhereAllDataIsLoaded() {
6462
val testData = listOf("item7")
6563

6664
val successState = ListState.Success(testData)
67-
assertThat(successState.data, `is`(equalTo(testData)))
68-
assertThat(successState.canLoadMore, `is`(false))
65+
assertThat(successState.data).isEqualTo(testData)
66+
assertThat(successState.canLoadMore).isEqualTo(false)
6967
}
7068

7169
@Test
7270
fun testSuccessStatesWhereMoreDataCanBeLoaded() {
7371
val testData = listOf("item8")
7472

7573
val successState2 = ListState.Success(testData, true)
76-
assertThat(successState2.data, `is`(equalTo(testData)))
77-
assertThat(successState2.canLoadMore, `is`(true))
74+
assertThat(successState2.data).isEqualTo(testData)
75+
assertThat(successState2.canLoadMore).isEqualTo(true)
7876
}
7977

8078
@Test
@@ -85,8 +83,8 @@ class ListStateTest {
8583

8684
val errorMessage = "Some error message"
8785
val errorState = ListState.Error(loadingState, errorMessage)
88-
assertThat(errorState.errorMessage, `is`(equalTo(errorMessage)))
89-
assertThat(errorState.data, `is`(testDataReady))
86+
assertThat(errorState.errorMessage).isEqualTo(errorMessage)
87+
assertThat(errorState.data).isEqualTo(testDataReady)
9088
}
9189

9290
@Test
@@ -97,9 +95,9 @@ class ListStateTest {
9795
list.map { it.toUpperCase() }
9896
}
9997
val transformedReadyState = readyState.transform(toUpperCase)
100-
assertThat(transformedReadyState.data, `is`(equalTo(toUpperCase(testData))))
101-
assertThat(transformedReadyState.data.size, `is`(3))
102-
assertThat(transformedReadyState is ListState.Ready, `is`(true))
98+
assertThat(transformedReadyState.data).isEqualTo(toUpperCase(testData))
99+
assertThat(transformedReadyState.data.size).isEqualTo(3)
100+
assertThat(transformedReadyState is ListState.Ready).isEqualTo(true)
103101
}
104102

105103
@Test
@@ -111,8 +109,8 @@ class ListStateTest {
111109
list.filter { it != "not-item" }
112110
}
113111
val transformedLoadingState = loadingState.transform(filterNotItem)
114-
assertThat(transformedLoadingState.data, `is`(equalTo(filterNotItem(testData))))
115-
assertThat(transformedLoadingState.data.size, `is`(2))
116-
assertThat(transformedLoadingState is ListState.Loading, `is`(true))
112+
assertThat(transformedLoadingState.data).isEqualTo(filterNotItem(testData))
113+
assertThat(transformedLoadingState.data.size).isEqualTo(2)
114+
assertThat(transformedLoadingState is ListState.Loading).isEqualTo(true)
117115
}
118116
}

‎WordPress/src/test/java/org/wordpress/android/ui/JetpackRemoteInstallViewModelTest.kt‎

Lines changed: 57 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ import com.nhaarman.mockitokotlin2.argumentCaptor
66
import com.nhaarman.mockitokotlin2.mock
77
import com.nhaarman.mockitokotlin2.verify
88
import com.nhaarman.mockitokotlin2.whenever
9-
import junit.framework.Assert.assertEquals
10-
import junit.framework.Assert.assertNull
11-
import junit.framework.Assert.assertTrue
12-
import kotlinx.coroutines.runBlocking
9+
import org.assertj.core.api.Assertions.assertThat
1310
import org.junit.Before
1411
import org.junit.Rule
1512
import org.junit.Test
@@ -19,18 +16,16 @@ import org.mockito.junit.MockitoJUnitRunner
1916
import org.wordpress.android.R
2017
import org.wordpress.android.fluxc.Dispatcher
2118
import org.wordpress.android.fluxc.action.JetpackAction
22-
import org.wordpress.android.fluxc.action.JetpackAction.INSTALL_JETPACK
2319
import org.wordpress.android.fluxc.annotations.action.Action
2420
import org.wordpress.android.fluxc.model.SiteModel
2521
import org.wordpress.android.fluxc.store.AccountStore
2622
import org.wordpress.android.fluxc.store.JetpackStore
2723
import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstallError
28-
import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstallErrorType.GENERIC_ERROR
24+
import org.wordpress.android.fluxc.store.JetpackStore.JetpackInstallErrorType
2925
import org.wordpress.android.fluxc.store.JetpackStore.OnJetpackInstalled
3026
import org.wordpress.android.fluxc.store.SiteStore
27+
import org.wordpress.android.test
3128
import org.wordpress.android.ui.JetpackRemoteInstallViewModel.JetpackResultActionData
32-
import org.wordpress.android.ui.JetpackRemoteInstallViewModel.JetpackResultActionData.Action.CONNECT
33-
import org.wordpress.android.ui.JetpackRemoteInstallViewModel.JetpackResultActionData.Action.MANUAL_INSTALL
3429
import org.wordpress.android.ui.JetpackRemoteInstallViewState.Error
3530
import org.wordpress.android.ui.JetpackRemoteInstallViewState.Installed
3631
import org.wordpress.android.ui.JetpackRemoteInstallViewState.Installing
@@ -65,7 +60,7 @@ class JetpackRemoteInstallViewModelTest {
6560
}
6661

6762
@Test
68-
fun `on click starts jetpack install`() = runBlocking {
63+
fun `on click starts jetpack install`() = test {
6964
viewModel.start(site, null)
7065

7166
val startState = viewStates[0]
@@ -78,12 +73,12 @@ class JetpackRemoteInstallViewModelTest {
7873
assertInstallingState(installingState)
7974

8075
verify(dispatcher).dispatch(actionCaptor.capture())
81-
assertEquals(actionCaptor.lastValue.type, JetpackAction.INSTALL_JETPACK)
82-
assertEquals(actionCaptor.lastValue.payload, site)
76+
assertThat(actionCaptor.lastValue.type).isEqualTo(JetpackAction.INSTALL_JETPACK)
77+
assertThat(actionCaptor.lastValue.payload).isEqualTo(site)
8378
}
8479

8580
@Test
86-
fun `on successful result finishes jetpack install`() = runBlocking {
81+
fun `on successful result finishes jetpack install`() = test {
8782
val updatedSite = mock<SiteModel>()
8883
whenever(siteStore.getSiteByLocalId(siteId)).thenReturn(updatedSite)
8984
whenever(accountStore.hasAccessToken()).thenReturn(true)
@@ -92,57 +87,61 @@ class JetpackRemoteInstallViewModelTest {
9287
val startState = viewStates[0]
9388
assertStartState(startState)
9489

95-
viewModel.onEventsUpdated(OnJetpackInstalled(true, INSTALL_JETPACK))
90+
viewModel.onEventsUpdated(OnJetpackInstalled(true, JetpackAction.INSTALL_JETPACK))
9691
val installedState = viewStates[1]
9792
assertInstalledState(installedState)
9893

9994
// Continue after Jetpack is installed
10095
installedState.onClick()
10196

10297
val connectionData = jetpackResultActionData!!
103-
assertTrue(connectionData.loggedIn)
104-
assertTrue(connectionData.site == updatedSite)
105-
assertTrue(connectionData.action == CONNECT)
98+
assertThat(connectionData.loggedIn).isTrue
99+
assertThat(connectionData.site == updatedSite).isTrue
100+
assertThat(connectionData.action == JetpackResultActionData.Action.CONNECT).isTrue
106101
}
107102

108103
@Test
109-
fun `on error result shows failure`() = runBlocking {
110-
val installError = JetpackInstallError(GENERIC_ERROR, "error")
104+
fun `on error result shows failure`() = test {
105+
val installError = JetpackInstallError(JetpackInstallErrorType.GENERIC_ERROR, "error")
111106
viewModel.start(site, null)
112107

113108
val startState = viewStates[0]
114109
assertStartState(startState)
115110

116-
viewModel.onEventsUpdated(OnJetpackInstalled(installError, INSTALL_JETPACK))
111+
viewModel.onEventsUpdated(OnJetpackInstalled(installError, JetpackAction.INSTALL_JETPACK))
117112

118113
val errorState = viewStates[1]
119114
assertErrorState(errorState)
120115

121116
errorState.onClick()
122117

123118
verify(dispatcher).dispatch(actionCaptor.capture())
124-
assertEquals(actionCaptor.lastValue.type, JetpackAction.INSTALL_JETPACK)
125-
assertEquals(actionCaptor.lastValue.payload, site)
119+
assertThat(actionCaptor.lastValue.type).isEqualTo(JetpackAction.INSTALL_JETPACK)
120+
assertThat(actionCaptor.lastValue.payload).isEqualTo(site)
126121
}
127122

128123
@Test
129-
fun `on invalid credentials triggers manual install`() = runBlocking {
130-
val installError = JetpackInstallError(GENERIC_ERROR, "INVALID_CREDENTIALS", message = "msg")
124+
fun `on invalid credentials triggers manual install`() = test {
125+
val installError = JetpackInstallError(
126+
JetpackInstallErrorType.GENERIC_ERROR,
127+
"INVALID_CREDENTIALS",
128+
message = "msg"
129+
)
131130
viewModel.start(site, null)
132131

133132
val startState = viewStates[0]
134133
assertStartState(startState)
135134

136-
viewModel.onEventsUpdated(OnJetpackInstalled(installError, INSTALL_JETPACK))
135+
viewModel.onEventsUpdated(OnJetpackInstalled(installError, JetpackAction.INSTALL_JETPACK))
137136

138137
val connectionData = jetpackResultActionData!!
139-
assertTrue(connectionData.action == MANUAL_INSTALL)
140-
assertTrue(connectionData.site == site)
138+
assertThat(connectionData.action == JetpackResultActionData.Action.MANUAL_INSTALL).isTrue
139+
assertThat(connectionData.site == site).isTrue
141140
}
142141

143142
@Test
144-
fun `on login retries jetpack connect with access token`() = runBlocking {
145-
assertNull(jetpackResultActionData)
143+
fun `on login retries jetpack connect with access token`() = test {
144+
assertThat(jetpackResultActionData).isNull()
146145

147146
val updatedSite = mock<SiteModel>()
148147
whenever(siteStore.getSiteByLocalId(siteId)).thenReturn(updatedSite)
@@ -151,47 +150,47 @@ class JetpackRemoteInstallViewModelTest {
151150
viewModel.onLogin(siteId)
152151

153152
val connectionData = jetpackResultActionData!!
154-
assertTrue(connectionData.loggedIn)
155-
assertTrue(connectionData.site == updatedSite)
153+
assertThat(connectionData.loggedIn).isTrue
154+
assertThat(connectionData.site == updatedSite).isTrue
156155
}
157156

158157
private fun assertStartState(state: JetpackRemoteInstallViewState) {
159-
assertTrue(state is Start)
160-
assertEquals(state.type, JetpackRemoteInstallViewState.Type.START)
161-
assertEquals(state.titleResource, R.string.install_jetpack)
162-
assertEquals(state.messageResource, R.string.install_jetpack_message)
163-
assertEquals(state.icon, R.drawable.ic_plans_white_24dp)
164-
assertEquals(state.buttonResource, R.string.install_jetpack_continue)
165-
assertEquals(state.progressBarVisible, false)
158+
assertThat(state).isInstanceOf(Start::class.java)
159+
assertThat(state.type).isEqualTo(JetpackRemoteInstallViewState.Type.START)
160+
assertThat(state.titleResource).isEqualTo(R.string.install_jetpack)
161+
assertThat(state.messageResource).isEqualTo(R.string.install_jetpack_message)
162+
assertThat(state.icon).isEqualTo(R.drawable.ic_plans_white_24dp)
163+
assertThat(state.buttonResource).isEqualTo(R.string.install_jetpack_continue)
164+
assertThat(state.progressBarVisible).isEqualTo(false)
166165
}
167166

168167
private fun assertInstallingState(state: JetpackRemoteInstallViewState) {
169-
assertTrue(state is Installing)
170-
assertEquals(state.type, JetpackRemoteInstallViewState.Type.INSTALLING)
171-
assertEquals(state.titleResource, R.string.installing_jetpack)
172-
assertEquals(state.messageResource, R.string.installing_jetpack_message)
173-
assertEquals(state.icon, R.drawable.ic_plans_white_24dp)
174-
assertNull(state.buttonResource)
175-
assertEquals(state.progressBarVisible, true)
168+
assertThat(state).isInstanceOf(Installing::class.java)
169+
assertThat(state.type).isEqualTo(JetpackRemoteInstallViewState.Type.INSTALLING)
170+
assertThat(state.titleResource).isEqualTo(R.string.installing_jetpack)
171+
assertThat(state.messageResource).isEqualTo(R.string.installing_jetpack_message)
172+
assertThat(state.icon).isEqualTo(R.drawable.ic_plans_white_24dp)
173+
assertThat(state.buttonResource).isNull()
174+
assertThat(state.progressBarVisible).isEqualTo(true)
176175
}
177176

178177
private fun assertInstalledState(state: JetpackRemoteInstallViewState) {
179-
assertTrue(state is Installed)
180-
assertEquals(state.type, JetpackRemoteInstallViewState.Type.INSTALLED)
181-
assertEquals(state.titleResource, R.string.jetpack_installed)
182-
assertEquals(state.messageResource, R.string.jetpack_installed_message)
183-
assertEquals(state.icon, R.drawable.ic_plans_white_24dp)
184-
assertEquals(state.buttonResource, R.string.install_jetpack_continue)
185-
assertEquals(state.progressBarVisible, false)
178+
assertThat(state).isInstanceOf(Installed::class.java)
179+
assertThat(state.type).isEqualTo(JetpackRemoteInstallViewState.Type.INSTALLED)
180+
assertThat(state.titleResource).isEqualTo(R.string.jetpack_installed)
181+
assertThat(state.messageResource).isEqualTo(R.string.jetpack_installed_message)
182+
assertThat(state.icon).isEqualTo(R.drawable.ic_plans_white_24dp)
183+
assertThat(state.buttonResource).isEqualTo(R.string.install_jetpack_continue)
184+
assertThat(state.progressBarVisible).isEqualTo(false)
186185
}
187186

188187
private fun assertErrorState(state: JetpackRemoteInstallViewState) {
189-
assertTrue(state is Error)
190-
assertEquals(state.type, JetpackRemoteInstallViewState.Type.ERROR)
191-
assertEquals(state.titleResource, R.string.jetpack_installation_problem)
192-
assertEquals(state.messageResource, R.string.jetpack_installation_problem_message)
193-
assertEquals(state.icon, R.drawable.img_illustration_info_outline_88dp)
194-
assertEquals(state.buttonResource, R.string.install_jetpack_retry)
195-
assertEquals(state.progressBarVisible, false)
188+
assertThat(state).isInstanceOf(Error::class.java)
189+
assertThat(state.type).isEqualTo(JetpackRemoteInstallViewState.Type.ERROR)
190+
assertThat(state.titleResource).isEqualTo(R.string.jetpack_installation_problem)
191+
assertThat(state.messageResource).isEqualTo(R.string.jetpack_installation_problem_message)
192+
assertThat(state.icon).isEqualTo(R.drawable.img_illustration_info_outline_88dp)
193+
assertThat(state.buttonResource).isEqualTo(R.string.install_jetpack_retry)
194+
assertThat(state.progressBarVisible).isEqualTo(false)
196195
}
197196
}

0 commit comments

Comments
 (0)