test(server/ClientXmlReadTest): simplify assertions

Author: xeruf

server/test/sc/server/client/MessageListener.kt

@@ -3,7 +3,6 @@ package sc.server.client
 import io.kotest.matchers.collections.shouldNotBeEmpty
 import io.kotest.matchers.should
 import io.kotest.matchers.types.beInstanceOf
-import io.kotest.matchers.types.shouldBeInstanceOf
 import kotlinx.coroutines.runBlocking
 import sc.server.network.await
 import java.util.ArrayDeque
@@ -13,7 +12,7 @@ import kotlin.reflect.cast
 import kotlin.time.ExperimentalTime
 
 open class MessageListener<T: Any> {
-    private val messages: Queue<T> = ArrayDeque()
+    protected val messages: Queue<T> = ArrayDeque()
 
     fun addMessage(message: T) =
             messages.add(message)

server/test/sc/server/network/ClientXmlReadTest.java

@@ -1,6 +1,5 @@
 package sc.server.network;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import sc.networking.clients.XStreamClient;
@@ -9,6 +8,8 @@
 
 import java.io.IOException;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class ClientXmlReadTest {
   private static class StupidClientListener implements IClientRequestListener {
     public Object lastPacket = null;
@@ -33,9 +34,9 @@ public void clientReceivePacketTest() throws IOException, InterruptedException {
     client.setRequestHandler(clientListener);
     client.start();
 
-    Assertions.assertNotNull(client.receive());
-    Assertions.assertNotNull(clientListener.lastPacket);
-    Assertions.assertTrue(clientListener.lastPacket instanceof ExamplePacket);
+    assertNotNull(client.receive());
+    assertNotNull(clientListener.lastPacket);
+    assertTrue(clientListener.lastPacket instanceof ExamplePacket);
   }
 
   @Test
@@ -47,7 +48,7 @@ public void clientSendPacketTest() throws IOException {
     client.start();
     client.send(new ExamplePacket());
     String data = stringInterface.getData();
-    Assertions.assertTrue(data.startsWith("<protocol>\n  <example"));
+    assertEquals(data, "<protocol>\n  <example/>");
   }
 
   private void aliasExamplePacket(XStreamClient client) {