blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Consolidate duplicate mock initialization in intent processor tests. (#6374) 

* Consolidate duplicate code in intent processor tests

* Resolve ktlint errors
master
Jeffrey Starke 2019-12-19 12:34:00 -05:00 committed by Sawyer Blatz
parent 7f65a22702
commit 59a021f3a3
3 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/test/java/org/mozilla/fenix/home/intent/OpenBrowserIntentProcessorTest.kt
View File

@ -21,11 +21,12 @@ import org.robolectric.annotation.Config
@Config(application = TestApplication::class) @Config(application = TestApplication::class)
class OpenBrowserIntentProcessorTest { class OpenBrowserIntentProcessorTest {
private val activity: HomeActivity = mockk(relaxed = true)
private val navController: NavController = mockk()
private val out: Intent = mockk(relaxed = true)
@Test @Test
fun `do not process blank intents`() { fun `do not process blank intents`() {
val activity: HomeActivity = mockk()
val navController: NavController = mockk()
val out: Intent = mockk()
val processor = OpenBrowserIntentProcessor(activity) { null } val processor = OpenBrowserIntentProcessor(activity) { null }
processor.process(Intent(), navController, out) processor.process(Intent(), navController, out)
@ -36,9 +37,6 @@ class OpenBrowserIntentProcessorTest {
@Test @Test
fun `do not process when open extra is false`() { fun `do not process when open extra is false`() {
val activity: HomeActivity = mockk()
val navController: NavController = mockk()
val out: Intent = mockk()
val intent = Intent().apply { val intent = Intent().apply {
putExtra(HomeActivity.OPEN_TO_BROWSER, false) putExtra(HomeActivity.OPEN_TO_BROWSER, false)
} }
@ -52,9 +50,6 @@ class OpenBrowserIntentProcessorTest {
@Test @Test
fun `process when open extra is true`() { fun `process when open extra is true`() {
val activity: HomeActivity = mockk(relaxed = true)
val navController: NavController = mockk()
val out: Intent = mockk(relaxed = true)
val intent = Intent().apply { val intent = Intent().apply {
putExtra(HomeActivity.OPEN_TO_BROWSER, true) putExtra(HomeActivity.OPEN_TO_BROWSER, true)
} }

14
app/src/test/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessorTest.kt
View File

@ -22,11 +22,12 @@ import org.robolectric.annotation.Config
@Config(application = TestApplication::class) @Config(application = TestApplication::class)
class SpeechProcessingIntentProcessorTest { class SpeechProcessingIntentProcessorTest {
private val activity: HomeActivity = mockk(relaxed = true)
private val navController: NavController = mockk(relaxed = true)
private val out: Intent = mockk(relaxed = true)
@Test @Test
fun `do not process blank intents`() { fun `do not process blank intents`() {
val activity: HomeActivity = mockk()
val navController: NavController = mockk()
val out: Intent = mockk()
val processor = SpeechProcessingIntentProcessor(activity) val processor = SpeechProcessingIntentProcessor(activity)
processor.process(Intent(), navController, out) processor.process(Intent(), navController, out)
@ -37,9 +38,6 @@ class SpeechProcessingIntentProcessorTest {
@Test @Test
fun `do not process when open extra is false`() { fun `do not process when open extra is false`() {
val activity: HomeActivity = mockk()
val navController: NavController = mockk()
val out: Intent = mockk()
val intent = Intent().apply { val intent = Intent().apply {
putExtra(HomeActivity.OPEN_TO_BROWSER_AND_LOAD, false) putExtra(HomeActivity.OPEN_TO_BROWSER_AND_LOAD, false)
} }
@ -53,9 +51,6 @@ class SpeechProcessingIntentProcessorTest {
@Test @Test
fun `process when open extra is true`() { fun `process when open extra is true`() {
val activity: HomeActivity = mockk(relaxed = true)
val navController: NavController = mockk()
val out: Intent = mockk(relaxed = true)
val intent = Intent().apply { val intent = Intent().apply {
putExtra(HomeActivity.OPEN_TO_BROWSER_AND_LOAD, true) putExtra(HomeActivity.OPEN_TO_BROWSER_AND_LOAD, true)
} }
@ -76,7 +71,6 @@ class SpeechProcessingIntentProcessorTest {
@Test @Test
fun `reads the speech processing extra`() { fun `reads the speech processing extra`() {
val activity: HomeActivity = mockk(relaxed = true)
val intent = Intent().apply { val intent = Intent().apply {
putExtra(HomeActivity.OPEN_TO_BROWSER_AND_LOAD, true) putExtra(HomeActivity.OPEN_TO_BROWSER_AND_LOAD, true)
putExtra(SPEECH_PROCESSING, "hello world") putExtra(SPEECH_PROCESSING, "hello world")

13
app/src/test/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessorTest.kt
View File

@ -23,11 +23,12 @@ import org.robolectric.annotation.Config
@Config(application = TestApplication::class) @Config(application = TestApplication::class)
class StartSearchIntentProcessorTest { class StartSearchIntentProcessorTest {
private val metrics: MetricController = mockk(relaxed = true)
private val navController: NavController = mockk(relaxed = true)
private val out: Intent = mockk(relaxed = true)
@Test @Test
fun `do not process blank intents`() { fun `do not process blank intents`() {
val metrics: MetricController = mockk()
val navController: NavController = mockk()
val out: Intent = mockk()
StartSearchIntentProcessor(metrics).process(Intent(), navController, out) StartSearchIntentProcessor(metrics).process(Intent(), navController, out)
verify { metrics wasNot Called } verify { metrics wasNot Called }
@ -37,9 +38,6 @@ class StartSearchIntentProcessorTest {
@Test @Test
fun `do not process when search extra is false`() { fun `do not process when search extra is false`() {
val metrics: MetricController = mockk()
val navController: NavController = mockk()
val out: Intent = mockk()
val intent = Intent().apply { val intent = Intent().apply {
removeExtra(HomeActivity.OPEN_TO_SEARCH) removeExtra(HomeActivity.OPEN_TO_SEARCH)
} }
@ -52,9 +50,6 @@ class StartSearchIntentProcessorTest {
@Test @Test
fun `process search intents`() { fun `process search intents`() {
val metrics: MetricController = mockk(relaxed = true)
val navController: NavController = mockk(relaxed = true)
val out: Intent = mockk(relaxed = true)
val intent = Intent().apply { val intent = Intent().apply {
putExtra(HomeActivity.OPEN_TO_SEARCH, StartSearchIntentProcessor.SEARCH_WIDGET) putExtra(HomeActivity.OPEN_TO_SEARCH, StartSearchIntentProcessor.SEARCH_WIDGET)
} }