From 165f791836d43a22f84b794ddcc72a3eef9cf575 Mon Sep 17 00:00:00 2001 From: David Roden Date: Sun, 26 Jan 2025 17:04:13 +0100 Subject: [PATCH] =?utf8?q?=E2=99=BB=EF=B8=8F=20Rename=20=E2=80=9Cnew-windo?= =?utf8?q?w=E2=80=9D=20event=20to=20=E2=80=9Cwindow-opened=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- server/src/main/java/de/qsheltier/msta/Server.java | 2 +- server/src/test/java/de/qsheltier/msta/ServerTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/de/qsheltier/msta/Server.java b/server/src/main/java/de/qsheltier/msta/Server.java index 20b981d..8b42f90 100644 --- a/server/src/main/java/de/qsheltier/msta/Server.java +++ b/server/src/main/java/de/qsheltier/msta/Server.java @@ -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); }); diff --git a/server/src/test/java/de/qsheltier/msta/ServerTest.java b/server/src/test/java/de/qsheltier/msta/ServerTest.java index 2d84ef9..62a596b 100644 --- a/server/src/test/java/de/qsheltier/msta/ServerTest.java +++ b/server/src/test/java/de/qsheltier/msta/ServerTest.java @@ -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()); -- 2.7.4