Skip to content

Upgrade test dependencies #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 22, 2021
Merged

Upgrade test dependencies #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de1c4c8
Upgrades test dependencies
Nov 19, 2021
06ac6c0
Upgrades test dependencies
Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'

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

jacocoTestReport {
Expand Down
46 changes: 23 additions & 23 deletions src/test/kotlin/org/phoenixframework/ChannelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
package org.phoenixframework

import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.eq
import com.nhaarman.mockitokotlin2.mock
import com.nhaarman.mockitokotlin2.never
import com.nhaarman.mockitokotlin2.spy
import com.nhaarman.mockitokotlin2.times
import com.nhaarman.mockitokotlin2.verify
import com.nhaarman.mockitokotlin2.whenever
import org.mockito.kotlin.any
import org.mockito.kotlin.eq
import org.mockito.kotlin.mock
import org.mockito.kotlin.never
import org.mockito.kotlin.spy
import org.mockito.kotlin.times
import org.mockito.kotlin.verify
import org.mockito.kotlin.whenever
import okhttp3.OkHttpClient
import org.junit.jupiter.api.AfterEach
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.DisplayName
import org.junit.jupiter.api.Nested
import org.junit.jupiter.api.Test
import org.mockito.Mock
import org.mockito.Mockito.verifyZeroInteractions
import org.mockito.Mockito.verifyNoInteractions
import org.mockito.MockitoAnnotations
import org.phoenixframework.queue.ManualDispatchQueue
import org.phoenixframework.utilities.getBindings
Expand Down Expand Up @@ -509,8 +509,8 @@ class ChannelTest {
.receive("ok", mockOk)
.receive("error", mockError)
.receive("timeout") {
verifyZeroInteractions(mockOk)
verifyZeroInteractions(mockError)
verifyNoInteractions(mockOk)
verifyNoInteractions(mockError)
timeoutReceived = true
}

Expand Down Expand Up @@ -571,8 +571,8 @@ class ChannelTest {
receivesTimeout()

verify(mockError, times(1)).invoke(any())
verifyZeroInteractions(mockOk)
verifyZeroInteractions(mockTimeout)
verifyNoInteractions(mockOk)
verifyNoInteractions(mockTimeout)
}

@Test
Expand Down Expand Up @@ -619,7 +619,7 @@ class ChannelTest {
channel.pushBuffer.add(mockPush)

receivesError()
verifyZeroInteractions(mockPush)
verifyNoInteractions(mockPush)
assertThat(channel.pushBuffer).hasSize(1)
}

Expand Down Expand Up @@ -744,7 +744,7 @@ class ChannelTest {
joinPush.trigger("ok", kEmptyPayload)

assertThat(channel.state).isEqualTo(Channel.State.JOINED)
verifyZeroInteractions(mockCallback)
verifyNoInteractions(mockCallback)

channel.trigger(Channel.Event.ERROR)
verify(mockCallback, times(1)).invoke(any())
Expand Down Expand Up @@ -815,7 +815,7 @@ class ChannelTest {
@Test
internal fun `triggers additional callbacks`() {
channel.onClose(mockCallback)
verifyZeroInteractions(mockCallback)
verifyNoInteractions(mockCallback)

channel.trigger(Channel.Event.CLOSE)
verify(mockCallback, times(1)).invoke(any())
Expand Down Expand Up @@ -907,8 +907,8 @@ class ChannelTest {
channel.trigger(event = "event", ref = kDefaultRef)
channel.trigger(event = "other", ref = kDefaultRef)

verifyZeroInteractions(callback1)
verifyZeroInteractions(callback2)
verifyNoInteractions(callback1)
verifyNoInteractions(callback2)
verify(callback3, times(1)).invoke(any())
}

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

verifyZeroInteractions(callback1)
verifyNoInteractions(callback1)
verify(callback2, times(1)).invoke(any())
}

Expand Down Expand Up @@ -981,7 +981,7 @@ class ChannelTest {
.receive("timeout", mockCallback)

fakeClock.tick(channel.timeout / 2)
verifyZeroInteractions(mockCallback)
verifyNoInteractions(mockCallback)

fakeClock.tick(channel.timeout)
verify(mockCallback).invoke(any())
Expand All @@ -995,7 +995,7 @@ class ChannelTest {
.receive("timeout", mockCallback)

fakeClock.tick(channel.timeout)
verifyZeroInteractions(mockCallback)
verifyNoInteractions(mockCallback)

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

fakeClock.tick(channel.timeout / 2)
verifyZeroInteractions(mockCallback)
verifyNoInteractions(mockCallback)

push.trigger("ok", kEmptyPayload)

fakeClock.tick(channel.timeout)
verifyZeroInteractions(mockCallback)
verifyNoInteractions(mockCallback)
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions src/test/kotlin/org/phoenixframework/PresenceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.phoenixframework

import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.mock
import com.nhaarman.mockitokotlin2.whenever
import org.mockito.kotlin.mock
import org.mockito.kotlin.whenever
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.DisplayName
import org.junit.jupiter.api.Nested
Expand Down
24 changes: 12 additions & 12 deletions src/test/kotlin/org/phoenixframework/SocketTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package org.phoenixframework

import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.argumentCaptor
import com.nhaarman.mockitokotlin2.eq
import com.nhaarman.mockitokotlin2.mock
import com.nhaarman.mockitokotlin2.never
import com.nhaarman.mockitokotlin2.spy
import com.nhaarman.mockitokotlin2.times
import com.nhaarman.mockitokotlin2.verify
import com.nhaarman.mockitokotlin2.verifyZeroInteractions
import com.nhaarman.mockitokotlin2.whenever
import org.mockito.kotlin.any
import org.mockito.kotlin.argumentCaptor
import org.mockito.kotlin.eq
import org.mockito.kotlin.mock
import org.mockito.kotlin.never
import org.mockito.kotlin.spy
import org.mockito.kotlin.times
import org.mockito.kotlin.verify
import org.mockito.kotlin.verifyNoInteractions
import org.mockito.kotlin.whenever
import okhttp3.OkHttpClient
import okhttp3.Response
import org.junit.jupiter.api.BeforeEach
Expand Down Expand Up @@ -363,7 +363,7 @@ class SocketTest {
@Test
internal fun `does nothing if not connected`() {
socket.disconnect()
verifyZeroInteractions(connection)
verifyNoInteractions(connection)
}

/* End Disconnect */
Expand Down Expand Up @@ -664,7 +664,7 @@ class SocketTest {
socket.skipHeartbeat = true
socket.resetHeartbeat()

verifyZeroInteractions(mockDispatchQueue)
verifyNoInteractions(mockDispatchQueue)
}

@Test
Expand Down
12 changes: 6 additions & 6 deletions src/test/kotlin/org/phoenixframework/TimeoutTimerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.phoenixframework

import com.google.common.truth.Truth
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.argumentCaptor
import com.nhaarman.mockitokotlin2.eq
import com.nhaarman.mockitokotlin2.times
import com.nhaarman.mockitokotlin2.verify
import com.nhaarman.mockitokotlin2.whenever
import org.mockito.kotlin.any
import org.mockito.kotlin.argumentCaptor
import org.mockito.kotlin.eq
import org.mockito.kotlin.times
import org.mockito.kotlin.verify
import org.mockito.kotlin.whenever
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.mockito.Mock
Expand Down
8 changes: 4 additions & 4 deletions src/test/kotlin/org/phoenixframework/WebSocketTransportTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.phoenixframework

import com.google.common.truth.Truth.assertThat
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.mock
import com.nhaarman.mockitokotlin2.verify
import com.nhaarman.mockitokotlin2.whenever
import org.mockito.kotlin.any
import org.mockito.kotlin.mock
import org.mockito.kotlin.verify
import org.mockito.kotlin.whenever
import okhttp3.OkHttpClient
import okhttp3.Response
import okhttp3.WebSocket
Expand Down