Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions src/main/kotlin/org/phoenixframework/Socket.kt
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,10 @@ internal class StateChangeCallbacks {

/** Clears any callbacks with the matching refs */
fun release(refs: List<String>) {
open = open.filter { refs.contains(it.first) }
close = close.filter { refs.contains(it.first) }
error = error.filter { refs.contains(it.first) }
message = message.filter { refs.contains(it.first) }

open = open.filterNot { refs.contains(it.first) }
close = close.filterNot { refs.contains(it.first) }
error = error.filterNot { refs.contains(it.first) }
message = message.filterNot { refs.contains(it.first) }
}

/** Clears all stored callbacks */
Expand Down Expand Up @@ -556,4 +555,4 @@ class Socket(
this.stateChangeCallbacks.error.forEach { it.second.invoke(t, response) }
}

}
}
25 changes: 24 additions & 1 deletion src/test/kotlin/org/phoenixframework/SocketTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,29 @@ class SocketTest {
/* End Remove */
}

@Nested
@DisplayName("release")
inner class Release {
@Test
internal fun `Clears any callbacks with the matching refs`() {
socket.stateChangeCallbacks.onOpen("1") {}
socket.stateChangeCallbacks.onOpen("2") {}
socket.stateChangeCallbacks.onClose("1") {}
socket.stateChangeCallbacks.onClose("2") {}
socket.stateChangeCallbacks.onError("1") { _: Throwable, _: Response? -> }
socket.stateChangeCallbacks.onError("2") { _: Throwable, _: Response? -> }
socket.stateChangeCallbacks.onMessage("1") { }
socket.stateChangeCallbacks.onMessage("2") { }

socket.stateChangeCallbacks.release(listOf("1"))

assertThat(socket.stateChangeCallbacks.open).doesNotContain("1")
assertThat(socket.stateChangeCallbacks.close).doesNotContain("1")
assertThat(socket.stateChangeCallbacks.error).doesNotContain("1")
assertThat(socket.stateChangeCallbacks.message).doesNotContain("1")
}
}

@Nested
@DisplayName("push")
inner class Push {
Expand Down Expand Up @@ -1040,4 +1063,4 @@ class SocketTest {
}


}
}