@@ -13,9 +13,13 @@ import okio.ByteString
13
13
import org.junit.Before
14
14
import org.junit.Test
15
15
import org.junit.runner.RunWith
16
- import org.mockito.ArgumentMatchers
17
- import org.mockito.Mockito.*
18
- import org.mockito.Mockito.`when` as whenever
16
+ import org.mockito.kotlin.any
17
+ import org.mockito.kotlin.eq
18
+ import org.mockito.kotlin.mock
19
+ import org.mockito.kotlin.never
20
+ import org.mockito.kotlin.times
21
+ import org.mockito.kotlin.verify
22
+ import org.mockito.kotlin.whenever
19
23
import org.robolectric.RobolectricTestRunner
20
24
21
25
@RunWith(RobolectricTestRunner ::class )
@@ -25,105 +29,105 @@ class JSPackagerClientTest {
25
29
26
30
@Before
27
31
fun setup () {
28
- settings = mock( PackagerConnectionSettings :: class .java )
32
+ settings = mock< PackagerConnectionSettings >( )
29
33
whenever(settings.debugServerHost).thenReturn(" ws://not_needed" )
30
34
whenever(settings.packageName).thenReturn(" my_test_package" )
31
35
}
32
36
33
37
@Test
34
38
@Throws(IOException ::class )
35
39
fun test_onMessage_ShouldTriggerNotification () {
36
- val handler = mock( RequestHandler :: class .java )
40
+ val handler = mock< RequestHandler >( )
37
41
val client = getClient(createRequestHandler(" methodValue" , handler))
38
42
39
43
client.onMessage(""" {"version": 2, "method": "methodValue", "params": "paramsValue"}""" )
40
44
verify(handler).onNotification(eq(" paramsValue" ))
41
- verify(handler, never()).onRequest(any(), any(Responder :: class .java ))
45
+ verify(handler, never()).onRequest(any(), any())
42
46
}
43
47
44
48
@Test
45
49
@Throws(IOException ::class )
46
50
fun test_onMessage_ShouldTriggerRequest () {
47
- val handler = mock( RequestHandler :: class .java )
51
+ val handler = mock< RequestHandler >( )
48
52
val client = getClient(createRequestHandler(" methodValue" , handler))
49
53
50
54
client.onMessage(
51
55
""" {"version": 2, "id": "idValue", "method": "methodValue", "params": "paramsValue"}""" )
52
56
verify(handler, never()).onNotification(any())
53
- verify(handler).onRequest(eq(" paramsValue" ), any(Responder :: class .java ))
57
+ verify(handler).onRequest(eq(" paramsValue" ), any())
54
58
}
55
59
56
60
@Test
57
61
@Throws(IOException ::class )
58
62
fun test_onMessage_WithoutParams_ShouldTriggerNotification () {
59
- val handler = mock( RequestHandler :: class .java )
63
+ val handler = mock< RequestHandler >( )
60
64
val client = getClient(createRequestHandler(" methodValue" , handler))
61
65
62
66
client.onMessage(""" {"version": 2, "method": "methodValue"}""" )
63
- verify(handler).onNotification(ArgumentMatchers .isNull( ))
64
- verify(handler, never()).onRequest(any(), any(Responder :: class .java ))
67
+ verify(handler).onNotification(eq( null ))
68
+ verify(handler, never()).onRequest(any(), any())
65
69
}
66
70
67
71
@Test
68
72
@Throws(IOException ::class )
69
73
fun test_onMessage_WithInvalidContentType_ShouldNotTriggerCallback () {
70
- val handler = mock( RequestHandler :: class .java )
74
+ val handler = mock< RequestHandler >( )
71
75
val client = getClient(createRequestHandler(" methodValue" , handler))
72
76
73
77
client.onMessage(encodeUtf8(""" {"version": 2, "method": "methodValue"}""" ))
74
78
verify(handler, never()).onNotification(any())
75
- verify(handler, never()).onRequest(any(), any(Responder :: class .java ))
79
+ verify(handler, never()).onRequest(any(), any())
76
80
}
77
81
78
82
@Test
79
83
@Throws(IOException ::class )
80
84
fun test_onMessage_WithoutMethod_ShouldNotTriggerCallback () {
81
- val handler = mock( RequestHandler :: class .java )
85
+ val handler = mock< RequestHandler >( )
82
86
val client = getClient(createRequestHandler(" methodValue" , handler))
83
87
84
88
client.onMessage(""" {"version": 2}""" )
85
89
verify(handler, never()).onNotification(any())
86
- verify(handler, never()).onRequest(any(), any(Responder :: class .java ))
90
+ verify(handler, never()).onRequest(any(), any())
87
91
}
88
92
89
93
@Test
90
94
@Throws(IOException ::class )
91
95
fun test_onMessage_With_Null_Action_ShouldNotTriggerCallback () {
92
- val handler = mock( RequestHandler :: class .java )
96
+ val handler = mock< RequestHandler >( )
93
97
val client = getClient(createRequestHandler(" methodValue" , handler))
94
98
95
99
client.onMessage(""" {"version": 2, "method": null}""" )
96
100
verify(handler, never()).onNotification(any())
97
- verify(handler, never()).onRequest(any(), any(Responder :: class .java ))
101
+ verify(handler, never()).onRequest(any(), any())
98
102
}
99
103
100
104
@Test
101
105
@Throws(IOException ::class )
102
106
fun test_onMessage_WithInvalidMethod_ShouldNotTriggerCallback () {
103
- val handler = mock( RequestHandler :: class .java )
107
+ val handler = mock< RequestHandler >( )
104
108
val client = getClient(createRequestHandler(" methodValue" , handler))
105
109
106
110
client.onMessage(ByteString .EMPTY )
107
111
verify(handler, never()).onNotification(any())
108
- verify(handler, never()).onRequest(any(), any(Responder :: class .java ))
112
+ verify(handler, never()).onRequest(any(), any())
109
113
}
110
114
111
115
@Test
112
116
@Throws(IOException ::class )
113
117
fun test_onMessage_WrongVersion_ShouldNotTriggerCallback () {
114
- val handler = mock( RequestHandler :: class .java )
118
+ val handler = mock< RequestHandler >( )
115
119
val client = getClient(createRequestHandler(" methodValue" , handler))
116
120
117
121
client.onMessage(""" {"version": 1, "method": "methodValue"}""" )
118
122
verify(handler, never()).onNotification(any())
119
- verify(handler, never()).onRequest(any(), any(Responder :: class .java ))
123
+ verify(handler, never()).onRequest(any(), any())
120
124
}
121
125
122
126
@Test
123
127
@Throws(IOException ::class )
124
128
fun test_onDisconnection_ShouldTriggerDisconnectionCallback () {
125
- val connectionHandler = mock( ConnectionCallback :: class .java )
126
- val handler = mock( RequestHandler :: class .java )
129
+ val connectionHandler = mock< ConnectionCallback >( )
130
+ val handler = mock< RequestHandler >( )
127
131
val client = getClient(requestHandlers = emptyMap(), connectionCallback = connectionHandler)
128
132
129
133
client.close()
@@ -132,7 +136,7 @@ class JSPackagerClientTest {
132
136
verify(connectionHandler, times(1 )).onDisconnected()
133
137
134
138
verify(handler, never()).onNotification(any())
135
- verify(handler, never()).onRequest(any(), any(Responder :: class .java ))
139
+ verify(handler, never()).onRequest(any(), any())
136
140
}
137
141
138
142
private fun getClient (
0 commit comments