mirror of
https://github.com/praktimarc/kst4contest.git
synced 2026-11-08 22:38:36 +01:00
1 parent
c23982c339
commit
4d96822c0c
3 files changed
+148
-8
No files matched your search
@@ -3032,6 +3032,20 @@ public class Kst4ContestApplication implements StatusUpdateListener, SettingsHos
|
||||
private java.util.function.Consumer<java.util.List<ChatMessage>> composeChatListener;
|
||||
private java.util.function.Consumer<java.util.List<ClusterMessage>> composeClusterListener;
|
||||
|
||||
/**
|
||||
* Fills the three global Compose message tables from their filtered
|
||||
* controller views.
|
||||
*/
|
||||
/* package */ static void refreshComposeMessageTables(
|
||||
final ChatController controller,
|
||||
final DataTableState<ChatMessage> directed,
|
||||
final DataTableState<ChatMessage> publicMessages,
|
||||
final DataTableState<ChatMessage> qsoOfTheOther) {
|
||||
directed.replaceRows(controller.toMeMessages());
|
||||
publicMessages.replaceRows(controller.toAllMessages());
|
||||
qsoOfTheOther.replaceRows(controller.toOtherMessages());
|
||||
}
|
||||
|
||||
/**
|
||||
* Opens the Compose main window beside the JavaFX one.
|
||||
*
|
||||
@@ -3342,11 +3356,11 @@ public class Kst4ContestApplication implements StatusUpdateListener, SettingsHos
|
||||
return kotlin.Unit.INSTANCE;
|
||||
});
|
||||
|
||||
composeChatListener = rows -> uiDispatcher.runOnUi(() -> {
|
||||
directed.replaceRows(chatcontroller.toMeMessages());
|
||||
publicMessages.replaceRows(rows);
|
||||
qsoOfTheOther.replaceRows(chatcontroller.toOtherMessages());
|
||||
});
|
||||
composeChatListener = rows -> uiDispatcher.runOnUi(() -> refreshComposeMessageTables(
|
||||
chatcontroller,
|
||||
directed,
|
||||
publicMessages,
|
||||
qsoOfTheOther));
|
||||
chatcontroller.getLst_globalChatMessageList().addListener(composeChatListener);
|
||||
|
||||
composeClusterListener = rows -> uiDispatcher.runOnUi(() -> cluster.replaceRows(rows));
|
||||
@@ -3361,10 +3375,8 @@ public class Kst4ContestApplication implements StatusUpdateListener, SettingsHos
|
||||
stations.replaceRows(initialMembers);
|
||||
newJoined.updateActiveMembers(initialMembers);
|
||||
newJoined.updateEvents(chatcontroller.getRecentChatJoins().snapshot());
|
||||
directed.replaceRows(chatcontroller.toMeMessages());
|
||||
publicMessages.replaceRows(chatcontroller.getLst_globalChatMessageList().snapshot());
|
||||
refreshComposeMessageTables(chatcontroller, directed, publicMessages, qsoOfTheOther);
|
||||
cluster.replaceRows(chatcontroller.getLst_clusterMemberList().snapshot());
|
||||
qsoOfTheOther.replaceRows(chatcontroller.toOtherMessages());
|
||||
/*
|
||||
* The only push that does not check the feed for null, and deliberately so: the
|
||||
* feed is assigned earlier in this same method, so a guard here could never fire
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
package kst4contest.view
|
||||
|
||||
import kst4contest.controller.ChatController
|
||||
import kst4contest.model.ChatMessage
|
||||
import kst4contest.view.compose.DataTableState
|
||||
import kst4contest.view.compose.RowKeys
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.Test
|
||||
import org.mockito.Mockito.mock
|
||||
import org.mockito.Mockito.`when`
|
||||
|
||||
class ComposeMessageTableRefreshTest {
|
||||
|
||||
@Test
|
||||
fun `refresh keeps public table on the filtered controller view`() {
|
||||
val controller = mock(ChatController::class.java)
|
||||
val privateToMe = message("private to me")
|
||||
val publicInitial = message("public initial")
|
||||
val betweenOthers = message("between others")
|
||||
val directed = table()
|
||||
val publicMessages = table()
|
||||
val qsoOfTheOther = table()
|
||||
|
||||
`when`(controller.toMeMessages()).thenReturn(listOf(privateToMe))
|
||||
`when`(controller.toAllMessages()).thenReturn(listOf(publicInitial))
|
||||
`when`(controller.toOtherMessages()).thenReturn(listOf(betweenOthers))
|
||||
|
||||
Kst4ContestApplication.refreshComposeMessageTables(
|
||||
controller,
|
||||
directed,
|
||||
publicMessages,
|
||||
qsoOfTheOther,
|
||||
)
|
||||
|
||||
assertEquals(listOf(privateToMe), directed.rows)
|
||||
assertEquals(listOf(publicInitial), publicMessages.rows)
|
||||
assertEquals(listOf(betweenOthers), qsoOfTheOther.rows)
|
||||
|
||||
val publicLater = message("public later")
|
||||
`when`(controller.toAllMessages()).thenReturn(listOf(publicLater, publicInitial))
|
||||
|
||||
Kst4ContestApplication.refreshComposeMessageTables(
|
||||
controller,
|
||||
directed,
|
||||
publicMessages,
|
||||
qsoOfTheOther,
|
||||
)
|
||||
|
||||
assertEquals(listOf(publicLater, publicInitial), publicMessages.rows)
|
||||
}
|
||||
|
||||
private fun table() = DataTableState(
|
||||
columns = emptyList(),
|
||||
rowKey = RowKeys.byReference<ChatMessage>(),
|
||||
)
|
||||
|
||||
private fun message(text: String) = ChatMessage().apply {
|
||||
messageText = text
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user