Skip to content

Commit 940d9dd

Browse files
AlvarezArielAlvarezAriel
authored
Upgrade test dependencies (#88)
* Upgrades test dependencies
1 parent 1d29a2a commit 940d9dd

File tree

6 files changed

+50
-50
lines changed

6 files changed

+50
-50
lines changed

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ dependencies {
5454
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
5555
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
5656

57-
testCompile group: 'com.google.truth', name: 'truth', version: '0.44'
58-
testCompile group: 'org.mockito', name: 'mockito-core', version: '2.27.0'
59-
testCompile group: 'com.nhaarman.mockitokotlin2', name: 'mockito-kotlin', version: '2.1.0'
57+
testCompile group: 'com.google.truth', name: 'truth', version: '1.1.3'
58+
testCompile group: 'org.mockito', name: 'mockito-core', version: '4.0.0'
59+
testCompile group: 'org.mockito.kotlin', name: 'mockito-kotlin', version: '4.0.0'
6060
}
6161

6262
jacocoTestReport {

‎src/test/kotlin/org/phoenixframework/ChannelTest.kt‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
package org.phoenixframework
22

33
import com.google.common.truth.Truth.assertThat
4-
import com.nhaarman.mockitokotlin2.any
5-
import com.nhaarman.mockitokotlin2.eq
6-
import com.nhaarman.mockitokotlin2.mock
7-
import com.nhaarman.mockitokotlin2.never
8-
import com.nhaarman.mockitokotlin2.spy
9-
import com.nhaarman.mockitokotlin2.times
10-
import com.nhaarman.mockitokotlin2.verify
11-
import com.nhaarman.mockitokotlin2.whenever
4+
import org.mockito.kotlin.any
5+
import org.mockito.kotlin.eq
6+
import org.mockito.kotlin.mock
7+
import org.mockito.kotlin.never
8+
import org.mockito.kotlin.spy
9+
import org.mockito.kotlin.times
10+
import org.mockito.kotlin.verify
11+
import org.mockito.kotlin.whenever
1212
import okhttp3.OkHttpClient
1313
import org.junit.jupiter.api.AfterEach
1414
import org.junit.jupiter.api.BeforeEach
1515
import org.junit.jupiter.api.DisplayName
1616
import org.junit.jupiter.api.Nested
1717
import org.junit.jupiter.api.Test
1818
import org.mockito.Mock
19-
import org.mockito.Mockito.verifyZeroInteractions
19+
import org.mockito.Mockito.verifyNoInteractions
2020
import org.mockito.MockitoAnnotations
2121
import org.phoenixframework.queue.ManualDispatchQueue
2222
import org.phoenixframework.utilities.getBindings
@@ -509,8 +509,8 @@ class ChannelTest {
509509
.receive("ok", mockOk)
510510
.receive("error", mockError)
511511
.receive("timeout") {
512-
verifyZeroInteractions(mockOk)
513-
verifyZeroInteractions(mockError)
512+
verifyNoInteractions(mockOk)
513+
verifyNoInteractions(mockError)
514514
timeoutReceived = true
515515
}
516516

@@ -571,8 +571,8 @@ class ChannelTest {
571571
receivesTimeout()
572572

573573
verify(mockError, times(1)).invoke(any())
574-
verifyZeroInteractions(mockOk)
575-
verifyZeroInteractions(mockTimeout)
574+
verifyNoInteractions(mockOk)
575+
verifyNoInteractions(mockTimeout)
576576
}
577577

578578
@Test
@@ -619,7 +619,7 @@ class ChannelTest {
619619
channel.pushBuffer.add(mockPush)
620620

621621
receivesError()
622-
verifyZeroInteractions(mockPush)
622+
verifyNoInteractions(mockPush)
623623
assertThat(channel.pushBuffer).hasSize(1)
624624
}
625625

@@ -744,7 +744,7 @@ class ChannelTest {
744744
joinPush.trigger("ok", kEmptyPayload)
745745

746746
assertThat(channel.state).isEqualTo(Channel.State.JOINED)
747-
verifyZeroInteractions(mockCallback)
747+
verifyNoInteractions(mockCallback)
748748

749749
channel.trigger(Channel.Event.ERROR)
750750
verify(mockCallback, times(1)).invoke(any())
@@ -815,7 +815,7 @@ class ChannelTest {
815815
@Test
816816
internal fun `triggers additional callbacks`() {
817817
channel.onClose(mockCallback)
818-
verifyZeroInteractions(mockCallback)
818+
verifyNoInteractions(mockCallback)
819819

820820
channel.trigger(Channel.Event.CLOSE)
821821
verify(mockCallback, times(1)).invoke(any())
@@ -907,8 +907,8 @@ class ChannelTest {
907907
channel.trigger(event = "event", ref = kDefaultRef)
908908
channel.trigger(event = "other", ref = kDefaultRef)
909909

910-
verifyZeroInteractions(callback1)
911-
verifyZeroInteractions(callback2)
910+
verifyNoInteractions(callback1)
911+
verifyNoInteractions(callback2)
912912
verify(callback3, times(1)).invoke(any())
913913
}
914914

@@ -923,7 +923,7 @@ class ChannelTest {
923923
channel.off("event", ref1)
924924
channel.trigger(event = "event", ref = kDefaultRef)
925925

926-
verifyZeroInteractions(callback1)
926+
verifyNoInteractions(callback1)
927927
verify(callback2, times(1)).invoke(any())
928928
}
929929

@@ -981,7 +981,7 @@ class ChannelTest {
981981
.receive("timeout", mockCallback)
982982

983983
fakeClock.tick(channel.timeout / 2)
984-
verifyZeroInteractions(mockCallback)
984+
verifyNoInteractions(mockCallback)
985985

986986
fakeClock.tick(channel.timeout)
987987
verify(mockCallback).invoke(any())
@@ -995,7 +995,7 @@ class ChannelTest {
995995
.receive("timeout", mockCallback)
996996

997997
fakeClock.tick(channel.timeout)
998-
verifyZeroInteractions(mockCallback)
998+
verifyNoInteractions(mockCallback)
999999

10001000
fakeClock.tick(channel.timeout * 2)
10011001
verify(mockCallback).invoke(any())
@@ -1009,12 +1009,12 @@ class ChannelTest {
10091009
.receive("timeout", mockCallback)
10101010

10111011
fakeClock.tick(channel.timeout / 2)
1012-
verifyZeroInteractions(mockCallback)
1012+
verifyNoInteractions(mockCallback)
10131013

10141014
push.trigger("ok", kEmptyPayload)
10151015

10161016
fakeClock.tick(channel.timeout)
1017-
verifyZeroInteractions(mockCallback)
1017+
verifyNoInteractions(mockCallback)
10181018
}
10191019

10201020
@Test

‎src/test/kotlin/org/phoenixframework/PresenceTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.phoenixframework
22

33
import com.google.common.truth.Truth.assertThat
4-
import com.nhaarman.mockitokotlin2.mock
5-
import com.nhaarman.mockitokotlin2.whenever
4+
import org.mockito.kotlin.mock
5+
import org.mockito.kotlin.whenever
66
import org.junit.jupiter.api.BeforeEach
77
import org.junit.jupiter.api.DisplayName
88
import org.junit.jupiter.api.Nested

‎src/test/kotlin/org/phoenixframework/SocketTest.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package org.phoenixframework
22

33
import com.google.common.truth.Truth.assertThat
4-
import com.nhaarman.mockitokotlin2.any
5-
import com.nhaarman.mockitokotlin2.argumentCaptor
6-
import com.nhaarman.mockitokotlin2.eq
7-
import com.nhaarman.mockitokotlin2.mock
8-
import com.nhaarman.mockitokotlin2.never
9-
import com.nhaarman.mockitokotlin2.spy
10-
import com.nhaarman.mockitokotlin2.times
11-
import com.nhaarman.mockitokotlin2.verify
12-
import com.nhaarman.mockitokotlin2.verifyZeroInteractions
13-
import com.nhaarman.mockitokotlin2.whenever
4+
import org.mockito.kotlin.any
5+
import org.mockito.kotlin.argumentCaptor
6+
import org.mockito.kotlin.eq
7+
import org.mockito.kotlin.mock
8+
import org.mockito.kotlin.never
9+
import org.mockito.kotlin.spy
10+
import org.mockito.kotlin.times
11+
import org.mockito.kotlin.verify
12+
import org.mockito.kotlin.verifyNoInteractions
13+
import org.mockito.kotlin.whenever
1414
import okhttp3.OkHttpClient
1515
import okhttp3.Response
1616
import org.junit.jupiter.api.BeforeEach
@@ -363,7 +363,7 @@ class SocketTest {
363363
@Test
364364
internal fun `does nothing if not connected`() {
365365
socket.disconnect()
366-
verifyZeroInteractions(connection)
366+
verifyNoInteractions(connection)
367367
}
368368

369369
/* End Disconnect */
@@ -664,7 +664,7 @@ class SocketTest {
664664
socket.skipHeartbeat = true
665665
socket.resetHeartbeat()
666666

667-
verifyZeroInteractions(mockDispatchQueue)
667+
verifyNoInteractions(mockDispatchQueue)
668668
}
669669

670670
@Test

‎src/test/kotlin/org/phoenixframework/TimeoutTimerTest.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.phoenixframework
22

33
import com.google.common.truth.Truth
4-
import com.nhaarman.mockitokotlin2.any
5-
import com.nhaarman.mockitokotlin2.argumentCaptor
6-
import com.nhaarman.mockitokotlin2.eq
7-
import com.nhaarman.mockitokotlin2.times
8-
import com.nhaarman.mockitokotlin2.verify
9-
import com.nhaarman.mockitokotlin2.whenever
4+
import org.mockito.kotlin.any
5+
import org.mockito.kotlin.argumentCaptor
6+
import org.mockito.kotlin.eq
7+
import org.mockito.kotlin.times
8+
import org.mockito.kotlin.verify
9+
import org.mockito.kotlin.whenever
1010
import org.junit.jupiter.api.BeforeEach
1111
import org.junit.jupiter.api.Test
1212
import org.mockito.Mock

‎src/test/kotlin/org/phoenixframework/WebSocketTransportTest.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.phoenixframework
22

33
import com.google.common.truth.Truth.assertThat
4-
import com.nhaarman.mockitokotlin2.any
5-
import com.nhaarman.mockitokotlin2.mock
6-
import com.nhaarman.mockitokotlin2.verify
7-
import com.nhaarman.mockitokotlin2.whenever
4+
import org.mockito.kotlin.any
5+
import org.mockito.kotlin.mock
6+
import org.mockito.kotlin.verify
7+
import org.mockito.kotlin.whenever
88
import okhttp3.OkHttpClient
99
import okhttp3.Response
1010
import okhttp3.WebSocket

0 commit comments

Comments
 (0)