From 8cc8f2500e8f58e7f14922871b6c7151ea11984c Mon Sep 17 00:00:00 2001
From: Silthus <michael@reichenbach.in>
Date: Sun, 27 Feb 2022 06:42:44 +0100
Subject: [PATCH] test: adjust ui to new minimessage format

---
 .../schat/platform/config/ConfigTests.java    |  9 +++++----
 .../ui/format/MiniMessageFormatTest.java      |  6 +++---
 .../views/tabbed/TabbedChannelsViewTests.java | 20 +++++++++----------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/platform/src/test/java/net/silthus/schat/platform/config/ConfigTests.java b/platform/src/test/java/net/silthus/schat/platform/config/ConfigTests.java
index 5cd802608..22c4fd4d1 100644
--- a/platform/src/test/java/net/silthus/schat/platform/config/ConfigTests.java
+++ b/platform/src/test/java/net/silthus/schat/platform/config/ConfigTests.java
@@ -28,7 +28,6 @@
 import java.util.Optional;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
-import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.silthus.schat.channel.Channel;
 import net.silthus.schat.chatter.ChatterMock;
 import net.silthus.schat.commands.CreatePrivateChannelCommand;
@@ -42,8 +41,11 @@
 import org.junit.jupiter.api.io.TempDir;
 
 import static net.kyori.adventure.text.Component.text;
+import static net.kyori.adventure.text.format.NamedTextColor.AQUA;
 import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
 import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
+import static net.kyori.adventure.text.format.TextDecoration.UNDERLINED;
 import static net.silthus.schat.channel.ChannelHelper.channelWith;
 import static net.silthus.schat.channel.ChannelRepository.createInMemoryChannelRepository;
 import static net.silthus.schat.channel.ChannelSettings.PROTECTED;
@@ -62,7 +64,6 @@
 
 class ConfigTests {
 
-    private static final MiniMessage FORMATTER = MiniMessage.miniMessage();
     private SChatConfig config;
 
     @BeforeEach
@@ -118,7 +119,7 @@ void set_values_writes_and_loads_when_reloaded() {
         void loads_custom_private_chat_message_format() {
             final Component format = config.get(VIEW_CONFIG).format().get(MESSAGE_FORMAT)
                 .format(View.empty(), message("Hey").source(identity("Bob")).create());
-            assertThat(FORMATTER.serialize(format)).isEqualTo("<aqua>[Bob]</aqua>: Hey");
+            assertThat(format).isEqualTo(text().append(text("[Bob]", AQUA)).append(text(": Hey")).build());
         }
 
         @Test
@@ -132,7 +133,7 @@ void uses_default_format_if_no_config_is_set() {
             final Tab tab = mock(Tab.class);
             when(tab.get(Tab.CHANNEL)).thenReturn(Optional.of(channel));
             final Component format = config.get(VIEW_CONFIG).privateChatFormat().get(ACTIVE_TAB_FORMAT).format(view, tab);
-            assertThat(FORMATTER.serialize(format)).isEqualTo("<green><underlined>Karl");
+            assertThat(format).isEqualTo(text("Karl", GREEN, UNDERLINED));
         }
     }
 }
diff --git a/ui/src/test/java/net/silthus/schat/ui/format/MiniMessageFormatTest.java b/ui/src/test/java/net/silthus/schat/ui/format/MiniMessageFormatTest.java
index b7acd3355..fc1ed48a0 100644
--- a/ui/src/test/java/net/silthus/schat/ui/format/MiniMessageFormatTest.java
+++ b/ui/src/test/java/net/silthus/schat/ui/format/MiniMessageFormatTest.java
@@ -61,7 +61,7 @@ void simple_text_only_message() {
     void formatted_text_message() {
         assertFormat("<gray><text>",
             message(text("Hi").append(text(" there!", RED, BOLD))),
-            "<gray>Hi</gray><red><bold> there!"
+            "<gray>Hi<bold><red> there!"
         );
     }
 
@@ -69,7 +69,7 @@ void formatted_text_message() {
     void message_without_source_but_source_format() {
         assertFormat("<source>: <text>",
             message("Hey"),
-            "<source>: Hey"
+            "\\<source>: Hey"
         );
     }
 
@@ -89,7 +89,7 @@ void formats_complex_message() {
 
         assertFormat("<aqua>(<source.active_channel.name><aqua>) <yellow><source.display_name><gray>: <text>",
             message,
-            "<aqua>(</aqua><green>Test</green><aqua>) </aqua><yellow></yellow><dark_red>Bobby</dark_red><gray>: Hey </gray><red><bold>@Silthus"
+            "<aqua>(<green>Test</green>) <yellow><dark_red>Bobby</dark_red><gray>: Hey <bold><red>@Silthus"
         );
     }
 }
diff --git a/ui/src/test/java/net/silthus/schat/ui/views/tabbed/TabbedChannelsViewTests.java b/ui/src/test/java/net/silthus/schat/ui/views/tabbed/TabbedChannelsViewTests.java
index 80016a0cb..7a1dcd296 100644
--- a/ui/src/test/java/net/silthus/schat/ui/views/tabbed/TabbedChannelsViewTests.java
+++ b/ui/src/test/java/net/silthus/schat/ui/views/tabbed/TabbedChannelsViewTests.java
@@ -134,15 +134,15 @@ private void assertTextDoesNotContain(String... unexpected) {
     }
 
     private void assertViewRenders(String expected) {
-        assertEquals(expected, COMPONENT_SERIALIZER.serialize(view.render()).trim());
+        assertEquals(expected, COMPONENT_SERIALIZER.serialize(view.render()).replaceAll("<br></br>", "\n").trim());
     }
 
     private void assertViewDoesNotContain(String... unexpected) {
-        assertThat(COMPONENT_SERIALIZER.serialize(view.render()).trim()).doesNotContain(unexpected);
+        assertThat(COMPONENT_SERIALIZER.serialize(view.render()).replaceAll("<br></br>", "\n").trim()).doesNotContain(unexpected);
     }
 
     private void assertViewContains(String... expected) {
-        assertThat(COMPONENT_SERIALIZER.serialize(view.render()).trim()).contains(expected);
+        assertThat(COMPONENT_SERIALIZER.serialize(view.render()).replaceAll("<br></br>", "\n").trim()).contains(expected);
     }
 
     private void assertColorOnlyViewContains(String... expected) {
@@ -213,7 +213,7 @@ void renders_both_messages() {
             sendMessageWithSource("Silthus", "Yo");
             assertViewRenders("""
                 Hey
-                <yellow>Silthus</yellow><gray>: Yo</gray>"""
+                <yellow>Silthus<gray>: </gray><gray>Yo</gray></yellow><br>"""
             );
         }
     }
@@ -257,7 +257,7 @@ void setUp() {
 
             @Test
             void underlines_channel() {
-                assertViewRenders("| <red><hover:show_text:\"<lang:schat.hover.leave-channel:\\\"<gray>test\\\">\"><click:run_command:\"/channel leave test\">❌</red><green><underlined>test</click></hover></underlined></green> |");
+                assertViewRenders("| <red><click:run_command:'/channel leave test'><hover:show_text:\"<lang:schat.hover.leave-channel:'<gray>test'>\">❌<underlined><green>test</green></underlined></hover></click></red> |");
             }
 
             @Nested
@@ -271,7 +271,7 @@ void setUp() {
 
                 @Test
                 void uses_custom_format() {
-                    assertViewRenders("| <red><hover:show_text:\"<lang:schat.hover.leave-channel:\\\"<gray>test\\\">\"><click:run_command:\"/channel leave test\">❌<underlined>test</click></hover></underlined></red> |");
+                    assertViewRenders("| <red><click:run_command:'/channel leave test'><hover:show_text:\"<lang:schat.hover.leave-channel:'<gray>test'>\">❌<underlined><red>test</red></underlined></hover></click></red> |");
                 }
             }
         }
@@ -285,7 +285,7 @@ void setUp() {
 
             @Test
             void then_channel_click_executes_join_command() {
-                assertViewContains("<click:run_command:\"/channel join test\">test</click>");
+                assertViewContains("<click:run_command:'/channel join test'>");
             }
         }
 
@@ -330,8 +330,8 @@ void displays_private_messages() throws InterruptedException {
             Thread.sleep(1L);
             sendPrivateMessage(target, chatter, text("Hey back"));
             assertViewContains("""
-                <yellow><lang:schat.chat.message.you></yellow><gray>: Hi</gray>
-                <aqua>target</aqua><gray>: Hey back</gray>""");
+                <yellow><lang:schat.chat.message.you><gray>: </gray><gray>Hi</gray></lang></yellow>
+                <aqua>target<gray>: </gray><gray>Hey back</gray></aqua>""");
         }
     }
 
@@ -464,7 +464,7 @@ void renders_full_view() {
                 No Source!
                 Player: Hey
                 Player2: Hello
-                | <red><hover:show_text:"<lang:schat.hover.leave-channel:\\"<gray>zzz\\">"><click:run_command:"/channel leave zzz">❌</red><green><underlined>zzz</click></hover></underlined></green> | <red><hover:show_text:"<lang:schat.hover.leave-channel:\\"<gray>aaa\\">"><click:run_command:"/channel leave aaa">❌</click></red><gray><click:run_command:"/channel join aaa">aaa</click></hover></gray> |""");
+                | <red><click:run_command:'/channel leave zzz'><hover:show_text:"<lang:schat.hover.leave-channel:'<gray>zzz'>">❌<underlined><green>zzz</green></underlined></hover></click></red> | <red><click:run_command:'/channel leave aaa'><hover:show_text:"<lang:schat.hover.leave-channel:'<gray>aaa'>">❌<gray><click:run_command:'/channel join aaa'><hover:show_text:"<gray><lang:schat.hover.join-channel:'aaa'>">aaa</hover></click></gray></hover></click></red> |""");
         }
     }