Skip to content

Commit 84670c7

Browse files
remove mockk dependency
1 parent bfe9cee commit 84670c7

File tree

7 files changed

+221
-373
lines changed

7 files changed

+221
-373
lines changed

app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ dependencies {
4242
testImplementation 'androidx.test.ext:junit:1.1.5'
4343
testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
4444
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
45-
testImplementation 'io.mockk:mockk:1.13.5'
4645
testImplementation 'junit:junit:4.13.2'
4746
testImplementation 'org.mockito:mockito-core:5.3.1'
4847
testImplementation 'org.robolectric:robolectric:4.10.3'

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphDataPoint.kt

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,4 @@ package com.vrem.wifianalyzer.wifi.graphutils
2020

2121
import com.jjoe64.graphview.series.DataPoint
2222

23-
class GraphDataPoint(x: Double, y: Double) : DataPoint(x, y) {
24-
25-
constructor(x: Int, y: Int) : this(x.toDouble(), y.toDouble())
26-
27-
override fun equals(other: Any?): Boolean {
28-
if (this === other) return true
29-
if (javaClass != other?.javaClass) return false
30-
other as DataPoint
31-
return x == other.x && y == other.y
32-
}
33-
34-
override fun hashCode(): Int = 31 * x.hashCode() + y.hashCode()
35-
}
23+
data class GraphDataPoint(val x: Int, val y: Int) : DataPoint(x.toDouble(), y.toDouble())

app/src/test/kotlin/com/vrem/wifianalyzer/MainContextMockkHelper.kt

Lines changed: 0 additions & 125 deletions
This file was deleted.

app/src/test/kotlin/com/vrem/wifianalyzer/navigation/items/ExportItemTest.kt

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,19 @@ import android.os.Build
2424
import android.view.MenuItem
2525
import android.view.View
2626
import androidx.test.ext.junit.runners.AndroidJUnit4
27+
import com.nhaarman.mockitokotlin2.doNothing
28+
import com.nhaarman.mockitokotlin2.doReturn
29+
import com.nhaarman.mockitokotlin2.mock
30+
import com.nhaarman.mockitokotlin2.verify
31+
import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
32+
import com.nhaarman.mockitokotlin2.whenever
2733
import com.vrem.wifianalyzer.MainActivity
28-
import com.vrem.wifianalyzer.MainContextMockkHelper
34+
import com.vrem.wifianalyzer.MainContextHelper
2935
import com.vrem.wifianalyzer.export.Export
3036
import com.vrem.wifianalyzer.navigation.NavigationMenu
3137
import com.vrem.wifianalyzer.wifi.model.WiFiConnection
3238
import com.vrem.wifianalyzer.wifi.model.WiFiData
3339
import com.vrem.wifianalyzer.wifi.model.WiFiDetail
34-
import io.mockk.*
3540
import org.junit.After
3641
import org.junit.Assert.assertEquals
3742
import org.junit.Assert.assertFalse
@@ -42,45 +47,45 @@ import org.robolectric.annotation.Config
4247
@RunWith(AndroidJUnit4::class)
4348
@Config(sdk = [Build.VERSION_CODES.TIRAMISU])
4449
class ExportItemTest {
45-
private val export: Export = mockk()
46-
private val mainActivity: MainActivity = mockk()
47-
private val menuItem: MenuItem = mockk()
48-
private val intent: Intent = mockk()
49-
private val packageManager: PackageManager = mockk()
50-
private val componentName: ComponentName = mockk()
51-
private val scanner = MainContextMockkHelper.INSTANCE.scannerService
50+
private val export: Export = mock()
51+
private val mainActivity: MainActivity = mock()
52+
private val menuItem: MenuItem = mock()
53+
private val intent: Intent = mock()
54+
private val packageManager: PackageManager = mock()
55+
private val componentName: ComponentName = mock()
56+
private val scanner = MainContextHelper.INSTANCE.scannerService
5257

5358
private val fixture = ExportItem(export)
5459

5560
@After
5661
fun tearDown() {
57-
confirmVerified(export)
58-
confirmVerified(mainActivity)
59-
confirmVerified(menuItem)
60-
confirmVerified(intent)
61-
confirmVerified(packageManager)
62-
confirmVerified(componentName)
63-
confirmVerified(scanner)
64-
MainContextMockkHelper.INSTANCE.restore()
62+
verifyNoMoreInteractions(export)
63+
verifyNoMoreInteractions(mainActivity)
64+
verifyNoMoreInteractions(menuItem)
65+
verifyNoMoreInteractions(intent)
66+
verifyNoMoreInteractions(packageManager)
67+
verifyNoMoreInteractions(componentName)
68+
verifyNoMoreInteractions(scanner)
69+
MainContextHelper.INSTANCE.restore()
6570
}
6671

6772
@Test
6873
fun testActivate() {
6974
// setup
7075
val wiFiData: WiFiData = withWiFiData()
71-
every { scanner.wiFiData() } returns wiFiData
72-
every { export.export(mainActivity, wiFiData.wiFiDetails) } returns intent
73-
every { mainActivity.startActivity(intent) } just runs
74-
every { mainActivity.packageManager } returns packageManager
75-
every { intent.resolveActivity(packageManager) } returns componentName
76+
doReturn(wiFiData).whenever(scanner).wiFiData()
77+
doReturn(intent).whenever(export).export(mainActivity, wiFiData.wiFiDetails)
78+
doNothing().whenever(mainActivity).startActivity(intent)
79+
doReturn(packageManager).whenever(mainActivity).packageManager
80+
doReturn(componentName).whenever(intent).resolveActivity(packageManager)
7681
// execute
7782
fixture.activate(mainActivity, menuItem, NavigationMenu.EXPORT)
7883
// validate
79-
verify { scanner.wiFiData() }
80-
verify { mainActivity.packageManager }
81-
verify { intent.resolveActivity(packageManager) }
82-
verify { mainActivity.startActivity(intent) }
83-
verify { export.export(mainActivity, wiFiData.wiFiDetails) }
84+
verify(scanner).wiFiData()
85+
verify(mainActivity).packageManager
86+
verify(intent).resolveActivity(packageManager)
87+
verify(mainActivity).startActivity(intent)
88+
verify(export).export(mainActivity, wiFiData.wiFiDetails)
8489
}
8590

8691
@Test

0 commit comments

Comments
 (0)