Skip to content
This repository was archived by the owner on Nov 1, 2022. It is now read-only.

Commit dd49bc0

Browse files
dectorpocmo
authored andcommitted
For #2346. Enable kotlin warningsAsErrors for feature-intent module.
1 parent f3dedc4 commit dd49bc0

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

buildSrc/src/main/java/KotlinCompiler.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ object KotlinCompiler {
2222
"feature-contextmenu",
2323
"feature-customtabs",
2424
"feature-downloads",
25-
"feature-intent",
2625
"feature-prompts",
2726
"feature-search",
2827
"feature-session",

components/feature/intent/src/test/java/mozilla/components/feature/intent/IntentProcessorTest.kt

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import mozilla.components.concept.engine.EngineSession
1616
import mozilla.components.feature.search.SearchUseCases
1717
import mozilla.components.feature.session.SessionUseCases
1818
import mozilla.components.support.test.any
19+
import mozilla.components.support.test.robolectric.testContext
1920
import org.junit.Assert.assertEquals
2021
import org.junit.Assert.assertFalse
2122
import org.junit.Assert.assertNotNull
@@ -32,16 +33,16 @@ import org.mockito.Mockito.spy
3233
import org.mockito.Mockito.verify
3334
import org.mockito.Mockito.verifyZeroInteractions
3435
import org.robolectric.RobolectricTestRunner
35-
import org.robolectric.RuntimeEnvironment
3636

3737
@RunWith(RobolectricTestRunner::class)
3838
class IntentProcessorTest {
39+
3940
private val sessionManager = mock(SessionManager::class.java)
4041
private val session = mock(Session::class.java)
4142
private val engineSession = mock(EngineSession::class.java)
4243
private val sessionUseCases = SessionUseCases(sessionManager)
4344
private val searchEngineManager = mock(SearchEngineManager::class.java)
44-
private val searchUseCases = SearchUseCases(RuntimeEnvironment.application, searchEngineManager, sessionManager)
45+
private val searchUseCases = SearchUseCases(testContext, searchEngineManager, sessionManager)
4546

4647
@Before
4748
fun setup() {
@@ -55,7 +56,7 @@ class IntentProcessorTest {
5556
val sessionManager = spy(SessionManager(engine))
5657
val useCases = SessionUseCases(sessionManager)
5758
val handler =
58-
IntentProcessor(useCases, sessionManager, searchUseCases, RuntimeEnvironment.application)
59+
IntentProcessor(useCases, sessionManager, searchUseCases, testContext)
5960
val intent = mock(Intent::class.java)
6061
`when`(intent.action).thenReturn(Intent.ACTION_VIEW)
6162

@@ -82,7 +83,7 @@ class IntentProcessorTest {
8283
sessionUseCases,
8384
sessionManager,
8485
searchUseCases,
85-
RuntimeEnvironment.application,
86+
testContext,
8687
true,
8788
false
8889
)
@@ -103,7 +104,7 @@ class IntentProcessorTest {
103104
sessionUseCases,
104105
sessionManager,
105106
searchUseCases,
106-
RuntimeEnvironment.application,
107+
testContext,
107108
true,
108109
false
109110
)
@@ -121,7 +122,7 @@ class IntentProcessorTest {
121122
sessionUseCases,
122123
sessionManager,
123124
searchUseCases,
124-
RuntimeEnvironment.application,
125+
testContext,
125126
useDefaultHandlers = false
126127
)
127128
val intent = mock(Intent::class.java)
@@ -138,7 +139,7 @@ class IntentProcessorTest {
138139
sessionUseCases,
139140
sessionManager,
140141
searchUseCases,
141-
RuntimeEnvironment.application,
142+
testContext,
142143
useDefaultHandlers = false
143144
)
144145
val intent = mock(Intent::class.java)
@@ -167,7 +168,7 @@ class IntentProcessorTest {
167168
doReturn(engineSession).`when`(sessionManager).getOrCreateEngineSession(anySession())
168169
val useCases = SessionUseCases(sessionManager)
169170

170-
val handler = IntentProcessor(useCases, sessionManager, searchUseCases, RuntimeEnvironment.application)
171+
val handler = IntentProcessor(useCases, sessionManager, searchUseCases, testContext)
171172

172173
val intent = mock(Intent::class.java)
173174
`when`(intent.action).thenReturn(Intent.ACTION_VIEW)
@@ -189,7 +190,7 @@ class IntentProcessorTest {
189190
fun `load URL on ACTION_SEND if text contains URL`() {
190191
doReturn(engineSession).`when`(sessionManager).getOrCreateEngineSession(anySession())
191192

192-
val handler = IntentProcessor(sessionUseCases, sessionManager, searchUseCases, RuntimeEnvironment.application)
193+
val handler = IntentProcessor(sessionUseCases, sessionManager, searchUseCases, testContext)
193194

194195
val intent = mock(Intent::class.java)
195196
`when`(intent.action).thenReturn(Intent.ACTION_SEND)
@@ -221,21 +222,21 @@ class IntentProcessorTest {
221222
val sessionManager = spy(SessionManager(engine))
222223
doReturn(engineSession).`when`(sessionManager).getOrCreateEngineSession(anySession())
223224

224-
val searchUseCases = SearchUseCases(RuntimeEnvironment.application, searchEngineManager, sessionManager)
225+
val searchUseCases = SearchUseCases(testContext, searchEngineManager, sessionManager)
225226
val sessionUseCases = SessionUseCases(sessionManager)
226227

227228
val searchTerms = "mozilla android"
228229
val searchUrl = "http://search-url.com?$searchTerms"
229230

230-
val handler = IntentProcessor(sessionUseCases, sessionManager, searchUseCases, RuntimeEnvironment.application)
231+
val handler = IntentProcessor(sessionUseCases, sessionManager, searchUseCases, testContext)
231232

232233
val intent = mock(Intent::class.java)
233234
`when`(intent.action).thenReturn(Intent.ACTION_SEND)
234235
`when`(intent.getStringExtra(Intent.EXTRA_TEXT)).thenReturn(searchTerms)
235236

236237
val searchEngine = mock(SearchEngine::class.java)
237238
`when`(searchEngine.buildSearchUrl(searchTerms)).thenReturn(searchUrl)
238-
`when`(searchEngineManager.getDefaultSearchEngine(RuntimeEnvironment.application)).thenReturn(searchEngine)
239+
`when`(searchEngineManager.getDefaultSearchEngine(testContext)).thenReturn(searchEngine)
239240

240241
handler.process(intent)
241242
verify(engineSession).loadUrl(searchUrl)
@@ -245,7 +246,7 @@ class IntentProcessorTest {
245246

246247
@Test
247248
fun `processor handles ACTION_SEND with empty text`() {
248-
val handler = IntentProcessor(sessionUseCases, sessionManager, searchUseCases, RuntimeEnvironment.application)
249+
val handler = IntentProcessor(sessionUseCases, sessionManager, searchUseCases, testContext)
249250

250251
val intent = mock(Intent::class.java)
251252
`when`(intent.action).thenReturn(Intent.ACTION_SEND)

0 commit comments

Comments
 (0)