♻️ Rename “new-window” event to “window-opened”
authorDavid Roden <github-a8in@qsheltier.de>
Sun, 26 Jan 2025 16:04:13 +0000 (17:04 +0100)
committerDavid Roden <github-a8in@qsheltier.de>
Sun, 26 Jan 2025 16:04:13 +0000 (17:04 +0100)
server/src/main/java/de/qsheltier/msta/Server.java
server/src/test/java/de/qsheltier/msta/ServerTest.java

index 20b981d..8b42f90 100644 (file)
@@ -134,7 +134,7 @@ public class Server implements Closeable {
                        var newWindows = currentlyOpenWindows.stream().filter(window -> !windows.containsValue(window)).toList();
                        newWindows.forEach(newWindow -> {
                                synchronized (outputWriters) {
-                                       outputWriters.forEach(writeLine -> writeLine.accept(createEvent("new-window", new Pair("id", newWindow.getName()), new Pair("is-frame", newWindow instanceof Frame))));
+                                       outputWriters.forEach(writeLine -> writeLine.accept(createEvent("window-opened", new Pair("id", newWindow.getName()), new Pair("is-frame", newWindow instanceof Frame))));
                                }
                                windows.put(newWindow.getName(), newWindow);
                        });
index 2d84ef9..62a596b 100644 (file)
@@ -103,7 +103,7 @@ public class ServerTest {
                        var window = new Window(null);
                        try {
                                window.setVisible(true);
-                               assertThat(reader.get(), isJsonStringMatching(jsonObject().where("event", jsonText("new-window")).where("is-frame", jsonBoolean(false))));
+                               assertThat(reader.get(), isJsonStringMatching(jsonObject().where("event", jsonText("window-opened")).where("is-frame", jsonBoolean(false))));
                        } finally {
                                window.setVisible(false);
                        }
@@ -117,7 +117,7 @@ public class ServerTest {
                        var frame = new Frame("Frame Title");
                        frame.setVisible(true);
                        try {
-                               assertThat(reader.get(), isJsonStringMatching(jsonObject().where("event", jsonText("new-window")).where("is-frame", jsonBoolean(true))));
+                               assertThat(reader.get(), isJsonStringMatching(jsonObject().where("event", jsonText("window-opened")).where("is-frame", jsonBoolean(true))));
                        } finally {
                                frame.setVisible(false);
                        }
@@ -147,7 +147,7 @@ public class ServerTest {
                                        createConnection(server, verifyConnectedEvent(((reader, ready, writer) -> {
                                                startedThreads.countDown();
                                                windowOpened.await();
-                                               assertThat(reader.get(), isJsonStringMatching(jsonObject().where("event", jsonText("new-window"))));
+                                               assertThat(reader.get(), isJsonStringMatching(jsonObject().where("event", jsonText("window-opened"))));
                                                notifiedThreads.countDown();
                                        })));
                                } catch (Exception e) {
@@ -159,7 +159,7 @@ public class ServerTest {
                                        createConnection(server, verifyConnectedEvent(((reader, ready, writer) -> {
                                                startedThreads.countDown();
                                                windowOpened.await();
-                                               assertThat(reader.get(), isJsonStringMatching(jsonObject().where("event", jsonText("new-window"))));
+                                               assertThat(reader.get(), isJsonStringMatching(jsonObject().where("event", jsonText("window-opened"))));
                                                notifiedThreads.countDown();
                                        })));
                                } catch (Exception e) {
@@ -187,7 +187,7 @@ public class ServerTest {
                        window.setVisible(true);
                        try {
                                var reply = objectMapper.readTree(reader.get());
-                               assertThat(reply, jsonObject().where("event", jsonText("new-window")).where("id", not(jsonMissing())));
+                               assertThat(reply, jsonObject().where("event", jsonText("window-opened")).where("id", not(jsonMissing())));
                                var windowName = reply.get("id").asText();
                                writer.accept("info window " + windowName);
                                reply = objectMapper.readTree(reader.get());