From 739685671cf6122d913cb3b8b05b7b0344305487 Mon Sep 17 00:00:00 2001
From: Linus Samuelsson <smulle.junior@gmail.com>
Date: Sun, 16 Nov 2025 09:00:51 +0100
Subject: [PATCH 1/9] Basic send and recieve message

---
 .gitignore                                    |  1 +
 pom.xml                                       | 10 +++
 .../java/com/example/HelloController.java     |  9 +++
 src/main/java/com/example/HelloFX.java        |  4 ++
 src/main/java/com/example/HelloModel.java     | 67 +++++++++++++++++++
 src/main/java/com/example/NtfyMessageDto.java |  6 ++
 src/main/java/module-info.java                |  3 +
 .../resources/com/example/hello-view.fxml     | 11 +--
 8 files changed, 107 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/example/NtfyMessageDto.java

diff --git a/.gitignore b/.gitignore
index 6ac465db..5a54815d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 target/
 /.idea/
+.env
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c40f667e..9ee23793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,16 @@
             <artifactId>javafx-fxml</artifactId>
             <version>${javafx.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.github.cdimascio</groupId>
+            <artifactId>dotenv-java</artifactId>
+            <version>3.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>tools.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>3.0.1</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index fdd160a0..ad2561f7 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -1,7 +1,9 @@
 package com.example;
 
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.control.ListView;
 
 /**
  * Controller layer: mediates between the view (FXML) and the model.
@@ -9,6 +11,7 @@
 public class HelloController {
 
     private final HelloModel model = new HelloModel();
+    public ListView<NtfyMessageDto> messageView;
 
     @FXML
     private Label messageLabel;
@@ -18,5 +21,11 @@ private void initialize() {
         if (messageLabel != null) {
             messageLabel.setText(model.getGreeting());
         }
+        messageView.setItems(model.getMessages());
+
+    }
+
+    public void sendMessage(ActionEvent actionEvent) {
+        model.sendMessage();
     }
 }
diff --git a/src/main/java/com/example/HelloFX.java b/src/main/java/com/example/HelloFX.java
index 96bdc5ca..19ca0e8c 100644
--- a/src/main/java/com/example/HelloFX.java
+++ b/src/main/java/com/example/HelloFX.java
@@ -1,5 +1,6 @@
 package com.example;
 
+import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -10,6 +11,9 @@ public class HelloFX extends Application {
 
     @Override
     public void start(Stage stage) throws Exception {
+        Dotenv dotenv = Dotenv.load();
+        System.out.println(dotenv.get("HOST_NAME"));
+
         FXMLLoader fxmlLoader = new FXMLLoader(HelloFX.class.getResource("hello-view.fxml"));
         Parent root = fxmlLoader.load();
         Scene scene = new Scene(root, 640, 480);
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 385cfd10..a6bca072 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -1,9 +1,42 @@
 package com.example;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.github.cdimascio.dotenv.Dotenv;
+import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import tools.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.ArrayList;
+import java.util.Objects;
+
 /**
  * Model layer: encapsulates application data and business logic.
  */
 public class HelloModel {
+
+    private final String hostName;
+    private final HttpClient http = HttpClient.newHttpClient();
+    private final ObjectMapper mapper = new ObjectMapper();
+
+    public ObservableList<NtfyMessageDto> getMessages() {
+        return messages;
+    }
+
+    private final ObservableList<NtfyMessageDto> messages = FXCollections.observableArrayList();
+
+    public HelloModel() {
+        Dotenv dotenv = Dotenv.load();
+        hostName = Objects.requireNonNull(dotenv.get("HOST_NAME"));
+        receiveMessage();
+
+    }
+
     /**
      * Returns a greeting based on the current Java and JavaFX versions.
      */
@@ -12,4 +45,38 @@ public String getGreeting() {
         String javafxVersion = System.getProperty("javafx.version");
         return "Hello, JavaFX " + javafxVersion + ", running on Java " + javaVersion + ".";
     }
+
+    public void sendMessage() {
+        //Todo: Send message using HTTPClient
+
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .POST(HttpRequest.BodyPublishers.ofString("Hello World"))
+                .uri(URI.create(hostName + "/mytopic"))
+                .build();
+        try {
+            //Todo: handle long blocking send requests to not freeze the JavaFX thread
+            //1. Use thread send message?
+            //2. Use async?
+            var response = http.send(httpRequest, HttpResponse.BodyHandlers.ofString());
+        } catch (IOException e) {
+            System.out.println("Error sending message");
+        } catch (InterruptedException e) {
+            System.out.println("Interrupted");
+        }
+    }
+    public void receiveMessage() {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .GET()
+                .uri(URI.create(hostName + "/mytopic/json"))
+                .build();
+
+        http.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
+                .thenAccept(response -> response.body()
+                        .map(s ->
+                                mapper.readValue(s, NtfyMessageDto.class))
+                        .filter(message -> message.event().equals("message"))
+                        .peek(System.out::println)
+                        .forEach(s -> Platform.runLater(() -> messages.add(s))));
+    }
 }
+
diff --git a/src/main/java/com/example/NtfyMessageDto.java b/src/main/java/com/example/NtfyMessageDto.java
new file mode 100644
index 00000000..d7a1682c
--- /dev/null
+++ b/src/main/java/com/example/NtfyMessageDto.java
@@ -0,0 +1,6 @@
+package com.example;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record NtfyMessageDto(String id, long time, String event, String topic, String message){}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 71574a27..649be1ab 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,6 +1,9 @@
 module hellofx {
     requires javafx.controls;
     requires javafx.fxml;
+    requires io.github.cdimascio.dotenv.java;
+    requires java.net.http;
+    requires tools.jackson.databind;
 
     opens com.example to javafx.fxml;
     exports com.example;
diff --git a/src/main/resources/com/example/hello-view.fxml b/src/main/resources/com/example/hello-view.fxml
index 20a7dc82..0074f633 100644
--- a/src/main/resources/com/example/hello-view.fxml
+++ b/src/main/resources/com/example/hello-view.fxml
@@ -2,8 +2,11 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.control.Label?>
 
-<StackPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.example.HelloController">
-    <children>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ListView?>
+<VBox alignment="CENTER" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.example.HelloController">
         <Label fx:id="messageLabel" text="Hello, JavaFX!" />
-    </children>
-</StackPane>
+        <Button text="Send message" onAction="#sendMessage"/>
+        <ListView fx:id="messageView"/>
+</VBox>

From be67e407540ac5e7c739606043273dbf9284025c Mon Sep 17 00:00:00 2001
From: Linus Samuelsson <smulle.junior@gmail.com>
Date: Mon, 17 Nov 2025 12:10:06 +0100
Subject: [PATCH 2/9] Fixed nullpointerexceptions

---
 .../java/com/example/HelloController.java     |  2 +-
 src/main/java/com/example/HelloModel.java     | 59 +++++++----------
 src/main/java/com/example/NtfyConnection.java | 10 +++
 .../java/com/example/NtfyConnectionImpl.java  | 64 +++++++++++++++++++
 src/main/java/module-info.java                |  1 +
 src/test/java/com/example/HelloModelTest.java | 23 +++++++
 .../java/com/example/NtfyConnectionSpy.java   | 20 ++++++
 7 files changed, 141 insertions(+), 38 deletions(-)
 create mode 100644 src/main/java/com/example/NtfyConnection.java
 create mode 100644 src/main/java/com/example/NtfyConnectionImpl.java
 create mode 100644 src/test/java/com/example/HelloModelTest.java
 create mode 100644 src/test/java/com/example/NtfyConnectionSpy.java

diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index ad2561f7..56d129dd 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -10,7 +10,7 @@
  */
 public class HelloController {
 
-    private final HelloModel model = new HelloModel();
+    private final HelloModel model = new HelloModel(new NtfyConnectionImpl());
     public ListView<NtfyMessageDto> messageView;
 
     @FXML
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index a6bca072..0f2e3324 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.github.cdimascio.dotenv.Dotenv;
 import javafx.application.Platform;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import tools.jackson.databind.ObjectMapper;
@@ -20,21 +22,30 @@
  */
 public class HelloModel {
 
-    private final String hostName;
-    private final HttpClient http = HttpClient.newHttpClient();
-    private final ObjectMapper mapper = new ObjectMapper();
+    private final NtfyConnection connection;
+
+    private final ObservableList<NtfyMessageDto> messages = FXCollections.observableArrayList();
+    private final StringProperty messageToSend = new SimpleStringProperty();
+
+    public HelloModel(NtfyConnection connection) {
+        this.connection = connection;
+        receiveMessage();
+    }
 
     public ObservableList<NtfyMessageDto> getMessages() {
         return messages;
     }
 
-    private final ObservableList<NtfyMessageDto> messages = FXCollections.observableArrayList();
+    public String getMessageToSend() {
+        return messageToSend.get();
+    }
 
-    public HelloModel() {
-        Dotenv dotenv = Dotenv.load();
-        hostName = Objects.requireNonNull(dotenv.get("HOST_NAME"));
-        receiveMessage();
+    public StringProperty messageToSendProperty() {
+        return messageToSend;
+    }
 
+    public void setMessageToSend(String message) {
+        messageToSend.set(message);
     }
 
     /**
@@ -45,38 +56,12 @@ public String getGreeting() {
         String javafxVersion = System.getProperty("javafx.version");
         return "Hello, JavaFX " + javafxVersion + ", running on Java " + javaVersion + ".";
     }
-
     public void sendMessage() {
-        //Todo: Send message using HTTPClient
-
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .POST(HttpRequest.BodyPublishers.ofString("Hello World"))
-                .uri(URI.create(hostName + "/mytopic"))
-                .build();
-        try {
-            //Todo: handle long blocking send requests to not freeze the JavaFX thread
-            //1. Use thread send message?
-            //2. Use async?
-            var response = http.send(httpRequest, HttpResponse.BodyHandlers.ofString());
-        } catch (IOException e) {
-            System.out.println("Error sending message");
-        } catch (InterruptedException e) {
-            System.out.println("Interrupted");
-        }
+        connection.sendMessage(messageToSend.get());
     }
-    public void receiveMessage() {
-        HttpRequest httpRequest = HttpRequest.newBuilder()
-                .GET()
-                .uri(URI.create(hostName + "/mytopic/json"))
-                .build();
 
-        http.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
-                .thenAccept(response -> response.body()
-                        .map(s ->
-                                mapper.readValue(s, NtfyMessageDto.class))
-                        .filter(message -> message.event().equals("message"))
-                        .peek(System.out::println)
-                        .forEach(s -> Platform.runLater(() -> messages.add(s))));
+    public void receiveMessage() {
+        connection.receiveMessage(m -> Platform.runLater(() -> messages.add(m)));
     }
 }
 
diff --git a/src/main/java/com/example/NtfyConnection.java b/src/main/java/com/example/NtfyConnection.java
new file mode 100644
index 00000000..b0f3072b
--- /dev/null
+++ b/src/main/java/com/example/NtfyConnection.java
@@ -0,0 +1,10 @@
+package com.example;
+
+import java.util.function.Consumer;
+
+public interface NtfyConnection {
+
+    public boolean sendMessage(String message);
+
+    public void receiveMessage(Consumer<NtfyMessageDto> messageHandler);
+}
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
new file mode 100644
index 00000000..0d5df66a
--- /dev/null
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -0,0 +1,64 @@
+package com.example;
+
+import io.github.cdimascio.dotenv.Dotenv;
+import javafx.application.Platform;
+import tools.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.Objects;
+import java.util.function.Consumer;
+
+public class NtfyConnectionImpl implements NtfyConnection {
+
+    private final HttpClient http = HttpClient.newHttpClient();
+    private final String hostName;
+    private final ObjectMapper mapper = new ObjectMapper();
+
+    public NtfyConnectionImpl() {
+        Dotenv dotenv = Dotenv.load();
+        hostName = Objects.requireNonNull(dotenv.get("HOST_NAME"));
+    }
+
+    @Override
+    public boolean sendMessage(String message) {
+        //Todo: Send message using HTTPClient
+
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .POST(HttpRequest.BodyPublishers.ofString("Hello World"))
+                .uri(URI.create(hostName + "/mytopic"))
+                .build();
+        try {
+            //Todo: handle long blocking send requests to not freeze the JavaFX thread
+            //1. Use thread send message?
+            //2. Use async?
+            var response = http.send(httpRequest, HttpResponse.BodyHandlers.ofString());
+            return true;
+        } catch (IOException e) {
+            System.out.println("Error sending message");
+        } catch (InterruptedException e) {
+            System.out.println("Interrupted");
+        }
+        return false;
+    }
+
+
+    @Override
+    public void receiveMessage(Consumer<NtfyMessageDto> messageHandler) {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .GET()
+                .uri(URI.create(hostName + "/mytopic/json"))
+                .build();
+
+        http.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
+                .thenAccept(response -> response.body()
+                        .map(s ->
+                                mapper.readValue(s, NtfyMessageDto.class))
+                        .filter(message -> message.event().equals("message"))
+                        .peek(System.out::println)
+                        .forEach(messageHandler));
+    }
+}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 649be1ab..89e041cb 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -4,6 +4,7 @@
     requires io.github.cdimascio.dotenv.java;
     requires java.net.http;
     requires tools.jackson.databind;
+    requires javafx.graphics;
 
     opens com.example to javafx.fxml;
     exports com.example;
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
new file mode 100644
index 00000000..bb89fdc1
--- /dev/null
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -0,0 +1,23 @@
+package com.example;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class HelloModelTest {
+
+    @Test
+    @DisplayName("When calling sendMessage it should call connection send")
+    void sendMessageCallsConnectionWithMessageToSend() {
+        //Arrange   Given
+        var spy = new NtfyConnectionSpy();
+        var model = new HelloModel(spy);
+        model.setMessageToSend("Hello World");
+        //Act   When
+        model.sendMessage();
+        //Assert    Then
+        assertThat(spy.message).isEqualTo("Hello World");
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/com/example/NtfyConnectionSpy.java b/src/test/java/com/example/NtfyConnectionSpy.java
new file mode 100644
index 00000000..50331220
--- /dev/null
+++ b/src/test/java/com/example/NtfyConnectionSpy.java
@@ -0,0 +1,20 @@
+package com.example;
+
+import java.util.function.Consumer;
+
+public class NtfyConnectionSpy implements NtfyConnection{
+
+    String message;
+
+    @Override
+    public boolean sendMessage(String message) {
+        this.message = message;
+        return true;
+    }
+
+    @Override
+    public void receiveMessage(Consumer<NtfyMessageDto> messageHandler) {
+
+    }
+
+}

From 83dbcef338a4063ba5414e3df26aad9679a744d9 Mon Sep 17 00:00:00 2001
From: Linus Samuelsson <smulle.junior@gmail.com>
Date: Wed, 19 Nov 2025 10:15:43 +0100
Subject: [PATCH 3/9] Test

---
 pom.xml                                        |  6 ++++++
 .../java/com/example/NtfyConnectionImpl.java   |  4 ++++
 src/test/java/com/example/HelloModelTest.java  | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9ee23793..507a44b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,12 @@
             <artifactId>jackson-databind</artifactId>
             <version>3.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
+            <version>4.0.0-beta.15</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
index 0d5df66a..7eaed402 100644
--- a/src/main/java/com/example/NtfyConnectionImpl.java
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -23,6 +23,10 @@ public NtfyConnectionImpl() {
         hostName = Objects.requireNonNull(dotenv.get("HOST_NAME"));
     }
 
+    public NtfyConnectionImpl(String hostName) {
+        this.hostName = hostName;
+    }
+
     @Override
     public boolean sendMessage(String message) {
         //Todo: Send message using HTTPClient
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index bb89fdc1..2a7fb8e4 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -1,10 +1,16 @@
 package com.example;
 
+import com.github.tomakehurst.wiremock.client.MappingBuilder;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import com.github.tomakehurst.wiremock.junit5.WireMockTest;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
+@WireMockTest
 class HelloModelTest {
 
     @Test
@@ -20,4 +26,16 @@ void sendMessageCallsConnectionWithMessageToSend() {
         assertThat(spy.message).isEqualTo("Hello World");
     }
 
+    @Test
+    void sendMessageToFakeServer(WireMockRuntimeInfo wireMockRuntimeInfo) {
+        var con = new NtfyConnectionImpl("http://localhost:" + wireMockRuntimeInfo.getHttpPort());
+        var model = new HelloModel(con);
+        model.setMessageToSend("Hello World");
+        stubFor(post("/mytopic").willReturn(ok()));
+
+        model.sendMessage();
+
+        //Verify call made to server
+        verify(postRequestedFor(urlEqualTo("/mytopic")).withRequestBody(containing("Hello World")));
+    }
 }
\ No newline at end of file

From 20ca18a4ea78d5023224b90ece30fc2677f749fa Mon Sep 17 00:00:00 2001
From: Linus Samuelsson <smulle.junior@gmail.com>
Date: Wed, 19 Nov 2025 11:05:41 +0100
Subject: [PATCH 4/9] Implemented sending message

---
 .../java/com/example/HelloController.java     | 28 +++++++++++
 src/main/java/com/example/HelloModel.java     |  5 +-
 .../java/com/example/NtfyConnectionImpl.java  | 47 +++++++++++++++----
 .../resources/com/example/hello-view.fxml     |  2 +
 src/test/java/com/example/HelloModelTest.java |  9 ++--
 5 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index 56d129dd..1296b769 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -3,7 +3,9 @@
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
+import javafx.scene.control.TextField;
 
 /**
  * Controller layer: mediates between the view (FXML) and the model.
@@ -11,11 +13,16 @@
 public class HelloController {
 
     private final HelloModel model = new HelloModel(new NtfyConnectionImpl());
+
+    @FXML
     public ListView<NtfyMessageDto> messageView;
 
     @FXML
     private Label messageLabel;
 
+    @FXML
+    private TextField messageInput;
+
     @FXML
     private void initialize() {
         if (messageLabel != null) {
@@ -23,8 +30,29 @@ private void initialize() {
         }
         messageView.setItems(model.getMessages());
 
+        if (messageInput != null) {
+            messageInput.textProperty().bindBidirectional(model.messageToSendProperty());
+        }
+
+        messageView.setCellFactory(param -> new ListCell<>() {
+            @Override
+            protected void updateItem(NtfyMessageDto item, boolean empty) {
+                super.updateItem(item, empty);
+
+                if (empty || item == null) {
+                    setText(null);
+                } else {
+                    var time = java.time.Instant.ofEpochSecond(item.time())
+                            .atZone(java.time.ZoneId.systemDefault())
+                            .toLocalTime();
+                    var formatter = java.time.format.DateTimeFormatter.ofPattern("HH:mm");
+                    setText(time.format(formatter) + " " + item.message());
+                }
+            }
+        });
     }
 
+
     public void sendMessage(ActionEvent actionEvent) {
         model.sendMessage();
     }
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 0f2e3324..1af32be4 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -57,7 +57,10 @@ public String getGreeting() {
         return "Hello, JavaFX " + javafxVersion + ", running on Java " + javaVersion + ".";
     }
     public void sendMessage() {
-        connection.sendMessage(messageToSend.get());
+        String msg = messageToSend.get();
+        if (msg != null && !msg.isBlank()) {
+            connection.sendMessage(msg);
+        }
     }
 
     public void receiveMessage() {
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
index 7eaed402..2bceda8f 100644
--- a/src/main/java/com/example/NtfyConnectionImpl.java
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -32,7 +32,7 @@ public boolean sendMessage(String message) {
         //Todo: Send message using HTTPClient
 
         HttpRequest httpRequest = HttpRequest.newBuilder()
-                .POST(HttpRequest.BodyPublishers.ofString("Hello World"))
+                .POST(HttpRequest.BodyPublishers.ofString(message))
                 .uri(URI.create(hostName + "/mytopic"))
                 .build();
         try {
@@ -40,11 +40,17 @@ public boolean sendMessage(String message) {
             //1. Use thread send message?
             //2. Use async?
             var response = http.send(httpRequest, HttpResponse.BodyHandlers.ofString());
+            if (response.statusCode() != 200) {
+                System.err.println("Failed to send message. HTTP Status: " + response.statusCode());
+                System.err.println("Response body: " + response.body());
+                return false;
+            }
             return true;
         } catch (IOException e) {
-            System.out.println("Error sending message");
+            System.err.println("Network I/O error sending message: " + e.getMessage());
         } catch (InterruptedException e) {
-            System.out.println("Interrupted");
+            System.err.println("Send message operation interrupted");
+            Thread.currentThread().interrupt();
         }
         return false;
     }
@@ -58,11 +64,34 @@ public void receiveMessage(Consumer<NtfyMessageDto> messageHandler) {
                 .build();
 
         http.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
-                .thenAccept(response -> response.body()
-                        .map(s ->
-                                mapper.readValue(s, NtfyMessageDto.class))
-                        .filter(message -> message.event().equals("message"))
-                        .peek(System.out::println)
-                        .forEach(messageHandler));
+                .thenAccept(response -> {
+                    if (response.statusCode() != 200) {
+                        System.err.println("Error connecting to stream. HTTP Status: " + response.statusCode());
+                        return;
+                    }
+                    response.body()
+                            .map(s -> {
+                                try {
+                                    return mapper.readValue(s, NtfyMessageDto.class);
+                                } catch (Exception e) {
+                                    System.err.println("Failed to parse JSON: " + e.getMessage());
+                                    return null;
+                                }
+                            })
+                            .filter(Objects::nonNull)
+                            .filter(message -> "message".equals(message.event()))
+                            .peek(m -> {
+                                var time = java.time.Instant.ofEpochSecond(m.time())
+                                        .atZone(java.time.ZoneId.systemDefault())
+                                        .toLocalTime();
+                                System.out.println(time + " " + m.message());
+                            })
+                            .forEach(messageHandler);
+                }).exceptionally(e -> {
+                    System.err.println("Async connection error: " + e.getMessage());
+                    e.printStackTrace();
+                    return null;
+                });
     }
 }
+
diff --git a/src/main/resources/com/example/hello-view.fxml b/src/main/resources/com/example/hello-view.fxml
index 0074f633..dc20f177 100644
--- a/src/main/resources/com/example/hello-view.fxml
+++ b/src/main/resources/com/example/hello-view.fxml
@@ -5,8 +5,10 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.TextField?>
 <VBox alignment="CENTER" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.example.HelloController">
         <Label fx:id="messageLabel" text="Hello, JavaFX!" />
         <Button text="Send message" onAction="#sendMessage"/>
         <ListView fx:id="messageView"/>
+        <TextField fx:id="messageInput"/>
 </VBox>
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 2a7fb8e4..2e0f887b 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -28,14 +28,17 @@ void sendMessageCallsConnectionWithMessageToSend() {
 
     @Test
     void sendMessageToFakeServer(WireMockRuntimeInfo wireMockRuntimeInfo) {
+        stubFor(get(urlPathMatching("/mytopic/json.*")).willReturn(ok()));
+
+        stubFor(post("/mytopic").willReturn(ok()));
+
         var con = new NtfyConnectionImpl("http://localhost:" + wireMockRuntimeInfo.getHttpPort());
         var model = new HelloModel(con);
         model.setMessageToSend("Hello World");
-        stubFor(post("/mytopic").willReturn(ok()));
 
         model.sendMessage();
 
-        //Verify call made to server
-        verify(postRequestedFor(urlEqualTo("/mytopic")).withRequestBody(containing("Hello World")));
+        verify(postRequestedFor(urlEqualTo("/mytopic"))
+                .withRequestBody(containing("Hello World")));
     }
 }
\ No newline at end of file

From 968db8bf33c5485925fd374982db56e36066fcc9 Mon Sep 17 00:00:00 2001
From: Linus Samuelsson <smulle.junior@gmail.com>
Date: Wed, 19 Nov 2025 12:20:56 +0100
Subject: [PATCH 5/9] Implemented more tests and fixed potential issues

---
 pom.xml                                       | 10 +++
 src/main/java/com/example/HelloFX.java        |  9 +-
 .../java/com/example/NtfyConnectionImpl.java  | 36 ++++----
 src/test/java/com/example/HelloModelTest.java | 84 ++++++++++++++++++-
 .../java/com/example/NtfyConnectionSpy.java   | 20 ++++-
 5 files changed, 133 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 507a44b4..c4a936d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,16 @@
             <artifactId>jackson-databind</artifactId>
             <version>3.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-swing</artifactId>
+            <version>26-ea+16</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.17</version>
+        </dependency>
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock</artifactId>
diff --git a/src/main/java/com/example/HelloFX.java b/src/main/java/com/example/HelloFX.java
index 19ca0e8c..043215d7 100644
--- a/src/main/java/com/example/HelloFX.java
+++ b/src/main/java/com/example/HelloFX.java
@@ -11,8 +11,13 @@ public class HelloFX extends Application {
 
     @Override
     public void start(Stage stage) throws Exception {
-        Dotenv dotenv = Dotenv.load();
-        System.out.println(dotenv.get("HOST_NAME"));
+        Dotenv dotenv = Dotenv.configure()
+                .ignoreIfMissing()
+                .load();
+        String hostName = dotenv.get("HOST_NAME");
+        if (hostName != null) {
+            System.out.println("Connected to: " + hostName);
+        }
 
         FXMLLoader fxmlLoader = new FXMLLoader(HelloFX.class.getResource("hello-view.fxml"));
         Parent root = fxmlLoader.load();
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
index 2bceda8f..1ccb4b7b 100644
--- a/src/main/java/com/example/NtfyConnectionImpl.java
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -20,7 +20,11 @@ public class NtfyConnectionImpl implements NtfyConnection {
 
     public NtfyConnectionImpl() {
         Dotenv dotenv = Dotenv.load();
-        hostName = Objects.requireNonNull(dotenv.get("HOST_NAME"));
+        String envHost = dotenv.get("HOST_NAME");
+        if (envHost == null || envHost.isBlank()) {
+            throw new IllegalStateException("Environment variable 'HOST_NAME' is required but was not found.");
+        }
+        hostName = envHost;
     }
 
     public NtfyConnectionImpl(String hostName) {
@@ -30,29 +34,23 @@ public NtfyConnectionImpl(String hostName) {
     @Override
     public boolean sendMessage(String message) {
         //Todo: Send message using HTTPClient
-
         HttpRequest httpRequest = HttpRequest.newBuilder()
                 .POST(HttpRequest.BodyPublishers.ofString(message))
                 .uri(URI.create(hostName + "/mytopic"))
+                .timeout(java.time.Duration.ofSeconds(5))
                 .build();
-        try {
-            //Todo: handle long blocking send requests to not freeze the JavaFX thread
-            //1. Use thread send message?
-            //2. Use async?
-            var response = http.send(httpRequest, HttpResponse.BodyHandlers.ofString());
-            if (response.statusCode() != 200) {
-                System.err.println("Failed to send message. HTTP Status: " + response.statusCode());
-                System.err.println("Response body: " + response.body());
-                return false;
-            }
-            return true;
-        } catch (IOException e) {
-            System.err.println("Network I/O error sending message: " + e.getMessage());
-        } catch (InterruptedException e) {
-            System.err.println("Send message operation interrupted");
-            Thread.currentThread().interrupt();
+        //Todo: handle long blocking send requests to not freeze the JavaFX thread
+        //1. Use thread send message?
+        //2. Use async?
+        var response = http.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofString())
+                .orTimeout(5, java.util.concurrent.TimeUnit.SECONDS)
+                .join();
+        if (response.statusCode() != 200) {
+            System.err.println("Failed to send message. HTTP Status: " + response.statusCode());
+            System.err.println("Response body: " + response.body());
+            return false;
         }
-        return false;
+        return true;
     }
 
 
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 2e0f887b..6914199c 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -1,18 +1,33 @@
 package com.example;
 
-import com.github.tomakehurst.wiremock.client.MappingBuilder;
-import com.github.tomakehurst.wiremock.client.WireMock;
+
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
+import javafx.application.Platform;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @WireMockTest
 class HelloModelTest {
 
+    // Initiera JavaFX Toolkit en gång för alla tester eftersom HelloModel använder Platform.runLater
+    @BeforeAll
+    static void initToolkit() {
+        try {
+            Platform.startup(() -> {});
+        } catch (IllegalStateException e) {
+            // Toolkit är redan startat, ignorera
+        }
+    }
+
     @Test
     @DisplayName("When calling sendMessage it should call connection send")
     void sendMessageCallsConnectionWithMessageToSend() {
@@ -23,7 +38,36 @@ void sendMessageCallsConnectionWithMessageToSend() {
         //Act   When
         model.sendMessage();
         //Assert    Then
-        assertThat(spy.message).isEqualTo("Hello World");
+        assertThat(spy.message()).isEqualTo("Hello World");
+    }
+
+    @Test
+    @DisplayName("When connection receives a message, the model list should be updated")
+    void incomingMessageAddsToModelList() throws InterruptedException {
+        // Arrange
+        var spy = new NtfyConnectionSpy();
+        var model = new HelloModel(spy);
+
+        // Verifiera att modellen började lyssna
+        assertThat(spy.wasReceiveCalled()).isTrue();
+
+        var incomingMessage = new NtfyMessageDto("1", 1000L, "message", "test", "Incoming Data");
+
+        // Act - Simulera inkommande meddelande från "nätverket"
+        // Vi behöver en Latch för att vänta på Platform.runLater i modellen
+        CountDownLatch latch = new CountDownLatch(1);
+
+        spy.triggerReceive(incomingMessage);
+
+        // Vänta tills JavaFX-tråden har bearbetat uppdateringen
+        Platform.runLater(latch::countDown);
+
+        boolean processed = latch.await(2, TimeUnit.SECONDS);
+        assertThat(processed).as("JavaFX processing timed out").isTrue();
+
+        // Assert
+        assertThat(model.getMessages()).hasSize(1);
+        assertThat(model.getMessages().getFirst().message()).isEqualTo("Incoming Data");
     }
 
     @Test
@@ -41,4 +85,38 @@ void sendMessageToFakeServer(WireMockRuntimeInfo wireMockRuntimeInfo) {
         verify(postRequestedFor(urlEqualTo("/mytopic"))
                 .withRequestBody(containing("Hello World")));
     }
+
+    @Test
+    @DisplayName("Real NtfyConnectionImpl should parse JSON correctly from WireMock")
+    void realConnectionParsesJson(WireMockRuntimeInfo wm) throws InterruptedException {
+        // Arrange
+        String jsonResponse = """
+                {"id":"123","time":1640995200,"event":"message","topic":"mytopic","message":"Hello from WireMock"}
+                """;
+
+        stubFor(get(urlEqualTo("/mytopic/json"))
+                .willReturn(aResponse()
+                        .withStatus(200)
+                        .withBody(jsonResponse)));
+
+        // Vi använder NtfyConnectionImpl direkt här för att isolera parsing-logiken från Modellen
+        var con = new NtfyConnectionImpl("http://localhost:" + wm.getHttpPort());
+
+        AtomicReference<NtfyMessageDto> receivedDto = new AtomicReference<>();
+        CountDownLatch latch = new CountDownLatch(1);
+
+        // Act
+        con.receiveMessage(dto -> {
+            receivedDto.set(dto);
+            latch.countDown();
+        });
+
+        // Assert
+        boolean received = latch.await(5, TimeUnit.SECONDS);
+        assertThat(received).as("Did not receive message from stream").isTrue();
+
+        assertThat(receivedDto.get()).isNotNull();
+        assertThat(receivedDto.get().message()).isEqualTo("Hello from WireMock");
+        assertThat(receivedDto.get().time()).isEqualTo(1640995200L);
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/example/NtfyConnectionSpy.java b/src/test/java/com/example/NtfyConnectionSpy.java
index 50331220..f255c5b0 100644
--- a/src/test/java/com/example/NtfyConnectionSpy.java
+++ b/src/test/java/com/example/NtfyConnectionSpy.java
@@ -2,9 +2,11 @@
 
 import java.util.function.Consumer;
 
-public class NtfyConnectionSpy implements NtfyConnection{
+public class NtfyConnectionSpy implements NtfyConnection {
 
-    String message;
+    private String message;
+    private boolean receiveCalled = false;
+    private Consumer<NtfyMessageDto> lastHandler;
 
     @Override
     public boolean sendMessage(String message) {
@@ -14,7 +16,21 @@ public boolean sendMessage(String message) {
 
     @Override
     public void receiveMessage(Consumer<NtfyMessageDto> messageHandler) {
+        this.receiveCalled = true;
+        this.lastHandler = messageHandler;
+    }
+
+    public String message() {
+        return message;
+    }
 
+    public boolean wasReceiveCalled() {
+        return receiveCalled;
     }
 
+    public void triggerReceive(NtfyMessageDto dto) {
+        if (lastHandler != null) {
+            lastHandler.accept(dto);
+        }
+    }
 }

From 9f35ccf5b2c5162d00a65b2de71dd0d2470a39cb Mon Sep 17 00:00:00 2001
From: Linus Samuelsson <smulle.junior@gmail.com>
Date: Wed, 19 Nov 2025 12:27:07 +0100
Subject: [PATCH 6/9] Removed tests

---
 src/test/java/com/example/HelloModelTest.java | 61 -------------------
 1 file changed, 61 deletions(-)

diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 6914199c..a6bcbd32 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -41,35 +41,6 @@ void sendMessageCallsConnectionWithMessageToSend() {
         assertThat(spy.message()).isEqualTo("Hello World");
     }
 
-    @Test
-    @DisplayName("When connection receives a message, the model list should be updated")
-    void incomingMessageAddsToModelList() throws InterruptedException {
-        // Arrange
-        var spy = new NtfyConnectionSpy();
-        var model = new HelloModel(spy);
-
-        // Verifiera att modellen började lyssna
-        assertThat(spy.wasReceiveCalled()).isTrue();
-
-        var incomingMessage = new NtfyMessageDto("1", 1000L, "message", "test", "Incoming Data");
-
-        // Act - Simulera inkommande meddelande från "nätverket"
-        // Vi behöver en Latch för att vänta på Platform.runLater i modellen
-        CountDownLatch latch = new CountDownLatch(1);
-
-        spy.triggerReceive(incomingMessage);
-
-        // Vänta tills JavaFX-tråden har bearbetat uppdateringen
-        Platform.runLater(latch::countDown);
-
-        boolean processed = latch.await(2, TimeUnit.SECONDS);
-        assertThat(processed).as("JavaFX processing timed out").isTrue();
-
-        // Assert
-        assertThat(model.getMessages()).hasSize(1);
-        assertThat(model.getMessages().getFirst().message()).isEqualTo("Incoming Data");
-    }
-
     @Test
     void sendMessageToFakeServer(WireMockRuntimeInfo wireMockRuntimeInfo) {
         stubFor(get(urlPathMatching("/mytopic/json.*")).willReturn(ok()));
@@ -86,37 +57,5 @@ void sendMessageToFakeServer(WireMockRuntimeInfo wireMockRuntimeInfo) {
                 .withRequestBody(containing("Hello World")));
     }
 
-    @Test
-    @DisplayName("Real NtfyConnectionImpl should parse JSON correctly from WireMock")
-    void realConnectionParsesJson(WireMockRuntimeInfo wm) throws InterruptedException {
-        // Arrange
-        String jsonResponse = """
-                {"id":"123","time":1640995200,"event":"message","topic":"mytopic","message":"Hello from WireMock"}
-                """;
-
-        stubFor(get(urlEqualTo("/mytopic/json"))
-                .willReturn(aResponse()
-                        .withStatus(200)
-                        .withBody(jsonResponse)));
-
-        // Vi använder NtfyConnectionImpl direkt här för att isolera parsing-logiken från Modellen
-        var con = new NtfyConnectionImpl("http://localhost:" + wm.getHttpPort());
 
-        AtomicReference<NtfyMessageDto> receivedDto = new AtomicReference<>();
-        CountDownLatch latch = new CountDownLatch(1);
-
-        // Act
-        con.receiveMessage(dto -> {
-            receivedDto.set(dto);
-            latch.countDown();
-        });
-
-        // Assert
-        boolean received = latch.await(5, TimeUnit.SECONDS);
-        assertThat(received).as("Did not receive message from stream").isTrue();
-
-        assertThat(receivedDto.get()).isNotNull();
-        assertThat(receivedDto.get().message()).isEqualTo("Hello from WireMock");
-        assertThat(receivedDto.get().time()).isEqualTo(1640995200L);
-    }
 }
\ No newline at end of file

From 37135ee9b3444c7744ba644a332767ed2a7ca78a Mon Sep 17 00:00:00 2001
From: Linus Samuelsson <smulle.junior@gmail.com>
Date: Wed, 19 Nov 2025 12:28:25 +0100
Subject: [PATCH 7/9] Removed tests

---
 src/test/java/com/example/HelloModelTest.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index a6bcbd32..8bf4a962 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -18,16 +18,6 @@
 @WireMockTest
 class HelloModelTest {
 
-    // Initiera JavaFX Toolkit en gång för alla tester eftersom HelloModel använder Platform.runLater
-    @BeforeAll
-    static void initToolkit() {
-        try {
-            Platform.startup(() -> {});
-        } catch (IllegalStateException e) {
-            // Toolkit är redan startat, ignorera
-        }
-    }
-
     @Test
     @DisplayName("When calling sendMessage it should call connection send")
     void sendMessageCallsConnectionWithMessageToSend() {

From 0ae2722488a3775e0aa31099f894f667f78ae614 Mon Sep 17 00:00:00 2001
From: Linus Samuelsson <smulle.junior@gmail.com>
Date: Wed, 19 Nov 2025 12:30:39 +0100
Subject: [PATCH 8/9] Removed tests

---
 src/test/java/com/example/HelloModelTest.java | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 8bf4a962..134f525a 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -47,5 +47,37 @@ void sendMessageToFakeServer(WireMockRuntimeInfo wireMockRuntimeInfo) {
                 .withRequestBody(containing("Hello World")));
     }
 
+    @Test
+    @DisplayName("Real NtfyConnectionImpl should parse JSON correctly from WireMock")
+    void realConnectionParsesJson(WireMockRuntimeInfo wm) throws InterruptedException {
+        // Arrange
+        String jsonResponse = """
+                {"id":"123","time":1640995200,"event":"message","topic":"mytopic","message":"Hello from WireMock"}
+                """;
+
+        stubFor(get(urlEqualTo("/mytopic/json"))
+                .willReturn(aResponse()
+                        .withStatus(200)
+                        .withBody(jsonResponse)));
+
+        // Vi använder NtfyConnectionImpl direkt här för att isolera parsing-logiken från Modellen
+        var con = new NtfyConnectionImpl("http://localhost:" + wm.getHttpPort());
+
+        AtomicReference<NtfyMessageDto> receivedDto = new AtomicReference<>();
+        CountDownLatch latch = new CountDownLatch(1);
 
+        // Act
+        con.receiveMessage(dto -> {
+            receivedDto.set(dto);
+            latch.countDown();
+        });
+
+        // Assert
+        boolean received = latch.await(5, TimeUnit.SECONDS);
+        assertThat(received).as("Did not receive message from stream").isTrue();
+
+        assertThat(receivedDto.get()).isNotNull();
+        assertThat(receivedDto.get().message()).isEqualTo("Hello from WireMock");
+        assertThat(receivedDto.get().time()).isEqualTo(1640995200L);
+    }
 }
\ No newline at end of file

From 9886c148824773a8fb7ab2b9887f7990a2953e3b Mon Sep 17 00:00:00 2001
From: Linus Samuelsson <smulle.junior@gmail.com>
Date: Wed, 19 Nov 2025 12:36:48 +0100
Subject: [PATCH 9/9] Updated tests

---
 src/main/java/com/example/HelloModel.java     | 12 +++++++++--
 src/test/java/com/example/HelloModelTest.java | 20 +++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 1af32be4..e2ba7cb7 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -16,6 +16,7 @@
 import java.net.http.HttpResponse;
 import java.util.ArrayList;
 import java.util.Objects;
+import java.util.function.Consumer;
 
 /**
  * Model layer: encapsulates application data and business logic.
@@ -24,14 +25,21 @@ public class HelloModel {
 
     private final NtfyConnection connection;
 
+    private final Consumer<Runnable> uiExecutor;
+
     private final ObservableList<NtfyMessageDto> messages = FXCollections.observableArrayList();
     private final StringProperty messageToSend = new SimpleStringProperty();
 
-    public HelloModel(NtfyConnection connection) {
+    public HelloModel(NtfyConnection connection, Consumer<Runnable> uiExecutor) {
         this.connection = connection;
+        this.uiExecutor = uiExecutor;
         receiveMessage();
     }
 
+    public HelloModel(NtfyConnection connection) {
+        this(connection, Platform::runLater);
+    }
+
     public ObservableList<NtfyMessageDto> getMessages() {
         return messages;
     }
@@ -64,7 +72,7 @@ public void sendMessage() {
     }
 
     public void receiveMessage() {
-        connection.receiveMessage(m -> Platform.runLater(() -> messages.add(m)));
+        connection.receiveMessage(m -> uiExecutor.accept(() -> messages.add(m)));
     }
 }
 
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 134f525a..f0b49ded 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -80,4 +80,24 @@ void realConnectionParsesJson(WireMockRuntimeInfo wm) throws InterruptedExceptio
         assertThat(receivedDto.get().message()).isEqualTo("Hello from WireMock");
         assertThat(receivedDto.get().time()).isEqualTo(1640995200L);
     }
+
+    @Test
+    @DisplayName("Incoming message adds to list immediately")
+    void incomingMessageAddsToModelList_NoToolkit() {
+        // Arrange
+        var spy = new NtfyConnectionSpy();
+
+        // VIKTIGT: Skicka in Runnable::run för att köra synkront istället för Platform.runLater
+        var model = new HelloModel(spy, Runnable::run);
+
+        var incomingMessage = new NtfyMessageDto("1", 123456L, "message", "test", "Direct Test");
+
+        // Act
+        spy.triggerReceive(incomingMessage);
+
+        // Assert
+        // Eftersom vi kör synkront (Runnable::run) behöver vi ingen CountDownLatch eller wait
+        assertThat(model.getMessages()).hasSize(1);
+        assertThat(model.getMessages().getFirst().message()).isEqualTo("Direct Test");
+    }
 }
\ No newline at end of file