From ba9d641b2fcdc5230dd0b8c10a94f76cabbc4969 Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 6 Nov 2025 12:33:43 +0100
Subject: [PATCH 01/21] working base

---
 .gitignore                                    |  1 +
 pom.xml                                       | 20 +++++-
 .../java/com/example/HelloController.java     | 65 ++++++++++++++++---
 src/main/java/com/example/HelloFX.java        |  2 +-
 src/main/java/com/example/HelloModel.java     | 49 +++++++++++++-
 src/main/java/com/example/ManyParameters.java | 19 ++++++
 .../com/example/ManyParametersBuilder.java    | 38 +++++++++++
 src/main/java/com/example/NtfyConnection.java | 11 ++++
 .../java/com/example/NtfyConnectionImpl.java  | 65 +++++++++++++++++++
 src/main/java/com/example/NtfyMessageDto.java |  7 ++
 src/main/java/com/example/Singelton.java      | 14 ++++
 src/main/java/module-info.java                |  3 +
 .../resources/com/example/hello-view.fxml     | 37 ++++++++---
 src/test/java/com/example/HelloModelTest.java | 40 ++++++++++++
 .../java/com/example/NtfyConnectionSpy.java   | 19 ++++++
 15 files changed, 370 insertions(+), 20 deletions(-)
 create mode 100644 src/main/java/com/example/ManyParameters.java
 create mode 100644 src/main/java/com/example/ManyParametersBuilder.java
 create mode 100644 src/main/java/com/example/NtfyConnection.java
 create mode 100644 src/main/java/com/example/NtfyConnectionImpl.java
 create mode 100644 src/main/java/com/example/NtfyMessageDto.java
 create mode 100644 src/main/java/com/example/Singelton.java
 create mode 100644 src/test/java/com/example/HelloModelTest.java
 create mode 100644 src/test/java/com/example/NtfyConnectionSpy.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..f410eea0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,22 @@
             <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>
+        <dependency>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
+            <version>4.0.0-beta.15</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -55,7 +71,7 @@
                 <configuration>
                     <mainClass>com.example.HelloFX</mainClass>
                     <options>
-                    <option>--enable-native-access=javafx.graphics</option>
+                        <option>--enable-native-access=javafx.graphics</option>
                     </options>
                     <launcher>javafx</launcher>
                     <stripDebug>true</stripDebug>
@@ -65,4 +81,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index fdd160a0..e1db5145 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -1,22 +1,71 @@
 package com.example;
 
+import javafx.application.Platform;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.scene.control.Label;
+import javafx.scene.control.*;
+import javafx.scene.control.ListCell;
+
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 
-/**
- * Controller layer: mediates between the view (FXML) and the model.
- */
 public class HelloController {
 
-    private final HelloModel model = new HelloModel();
+    private final HelloModel model = new HelloModel(new NtfyConnectionImpl());
 
     @FXML
     private Label messageLabel;
 
+    @FXML
+    private ListView<NtfyMessageDto> messageView;
+
+    @FXML
+    private TextArea messageInput;
+
+    // Formatter för tid
+    private final DateTimeFormatter timeFormatter =
+            DateTimeFormatter.ofPattern("HH:mm:ss")
+                    .withZone(ZoneId.systemDefault());
+
     @FXML
     private void initialize() {
-        if (messageLabel != null) {
-            messageLabel.setText(model.getGreeting());
-        }
+        // Visa hälsning
+        messageLabel.setText(model.getGreeting());
+
+        // Koppla ListView till modellens meddelanden
+        messageView.setItems(model.getMessages());
+
+        // Bind TextArea till modellens property
+        messageInput.textProperty().bindBidirectional(model.messageToSendProperty());
+
+        // Snyggare visning av meddelanden
+        messageView.setCellFactory(lv -> new ListCell<>() {
+            @Override
+            protected void updateItem(NtfyMessageDto msg, boolean empty) {
+                super.updateItem(msg, empty);
+                if (empty || msg == null) {
+                    setText(null);
+                } else {
+                    setText("[" + timeFormatter.format(Instant.ofEpochMilli(msg.time())) + "] "
+                            + msg.message());
+                }
+            }
+        });
+
+        // Scrolla automatiskt ner till senaste meddelandet
+        model.getMessages().addListener((javafx.collections.ListChangeListener<NtfyMessageDto>) change -> {
+            Platform.runLater(() -> {
+                if (!messageView.getItems().isEmpty()) {
+                    messageView.scrollTo(messageView.getItems().size() - 1);
+                }
+            });
+        });
+    }
+
+    @FXML
+    private void sendMessage(ActionEvent actionEvent) {
+        model.sendMessage();
+        messageInput.clear();
     }
 }
diff --git a/src/main/java/com/example/HelloFX.java b/src/main/java/com/example/HelloFX.java
index 96bdc5ca..5aaa17af 100644
--- a/src/main/java/com/example/HelloFX.java
+++ b/src/main/java/com/example/HelloFX.java
@@ -12,7 +12,7 @@ public class HelloFX extends Application {
     public void start(Stage stage) throws Exception {
         FXMLLoader fxmlLoader = new FXMLLoader(HelloFX.class.getResource("hello-view.fxml"));
         Parent root = fxmlLoader.load();
-        Scene scene = new Scene(root, 640, 480);
+        Scene scene = new Scene(root, 1280, 480);
         stage.setTitle("Hello MVC");
         stage.setScene(scene);
         stage.show();
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 385cfd10..ca316ae6 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -1,15 +1,62 @@
 package com.example;
 
+import javafx.application.Platform;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
 /**
  * Model layer: encapsulates application data and business logic.
  */
 public class HelloModel {
+
+    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;
+    }
+
+    public String getMessageToSend() {
+        return messageToSend.get();
+    }
+
+    public StringProperty messageToSendProperty() {
+        return messageToSend;
+    }
+
+    public void setMessageToSend(String message) {
+        messageToSend.set(message);
+    }
+
     /**
      * Returns a greeting based on the current Java and JavaFX versions.
      */
     public String getGreeting() {
         String javaVersion = System.getProperty("java.version");
         String javafxVersion = System.getProperty("javafx.version");
-        return "Hello, JavaFX " + javafxVersion + ", running on Java " + javaVersion + ".";
+        return "Welcome to ChatApp, made in JavaFX " + javafxVersion + ", running on Java " + javaVersion + ".";
+    }
+
+    public void sendMessage() {
+        String msg = messageToSend.get();
+        if (msg == null || msg.isBlank()) {
+            System.out.println("Nothing to send!");
+            return;
+        }
+        connection.send(msg);
+    }
+
+
+    public void receiveMessage() {
+        connection.receive(m -> Platform.runLater(() -> messages.add(m)));
     }
 }
diff --git a/src/main/java/com/example/ManyParameters.java b/src/main/java/com/example/ManyParameters.java
new file mode 100644
index 00000000..9efe0e71
--- /dev/null
+++ b/src/main/java/com/example/ManyParameters.java
@@ -0,0 +1,19 @@
+package com.example;
+
+public class ManyParameters {
+
+    public ManyParameters(String computerName, int timeout,
+                          String method, int size, byte[] data) {
+
+    }
+
+
+    static void main() {
+        ManyParametersBuilder builder = new ManyParametersBuilder();
+        builder
+                .setComputerName("localhost")   //Fluent API
+                .setTimeout(10)
+                .setSize(0)
+                .createManyParameters();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/ManyParametersBuilder.java b/src/main/java/com/example/ManyParametersBuilder.java
new file mode 100644
index 00000000..fd49920d
--- /dev/null
+++ b/src/main/java/com/example/ManyParametersBuilder.java
@@ -0,0 +1,38 @@
+package com.example;
+
+public class ManyParametersBuilder {
+    private String computerName;
+    private int timeout = 0;
+    private String method;
+    private int size = 0;
+    private byte[] data = null;
+
+    public ManyParametersBuilder setComputerName(String computerName) {
+        this.computerName = computerName;
+        return this;
+    }
+
+    public ManyParametersBuilder setTimeout(int timeout) {
+        this.timeout = timeout;
+        return this;
+    }
+
+    public ManyParametersBuilder setMethod(String method) {
+        this.method = method;
+        return this;
+    }
+
+    public ManyParametersBuilder setSize(int size) {
+        this.size = size;
+        return this;
+    }
+
+    public ManyParametersBuilder setData(byte[] data) {
+        this.data = data;
+        return this;
+    }
+
+    public ManyParameters createManyParameters() {
+        return new ManyParameters(computerName, timeout, method, size, data);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/NtfyConnection.java b/src/main/java/com/example/NtfyConnection.java
new file mode 100644
index 00000000..c83095dd
--- /dev/null
+++ b/src/main/java/com/example/NtfyConnection.java
@@ -0,0 +1,11 @@
+package com.example;
+
+import java.util.function.Consumer;
+
+public interface NtfyConnection {
+
+    public boolean send(String message);
+
+    public void receive(Consumer<NtfyMessageDto> messageHandler);
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
new file mode 100644
index 00000000..a290dfb9
--- /dev/null
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -0,0 +1,65 @@
+package com.example;
+
+import io.github.cdimascio.dotenv.Dotenv;
+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"));
+    }
+
+    public NtfyConnectionImpl(String hostName) {
+        this.hostName = hostName;
+    }
+
+    @Override
+    public boolean send(String message) {
+        HttpRequest httpRequest = HttpRequest.newBuilder()
+                .POST(HttpRequest.BodyPublishers.ofString(message))
+                .header("Cache", "no")
+                .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 reponse = http.send(httpRequest, HttpResponse.BodyHandlers.discarding());
+            return true;
+        } catch (IOException e) {
+            System.out.println("Error sending message");
+        } catch (InterruptedException e) {
+            System.out.println("Interruped sending message");
+        }
+        return false;
+    }
+
+    @Override
+    public void receive(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));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/NtfyMessageDto.java b/src/main/java/com/example/NtfyMessageDto.java
new file mode 100644
index 00000000..697cccac
--- /dev/null
+++ b/src/main/java/com/example/NtfyMessageDto.java
@@ -0,0 +1,7 @@
+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) {
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/Singelton.java b/src/main/java/com/example/Singelton.java
new file mode 100644
index 00000000..b3685a01
--- /dev/null
+++ b/src/main/java/com/example/Singelton.java
@@ -0,0 +1,14 @@
+package com.example;
+
+public class Singelton {
+
+    private final static Singelton instance = new Singelton();
+
+    private Singelton(){
+
+    }
+
+    public static Singelton getInstance(){
+        return instance;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 71574a27..2b046ce2 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 tools.jackson.databind;
+    requires io.github.cdimascio.dotenv.java;
+    requires java.net.http;
 
     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..63851ee9 100644
--- a/src/main/resources/com/example/hello-view.fxml
+++ b/src/main/resources/com/example/hello-view.fxml
@@ -1,9 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?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>
-        <Label fx:id="messageLabel" text="Hello, JavaFX!" />
-    </children>
-</StackPane>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.geometry.Insets?>
+
+<VBox xmlns="http://javafx.com/javafx/17.0.12"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="com.example.HelloController"
+      alignment="CENTER"
+      spacing="10">
+
+    <!-- Padding -->
+    <padding>
+        <Insets top="10" right="10" bottom="10" left="10"/>
+    </padding>
+
+    <!-- Greeting label -->
+    <Label fx:id="messageLabel" text="Hello, JavaFX!" />
+
+    <!-- List of messages -->
+    <ListView fx:id="messageView" VBox.vgrow="ALWAYS" prefHeight="300" prefWidth="400" />
+
+    <!-- Input area + send button -->
+    <HBox spacing="10" alignment="CENTER">
+        <TextArea fx:id="messageInput" prefHeight="50" prefWidth="300" wrapText="true"/>
+        <Button text="Send message" onAction="#sendMessage" />
+    </HBox>
+
+</VBox>
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
new file mode 100644
index 00000000..71f7babe
--- /dev/null
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -0,0 +1,40 @@
+package com.example;
+
+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
+    @DisplayName("Given a model with messageToSend when calling sendMessage then send method on connection should be called")
+    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");
+    }
+
+    @Test
+    void sendMessageToFakeServer(WireMockRuntimeInfo wmRuntimeInfo) {
+        var con = new NtfyConnectionImpl("http://localhost:" + wmRuntimeInfo.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(matching("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..3f86453f
--- /dev/null
+++ b/src/test/java/com/example/NtfyConnectionSpy.java
@@ -0,0 +1,19 @@
+package com.example;
+
+import java.util.function.Consumer;
+
+public class NtfyConnectionSpy implements NtfyConnection{
+
+    String message;
+
+    @Override
+    public boolean send(String message) {
+        this.message = message;
+        return true;
+    }
+
+    @Override
+    public void receive(Consumer<NtfyMessageDto> messageHandler) {
+
+    }
+}
\ No newline at end of file

From 87e581f9922c23ec5613d92a5d7f389d8559f9f5 Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Mon, 10 Nov 2025 21:22:33 +0100
Subject: [PATCH 02/21] =?UTF-8?q?feat=20:=20ta=20emot=20meddelande=20fr?=
 =?UTF-8?q?=C3=A5n=20nfty,=20add=20recieve,=20seton=20och=20test=20f=C3=B6?=
 =?UTF-8?q?r=20mottagning.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/HelloModel.java     | 12 ++++++
 .../java/com/example/NtfyConnectionImpl.java  | 15 ++++++--
 src/test/java/com/example/HelloModelTest.java | 38 +++++++++++++++++--
 3 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index ca316ae6..b72982e7 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -5,6 +5,7 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import java.util.function.Consumer;
 
 /**
  * Model layer: encapsulates application data and business logic.
@@ -59,4 +60,15 @@ public void sendMessage() {
     public void receiveMessage() {
         connection.receive(m -> Platform.runLater(() -> messages.add(m)));
     }
+
+    /**
+     * For testing - allows setting a callback for received messages
+     */
+    public void setOnMessageReceived(Consumer<String> onMessageReceived) {
+        connection.receive(ntfyMessage -> {
+            //Test callback
+            onMessageReceived.accept(ntfyMessage.message());
+            Platform.runLater(() -> messages.add(ntfyMessage));
+        });
+    }
 }
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
index a290dfb9..3f586bed 100644
--- a/src/main/java/com/example/NtfyConnectionImpl.java
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -56,10 +56,17 @@ public void receive(Consumer<NtfyMessageDto> messageHandler) {
 
         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)
+                        .filter(line -> line.startsWith("data: "))
+                        .map(line -> line.substring(6))
+                        .map(json -> {
+                            try {
+                                return mapper.readValue(json, NtfyMessageDto.class);
+                            } catch (Exception e) {
+                                System.err.println("Error parsing JSON: " + json);
+                                return null;
+                            }
+                        })
+                        .filter(Objects::nonNull)
                         .forEach(messageHandler));
     }
 }
\ No newline at end of file
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 71f7babe..3430b787 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -5,6 +5,9 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.TimeUnit;
+
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -14,13 +17,13 @@ class HelloModelTest {
     @Test
     @DisplayName("Given a model with messageToSend when calling sendMessage then send method on connection should be called")
     void sendMessageCallsConnectionWithMessageToSend() {
-        //Arrange  Given
+        //Arrange Given
         var spy = new NtfyConnectionSpy();
         var model = new HelloModel(spy);
         model.setMessageToSend("Hello World");
-        //Act  When
+        //Act When
         model.sendMessage();
-        //Assert   Then
+        //Assert Then
         assertThat(spy.message).isEqualTo("Hello World");
     }
 
@@ -37,4 +40,33 @@ void sendMessageToFakeServer(WireMockRuntimeInfo wmRuntimeInfo) {
         verify(postRequestedFor(urlEqualTo("/mytopic"))
                 .withRequestBody(matching("Hello World")));
     }
+    @Test
+    @DisplayName("When message is received then model should update received message")
+    void receivedMessageUpdatesModel(WireMockRuntimeInfo wmRuntimeInfo) throws InterruptedException {
+        //Arrange - Given
+        var con = new NtfyConnectionImpl("http://localhost:" + wmRuntimeInfo.getHttpPort());
+
+        AtomicReference<String> receivedMessage = new AtomicReference<>();
+
+        //Mock ntfy Server-Sent Events
+        stubFor(get("/mytopic/json")
+                .willReturn(ok()
+                        .withHeader("Content-Type", "text/event-stream")
+                        .withBody("data: {\"id\":\"123\",\"time\":1630000000,\"event\":\"message\",\"topic\":\"mytopic\",\"message\":\"Hello from test\"}\n\n")));
+
+        //Act When
+        var model = new HelloModel(con);
+
+        //Register callback after model created
+        model.setOnMessageReceived(msg -> {
+            System.out.println("Callback called with message: " + msg);
+            receivedMessage.set(msg);
+        });
+
+        //Wait 2 seconds for message
+        Thread.sleep(2000);
+
+        //Assert Then
+        assertThat(receivedMessage.get()).isEqualTo("Hello from test");
+    }
 }
\ No newline at end of file

From 906b4b2a8cb20c2a0d776b9e39075aeb0418eace Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Tue, 11 Nov 2025 09:08:38 +0100
Subject: [PATCH 03/21] =?UTF-8?q?fels=C3=B6kning=20recieve?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/HelloModel.java         |  3 +--
 src/main/java/com/example/NtfyConnectionImpl.java | 12 +-----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index b72982e7..c15b0ae3 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -56,7 +56,6 @@ public void sendMessage() {
         connection.send(msg);
     }
 
-
     public void receiveMessage() {
         connection.receive(m -> Platform.runLater(() -> messages.add(m)));
     }
@@ -71,4 +70,4 @@ public void setOnMessageReceived(Consumer<String> onMessageReceived) {
             Platform.runLater(() -> messages.add(ntfyMessage));
         });
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
index 3f586bed..5d2f10b4 100644
--- a/src/main/java/com/example/NtfyConnectionImpl.java
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -56,17 +56,7 @@ public void receive(Consumer<NtfyMessageDto> messageHandler) {
 
         http.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
                 .thenAccept(response -> response.body()
-                        .filter(line -> line.startsWith("data: "))
-                        .map(line -> line.substring(6))
-                        .map(json -> {
-                            try {
-                                return mapper.readValue(json, NtfyMessageDto.class);
-                            } catch (Exception e) {
-                                System.err.println("Error parsing JSON: " + json);
-                                return null;
-                            }
-                        })
-                        .filter(Objects::nonNull)
+                        .map(s -> mapper.readValue(s, NtfyMessageDto.class))
                         .forEach(messageHandler));
     }
 }
\ No newline at end of file

From 404b1f19ace9531f17f8d075df37ee0cfe848a1a Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Wed, 12 Nov 2025 09:56:51 +0100
Subject: [PATCH 04/21] =?UTF-8?q?refaktorisera=20modell=20och=20l=C3=A4gg?=
 =?UTF-8?q?=20till=20tester=20f=C3=B6r=20validering=20och=20felhantering?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/HelloModel.java     |  34 ++-
 src/test/java/com/example/HelloModelTest.java | 223 ++++++++++++++----
 .../java/com/example/NtfyConnectionSpy.java   |  10 +-
 3 files changed, 203 insertions(+), 64 deletions(-)

diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index c15b0ae3..8eff95a1 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -7,13 +7,9 @@
 import javafx.collections.ObservableList;
 import java.util.function.Consumer;
 
-/**
- * Model layer: encapsulates application data and business logic.
- */
 public class HelloModel {
 
     private final NtfyConnection connection;
-
     private final ObservableList<NtfyMessageDto> messages = FXCollections.observableArrayList();
     private final StringProperty messageToSend = new SimpleStringProperty();
 
@@ -38,9 +34,6 @@ public void setMessageToSend(String message) {
         messageToSend.set(message);
     }
 
-    /**
-     * Returns a greeting based on the current Java and JavaFX versions.
-     */
     public String getGreeting() {
         String javaVersion = System.getProperty("java.version");
         String javafxVersion = System.getProperty("javafx.version");
@@ -50,24 +43,29 @@ public String getGreeting() {
     public void sendMessage() {
         String msg = messageToSend.get();
         if (msg == null || msg.isBlank()) {
-            System.out.println("Nothing to send!");
             return;
         }
         connection.send(msg);
     }
 
-    public void receiveMessage() {
-        connection.receive(m -> Platform.runLater(() -> messages.add(m)));
+    public void sendMessageAsync(Consumer<Boolean> callback) {
+        String msg = messageToSend.get();
+        if (msg == null || msg.isBlank()) {
+            callback.accept(false);
+            return;
+        }
+
+        try {
+            boolean success = connection.send(msg);
+            callback.accept(success);
+        } catch (Exception e) {
+            callback.accept(false);
+        }
     }
 
-    /**
-     * For testing - allows setting a callback for received messages
-     */
-    public void setOnMessageReceived(Consumer<String> onMessageReceived) {
-        connection.receive(ntfyMessage -> {
-            //Test callback
-            onMessageReceived.accept(ntfyMessage.message());
-            Platform.runLater(() -> messages.add(ntfyMessage));
+    private void receiveMessage() {
+        connection.receive(message -> {
+            Platform.runLater(() -> messages.add(message));
         });
     }
 }
\ No newline at end of file
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 3430b787..27498f31 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -2,11 +2,14 @@
 
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
-import org.junit.jupiter.api.DisplayName;
+import javafx.application.Platform;
+import javafx.collections.ListChangeListener;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -14,59 +17,191 @@
 @WireMockTest
 class HelloModelTest {
 
+    @BeforeAll
+    static void setupJavaFX() {
+        if (!Platform.isFxApplicationThread()) {
+            Platform.startup(() -> {});
+        }
+    }
+
+    //successful send tests
     @Test
-    @DisplayName("Given a model with messageToSend when calling sendMessage then send method on connection should be called")
-    void sendMessageCallsConnectionWithMessageToSend() {
-        //Arrange Given
-        var spy = new NtfyConnectionSpy();
-        var model = new HelloModel(spy);
+    void shouldSendMessageThroughConnection() throws InterruptedException {
+        NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
+        HelloModel model = new HelloModel(connectionSpy);
         model.setMessageToSend("Hello World");
-        //Act When
-        model.sendMessage();
-        //Assert Then
-        assertThat(spy.message).isEqualTo("Hello World");
+
+        CountDownLatch latch = new CountDownLatch(1);
+        model.sendMessageAsync(success -> latch.countDown());
+
+        assertThat(latch.await(500, TimeUnit.MILLISECONDS)).isTrue();
+        assertThat(connectionSpy.message).isEqualTo("Hello World");
     }
 
     @Test
-    void sendMessageToFakeServer(WireMockRuntimeInfo wmRuntimeInfo) {
-        var con = new NtfyConnectionImpl("http://localhost:" + wmRuntimeInfo.getHttpPort());
-        var model = new HelloModel(con);
-        model.setMessageToSend("Hello World");
-        stubFor(post("/mytopic").willReturn(ok()));
+    void shouldHandleMultipleConsecutiveSends() throws InterruptedException {
+        NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
+        HelloModel model = new HelloModel(connectionSpy);
+
+        CountDownLatch latch = new CountDownLatch(2);
+        boolean[] results = new boolean[2];
 
-        model.sendMessage();
+        model.setMessageToSend("First");
+        model.sendMessageAsync(success -> {
+            results[0] = success;
+            latch.countDown();
+        });
+
+        model.setMessageToSend("Second");
+        model.sendMessageAsync(success -> {
+            results[1] = success;
+            latch.countDown();
+        });
 
-        //Verify call made to server
-        verify(postRequestedFor(urlEqualTo("/mytopic"))
-                .withRequestBody(matching("Hello World")));
+        latch.await(1, TimeUnit.SECONDS);
+        assertThat(results[0]).isTrue();
+        assertThat(results[1]).isTrue();
+        assertThat(connectionSpy.message).isEqualTo("Second");
     }
+
+    //invalid send tests
     @Test
-    @DisplayName("When message is received then model should update received message")
-    void receivedMessageUpdatesModel(WireMockRuntimeInfo wmRuntimeInfo) throws InterruptedException {
-        //Arrange - Given
-        var con = new NtfyConnectionImpl("http://localhost:" + wmRuntimeInfo.getHttpPort());
-
-        AtomicReference<String> receivedMessage = new AtomicReference<>();
-
-        //Mock ntfy Server-Sent Events
-        stubFor(get("/mytopic/json")
-                .willReturn(ok()
-                        .withHeader("Content-Type", "text/event-stream")
-                        .withBody("data: {\"id\":\"123\",\"time\":1630000000,\"event\":\"message\",\"topic\":\"mytopic\",\"message\":\"Hello from test\"}\n\n")));
-
-        //Act When
-        var model = new HelloModel(con);
-
-        //Register callback after model created
-        model.setOnMessageReceived(msg -> {
-            System.out.println("Callback called with message: " + msg);
-            receivedMessage.set(msg);
+    void shouldRejectBlankMessages() throws InterruptedException {
+        NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
+        HelloModel model = new HelloModel(connectionSpy);
+
+        String[] invalidInputs = {"", null};
+
+        for (String input : invalidInputs) {
+            model.setMessageToSend(input);
+            CountDownLatch latch = new CountDownLatch(1);
+            boolean[] wasSuccessful = new boolean[1];
+
+            model.sendMessageAsync(success -> {
+                wasSuccessful[0] = success;
+                latch.countDown();
+            });
+
+            latch.await(500, TimeUnit.MILLISECONDS);
+            assertThat(wasSuccessful[0]).isFalse();
+            assertThat(connectionSpy.message).isNull();
+        }
+    }
+
+    @Test
+    void shouldFailWhenSendingEmptyText() throws InterruptedException {
+        NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
+        HelloModel model = new HelloModel(connectionSpy);
+        model.setMessageToSend("");
+
+        CountDownLatch latch = new CountDownLatch(1);
+        boolean[] wasSuccessful = new boolean[1];
+
+        model.sendMessageAsync(success -> {
+            wasSuccessful[0] = success;
+            latch.countDown();
+        });
+
+        latch.await(500, TimeUnit.MILLISECONDS);
+        assertThat(wasSuccessful[0]).isFalse();
+        assertThat(connectionSpy.message).isNull();
+    }
+
+    @Test
+    void shouldFailWhenSendingNullMessage() throws InterruptedException {
+        NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
+        HelloModel model = new HelloModel(connectionSpy);
+        model.setMessageToSend(null);
+
+        CountDownLatch latch = new CountDownLatch(1);
+        boolean[] wasSuccessful = new boolean[1];
+
+        model.sendMessageAsync(success -> {
+            wasSuccessful[0] = success;
+            latch.countDown();
+        });
+
+        latch.await(500, TimeUnit.MILLISECONDS);
+        assertThat(wasSuccessful[0]).isFalse();
+        assertThat(connectionSpy.message).isNull();
+    }
+
+    //error handling tests
+    @Test
+    void shouldReturnFailureWhenConnectionFails() throws InterruptedException {
+        NtfyConnection failingConn = new NtfyConnection() {
+            @Override
+            public boolean send(String message) {
+                return false;
+            }
+            @Override
+            public void receive(Consumer<NtfyMessageDto> messageHandler) { }
+        };
+        HelloModel model = new HelloModel(failingConn);
+        model.setMessageToSend("Fail this message");
+
+        CountDownLatch latch = new CountDownLatch(1);
+        boolean[] wasSuccessful = new boolean[1];
+
+        model.sendMessageAsync(success -> {
+            wasSuccessful[0] = success;
+            latch.countDown();
+        });
+
+        latch.await(500, TimeUnit.MILLISECONDS);
+        assertThat(wasSuccessful[0]).isFalse();
+        assertThat(model.getMessageToSend()).isEqualTo("Fail this message");
+    }
+
+    @Test
+    void shouldHandleExceptionsDuringSend() throws InterruptedException {
+        NtfyConnection throwingConn = new NtfyConnection() {
+            @Override
+            public boolean send(String message) {
+                throw new RuntimeException("Simulated crash");
+            }
+            @Override
+            public void receive(Consumer<NtfyMessageDto> messageHandler) { }
+        };
+        HelloModel model = new HelloModel(throwingConn);
+        model.setMessageToSend("Crash this");
+
+        CountDownLatch latch = new CountDownLatch(1);
+        boolean[] wasSuccessful = new boolean[1];
+
+        try {
+            model.sendMessageAsync(success -> {
+                wasSuccessful[0] = success;
+                latch.countDown();
+            });
+        } catch (Exception ex) {
+            wasSuccessful[0] = false;
+            latch.countDown();
+        }
+
+        latch.await(500, TimeUnit.MILLISECONDS);
+        assertThat(wasSuccessful[0]).isFalse();
+    }
+
+    //receiving messages tests
+    @Test
+    void shouldAddIncomingMessageToList() throws InterruptedException {
+        NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
+        HelloModel model = new HelloModel(connectionSpy);
+        NtfyMessageDto incomingMsg = new NtfyMessageDto("Test", 1, "message", "myroom", "Test");
+
+        CountDownLatch latch = new CountDownLatch(1);
+        model.getMessages().addListener((ListChangeListener<NtfyMessageDto>) c -> {
+            while (c.next()) {
+                if (c.wasAdded()) {
+                    latch.countDown();
+                }
+            }
         });
 
-        //Wait 2 seconds for message
-        Thread.sleep(2000);
+        connectionSpy.simulateIncoming(incomingMsg);
 
-        //Assert Then
-        assertThat(receivedMessage.get()).isEqualTo("Hello from test");
+        assertThat(latch.await(1, TimeUnit.SECONDS)).isTrue();
+        assertThat(model.getMessages()).contains(incomingMsg);
     }
 }
\ 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 3f86453f..3945cc30 100644
--- a/src/test/java/com/example/NtfyConnectionSpy.java
+++ b/src/test/java/com/example/NtfyConnectionSpy.java
@@ -2,9 +2,9 @@
 
 import java.util.function.Consumer;
 
-public class NtfyConnectionSpy implements NtfyConnection{
-
+public class NtfyConnectionSpy implements NtfyConnection {
     String message;
+    private Consumer<NtfyMessageDto> messageHandler;
 
     @Override
     public boolean send(String message) {
@@ -14,6 +14,12 @@ public boolean send(String message) {
 
     @Override
     public void receive(Consumer<NtfyMessageDto> messageHandler) {
+        this.messageHandler = messageHandler;
+    }
 
+    public void simulateIncoming(NtfyMessageDto msg) {
+        if (messageHandler != null) {
+            messageHandler.accept(msg);
+        }
     }
 }
\ No newline at end of file

From 16b1396e02fd18facf4269dac6d389b3163439b0 Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Wed, 12 Nov 2025 10:04:46 +0100
Subject: [PATCH 05/21] =?UTF-8?q?test=20f=C3=B6r=20att=20ignorera=20null?=
 =?UTF-8?q?=20meddelanden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/HelloModel.java     |  3 +++
 src/test/java/com/example/HelloModelTest.java | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 8eff95a1..a75963d4 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -65,6 +65,9 @@ public void sendMessageAsync(Consumer<Boolean> callback) {
 
     private void receiveMessage() {
         connection.receive(message -> {
+            if (message == null) {
+                return;
+            }
             Platform.runLater(() -> messages.add(message));
         });
     }
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 27498f31..313c9088 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -204,4 +204,22 @@ void shouldAddIncomingMessageToList() throws InterruptedException {
         assertThat(latch.await(1, TimeUnit.SECONDS)).isTrue();
         assertThat(model.getMessages()).contains(incomingMsg);
     }
+    @Test
+    void shouldDiscardNullIncomingMessage() throws InterruptedException {
+        NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
+        HelloModel model = new HelloModel(connectionSpy);
+
+        CountDownLatch latch = new CountDownLatch(1);
+        model.getMessages().addListener((ListChangeListener<NtfyMessageDto>) c -> {
+            while (c.next()) {
+                if (c.wasAdded()) latch.countDown();
+            }
+        });
+
+        connectionSpy.simulateIncoming(null);
+
+        boolean messageAdded = latch.await(500, TimeUnit.MILLISECONDS);
+        assertThat(messageAdded).isFalse();
+        assertThat(model.getMessages()).isEmpty();
+    }
 }
\ No newline at end of file

From 5de28bf13d9e2c90c8953027994ac21e039d04ab Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Wed, 12 Nov 2025 14:32:25 +0100
Subject: [PATCH 06/21] =?UTF-8?q?test=20f=C3=B6r=20att=20ignorera=20tomma?=
 =?UTF-8?q?=20meddelanden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/HelloModel.java     |  2 +-
 src/test/java/com/example/HelloModelTest.java | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index a75963d4..834807a7 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -65,7 +65,7 @@ public void sendMessageAsync(Consumer<Boolean> callback) {
 
     private void receiveMessage() {
         connection.receive(message -> {
-            if (message == null) {
+            if (message == null || message.message() == null || message.message().isBlank()) {
                 return;
             }
             Platform.runLater(() -> messages.add(message));
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 313c9088..3e82f6fa 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -218,6 +218,28 @@ void shouldDiscardNullIncomingMessage() throws InterruptedException {
 
         connectionSpy.simulateIncoming(null);
 
+        boolean messageAdded = latch.await(500, TimeUnit.MILLISECONDS);
+        assertThat(messageAdded).isFalse();
+        assertThat(model.getMessages()).isEmpty();
+    }
+    @Test
+    void shouldIgnoreMessagesWithBlankContent() throws InterruptedException {
+        NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
+        HelloModel model = new HelloModel(connectionSpy);
+
+        CountDownLatch latch = new CountDownLatch(1);
+        model.getMessages().addListener((ListChangeListener<NtfyMessageDto>) c -> {
+            while (c.next()) {
+                if (c.wasAdded()) latch.countDown();
+            }
+        });
+
+        NtfyMessageDto whitespaceMsg = new NtfyMessageDto("id1", 1, "message", "room", "   ");
+        NtfyMessageDto emptyMsg = new NtfyMessageDto("id2", 2, "message", "room", "");
+
+        connectionSpy.simulateIncoming(whitespaceMsg);
+        connectionSpy.simulateIncoming(emptyMsg);
+
         boolean messageAdded = latch.await(500, TimeUnit.MILLISECONDS);
         assertThat(messageAdded).isFalse();
         assertThat(model.getMessages()).isEmpty();

From 61b603391d1ce7ed13fc83cfb0ee68ab6d8465a6 Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Wed, 12 Nov 2025 15:21:07 +0100
Subject: [PATCH 07/21] integrationstest med wiremock

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

diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 3e82f6fa..4b3a4dca 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -244,4 +244,40 @@ void shouldIgnoreMessagesWithBlankContent() throws InterruptedException {
         assertThat(messageAdded).isFalse();
         assertThat(model.getMessages()).isEmpty();
     }
+    @Test
+    void shouldRejectAllInvalidIncomingMessages() throws InterruptedException {
+        NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
+        HelloModel model = new HelloModel(connectionSpy);
+
+        CountDownLatch latch = new CountDownLatch(1);
+        model.getMessages().addListener((ListChangeListener<NtfyMessageDto>) c -> {
+            while (c.next()) {
+                if (c.wasAdded()) latch.countDown();
+            }
+        });
+
+        connectionSpy.simulateIncoming(new NtfyMessageDto("id1", 1, "message", "room", ""));
+        connectionSpy.simulateIncoming(new NtfyMessageDto("id2", 2, "message", "room", "  "));
+        connectionSpy.simulateIncoming(null);
+
+        boolean messageAdded = latch.await(500, TimeUnit.MILLISECONDS);
+        assertThat(messageAdded).isFalse();
+        assertThat(model.getMessages()).isEmpty();
+    }
+    //integration test
+    @Test
+    void shouldCommunicateWithMockedServer(WireMockRuntimeInfo wmInfo) throws InterruptedException {
+        NtfyConnectionImpl connection = new NtfyConnectionImpl("http://localhost:" + wmInfo.getHttpPort());
+        HelloModel model = new HelloModel(connection);
+        model.setMessageToSend("Hello World");
+
+        stubFor(post("/mytopic").willReturn(ok()));
+
+        CountDownLatch latch = new CountDownLatch(1);
+        model.sendMessageAsync(success -> latch.countDown());
+
+        assertThat(latch.await(1, TimeUnit.SECONDS)).isTrue();
+        verify(postRequestedFor(urlEqualTo("/mytopic"))
+                .withRequestBody(matching("Hello World")));
+    }
 }
\ No newline at end of file

From bf7e2bf65adadc0e34b29f6e50f8d0845d5c16ff Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Wed, 12 Nov 2025 19:28:26 +0100
Subject: [PATCH 08/21] mocka recieve-anrop

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

diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 4b3a4dca..b2592df6 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -272,6 +272,7 @@ void shouldCommunicateWithMockedServer(WireMockRuntimeInfo wmInfo) throws Interr
         model.setMessageToSend("Hello World");
 
         stubFor(post("/mytopic").willReturn(ok()));
+        stubFor(get("/mytopic/json").willReturn(ok()));
 
         CountDownLatch latch = new CountDownLatch(1);
         model.sendMessageAsync(success -> latch.countDown());

From 8e888be0b68f29d790631028c59665f7890d9fbd Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 13 Nov 2025 13:24:13 +0100
Subject: [PATCH 09/21] recieve fix efter AI feedback

---
 src/main/java/com/example/HelloModel.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 834807a7..4fab3e66 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -68,7 +68,15 @@ private void receiveMessage() {
             if (message == null || message.message() == null || message.message().isBlank()) {
                 return;
             }
-            Platform.runLater(() -> messages.add(message));
+            try {
+                if (Platform.isFxApplicationThread()) {
+                    messages.add(message);
+                } else {
+                    Platform.runLater(() -> messages.add(message));
+                }
+            } catch (UnsupportedOperationException e) {
+                messages.add(message);
+            }
         });
     }
 }
\ No newline at end of file

From 8f7929931af3ebdb051a02a429ed651d338d31ee Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 13 Nov 2025 13:46:32 +0100
Subject: [PATCH 10/21] =?UTF-8?q?autograding=20FX=20problem=20l=C3=B6st=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/HelloModel.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 4fab3e66..19c31710 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -68,13 +68,14 @@ private void receiveMessage() {
             if (message == null || message.message() == null || message.message().isBlank()) {
                 return;
             }
+
             try {
                 if (Platform.isFxApplicationThread()) {
                     messages.add(message);
                 } else {
                     Platform.runLater(() -> messages.add(message));
                 }
-            } catch (UnsupportedOperationException e) {
+            } catch (UnsupportedOperationException | IllegalStateException e) {
                 messages.add(message);
             }
         });

From 64ef5aabcab9d65faaf6937c117e9b8d8205fe94 Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 13 Nov 2025 14:07:34 +0100
Subject: [PATCH 11/21] trycatch i hellomodeltest startup

---
 src/test/java/com/example/HelloModelTest.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index b2592df6..350ce65e 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -19,8 +19,13 @@ class HelloModelTest {
 
     @BeforeAll
     static void setupJavaFX() {
-        if (!Platform.isFxApplicationThread()) {
-            Platform.startup(() -> {});
+        try {
+            if (!Platform.isFxApplicationThread()) {
+                Platform.startup(() -> {});
+            }
+        } catch (UnsupportedOperationException e) {
+            System.out.println("Headless environment detected – skipping JavaFX startup");
+        } catch (IllegalStateException e) {
         }
     }
 

From d5c2cd2d768692c80c70e2b3441c3b7592b79ee1 Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 13 Nov 2025 14:32:23 +0100
Subject: [PATCH 12/21] =?UTF-8?q?dependency=20uppdatering=20och=20headless?=
 =?UTF-8?q?=20check=20=C3=A4ven=20f=C3=B6r=20HelloModel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                   | 6 ++++++
 src/main/java/com/example/HelloModel.java | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/pom.xml b/pom.xml
index f410eea0..bc863a7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,12 @@
             <version>4.0.0-beta.15</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>2.0.12</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 19c31710..e344a10a 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -69,6 +69,11 @@ private void receiveMessage() {
                 return;
             }
 
+            if (System.getProperty("java.awt.headless", "false").equals("true")) {
+                messages.add(message); // lägg direkt i listan
+                return;
+            }
+
             try {
                 if (Platform.isFxApplicationThread()) {
                     messages.add(message);

From 91d4a2646b2ce432910eafefaf49f31eeb65bc52 Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 13 Nov 2025 14:54:59 +0100
Subject: [PATCH 13/21] =?UTF-8?q?=C3=A4ndrat=20latch=20await=20till=201sek?=
 =?UTF-8?q?=20f=C3=B6r=20att=20hanterna=20timeout=20i=20test.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/HelloModel.java     |  2 +-
 src/test/java/com/example/HelloModelTest.java | 32 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index e344a10a..7494123e 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -70,7 +70,7 @@ private void receiveMessage() {
             }
 
             if (System.getProperty("java.awt.headless", "false").equals("true")) {
-                messages.add(message); // lägg direkt i listan
+                messages.add(message);
                 return;
             }
 
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 350ce65e..609e4a4a 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -29,7 +29,7 @@ static void setupJavaFX() {
         }
     }
 
-    //successful send tests
+    // successful send tests
     @Test
     void shouldSendMessageThroughConnection() throws InterruptedException {
         NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
@@ -39,7 +39,7 @@ void shouldSendMessageThroughConnection() throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
         model.sendMessageAsync(success -> latch.countDown());
 
-        assertThat(latch.await(500, TimeUnit.MILLISECONDS)).isTrue();
+        assertThat(latch.await(1, TimeUnit.SECONDS)).isTrue();
         assertThat(connectionSpy.message).isEqualTo("Hello World");
     }
 
@@ -69,7 +69,7 @@ void shouldHandleMultipleConsecutiveSends() throws InterruptedException {
         assertThat(connectionSpy.message).isEqualTo("Second");
     }
 
-    //invalid send tests
+    // invalid send tests
     @Test
     void shouldRejectBlankMessages() throws InterruptedException {
         NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
@@ -87,7 +87,7 @@ void shouldRejectBlankMessages() throws InterruptedException {
                 latch.countDown();
             });
 
-            latch.await(500, TimeUnit.MILLISECONDS);
+            latch.await(1, TimeUnit.SECONDS);
             assertThat(wasSuccessful[0]).isFalse();
             assertThat(connectionSpy.message).isNull();
         }
@@ -107,7 +107,7 @@ void shouldFailWhenSendingEmptyText() throws InterruptedException {
             latch.countDown();
         });
 
-        latch.await(500, TimeUnit.MILLISECONDS);
+        latch.await(1, TimeUnit.SECONDS);
         assertThat(wasSuccessful[0]).isFalse();
         assertThat(connectionSpy.message).isNull();
     }
@@ -126,12 +126,12 @@ void shouldFailWhenSendingNullMessage() throws InterruptedException {
             latch.countDown();
         });
 
-        latch.await(500, TimeUnit.MILLISECONDS);
+        latch.await(1, TimeUnit.SECONDS);
         assertThat(wasSuccessful[0]).isFalse();
         assertThat(connectionSpy.message).isNull();
     }
 
-    //error handling tests
+    // error handling tests
     @Test
     void shouldReturnFailureWhenConnectionFails() throws InterruptedException {
         NtfyConnection failingConn = new NtfyConnection() {
@@ -153,7 +153,7 @@ public void receive(Consumer<NtfyMessageDto> messageHandler) { }
             latch.countDown();
         });
 
-        latch.await(500, TimeUnit.MILLISECONDS);
+        latch.await(1, TimeUnit.SECONDS);
         assertThat(wasSuccessful[0]).isFalse();
         assertThat(model.getMessageToSend()).isEqualTo("Fail this message");
     }
@@ -184,11 +184,11 @@ public void receive(Consumer<NtfyMessageDto> messageHandler) { }
             latch.countDown();
         }
 
-        latch.await(500, TimeUnit.MILLISECONDS);
+        latch.await(1, TimeUnit.SECONDS);
         assertThat(wasSuccessful[0]).isFalse();
     }
 
-    //receiving messages tests
+    // receiving messages tests
     @Test
     void shouldAddIncomingMessageToList() throws InterruptedException {
         NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
@@ -209,6 +209,7 @@ void shouldAddIncomingMessageToList() throws InterruptedException {
         assertThat(latch.await(1, TimeUnit.SECONDS)).isTrue();
         assertThat(model.getMessages()).contains(incomingMsg);
     }
+
     @Test
     void shouldDiscardNullIncomingMessage() throws InterruptedException {
         NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
@@ -223,10 +224,11 @@ void shouldDiscardNullIncomingMessage() throws InterruptedException {
 
         connectionSpy.simulateIncoming(null);
 
-        boolean messageAdded = latch.await(500, TimeUnit.MILLISECONDS);
+        boolean messageAdded = latch.await(1, TimeUnit.SECONDS);
         assertThat(messageAdded).isFalse();
         assertThat(model.getMessages()).isEmpty();
     }
+
     @Test
     void shouldIgnoreMessagesWithBlankContent() throws InterruptedException {
         NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
@@ -245,10 +247,11 @@ void shouldIgnoreMessagesWithBlankContent() throws InterruptedException {
         connectionSpy.simulateIncoming(whitespaceMsg);
         connectionSpy.simulateIncoming(emptyMsg);
 
-        boolean messageAdded = latch.await(500, TimeUnit.MILLISECONDS);
+        boolean messageAdded = latch.await(1, TimeUnit.SECONDS);
         assertThat(messageAdded).isFalse();
         assertThat(model.getMessages()).isEmpty();
     }
+
     @Test
     void shouldRejectAllInvalidIncomingMessages() throws InterruptedException {
         NtfyConnectionSpy connectionSpy = new NtfyConnectionSpy();
@@ -265,11 +268,12 @@ void shouldRejectAllInvalidIncomingMessages() throws InterruptedException {
         connectionSpy.simulateIncoming(new NtfyMessageDto("id2", 2, "message", "room", "  "));
         connectionSpy.simulateIncoming(null);
 
-        boolean messageAdded = latch.await(500, TimeUnit.MILLISECONDS);
+        boolean messageAdded = latch.await(1, TimeUnit.SECONDS);
         assertThat(messageAdded).isFalse();
         assertThat(model.getMessages()).isEmpty();
     }
-    //integration test
+
+    // integration test
     @Test
     void shouldCommunicateWithMockedServer(WireMockRuntimeInfo wmInfo) throws InterruptedException {
         NtfyConnectionImpl connection = new NtfyConnectionImpl("http://localhost:" + wmInfo.getHttpPort());

From 1cfcb6b06ec7a8e7ca4a71c36b41c219747da379 Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 13 Nov 2025 15:48:15 +0100
Subject: [PATCH 14/21] =?UTF-8?q?anv=C3=A4nder=20runonfx=20f=C3=B6rs=C3=B6?=
 =?UTF-8?q?ka=20l=C3=B6sa=20timeout=20i=20AI=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/HelloModel.java | 25 +++++++++++------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 7494123e..c0b37b0f 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -68,21 +68,20 @@ private void receiveMessage() {
             if (message == null || message.message() == null || message.message().isBlank()) {
                 return;
             }
+            runOnFx(() -> messages.add(message));
+        });
+    }
 
-            if (System.getProperty("java.awt.headless", "false").equals("true")) {
-                messages.add(message);
-                return;
-            }
 
-            try {
-                if (Platform.isFxApplicationThread()) {
-                    messages.add(message);
-                } else {
-                    Platform.runLater(() -> messages.add(message));
-                }
-            } catch (UnsupportedOperationException | IllegalStateException e) {
-                messages.add(message);
+    private static void runOnFx(Runnable task) {
+        try {
+            if (Platform.isFxApplicationThread()) {
+                task.run();
+            } else {
+                Platform.runLater(task);
             }
-        });
+        } catch (IllegalStateException notInitialized) {
+            task.run();
+        }
     }
 }
\ No newline at end of file

From b665727740e9962e07e2b958c01b8113e9564c56 Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 13 Nov 2025 17:14:48 +0100
Subject: [PATCH 15/21] =?UTF-8?q?felhantering=20timeout=20f=C3=B6r=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/com/example/HelloModelTest.java | 49 ++++++++++---------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 609e4a4a..762f467e 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -6,6 +6,7 @@
 import javafx.collections.ListChangeListener;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -15,6 +16,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @WireMockTest
+@Timeout(10) // Global timeout för alla tester i klassen
 class HelloModelTest {
 
     @BeforeAll
@@ -23,9 +25,8 @@ static void setupJavaFX() {
             if (!Platform.isFxApplicationThread()) {
                 Platform.startup(() -> {});
             }
-        } catch (UnsupportedOperationException e) {
+        } catch (IllegalStateException | UnsupportedOperationException e) {
             System.out.println("Headless environment detected – skipping JavaFX startup");
-        } catch (IllegalStateException e) {
         }
     }
 
@@ -39,7 +40,8 @@ void shouldSendMessageThroughConnection() throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
         model.sendMessageAsync(success -> latch.countDown());
 
-        assertThat(latch.await(1, TimeUnit.SECONDS)).isTrue();
+        boolean completed = latch.await(5, TimeUnit.SECONDS);
+        assertThat(completed).as("Timed out waiting for message send").isTrue();
         assertThat(connectionSpy.message).isEqualTo("Hello World");
     }
 
@@ -63,7 +65,8 @@ void shouldHandleMultipleConsecutiveSends() throws InterruptedException {
             latch.countDown();
         });
 
-        latch.await(1, TimeUnit.SECONDS);
+        boolean completed = latch.await(5, TimeUnit.SECONDS);
+        assertThat(completed).as("Timed out waiting for consecutive sends").isTrue();
         assertThat(results[0]).isTrue();
         assertThat(results[1]).isTrue();
         assertThat(connectionSpy.message).isEqualTo("Second");
@@ -87,7 +90,8 @@ void shouldRejectBlankMessages() throws InterruptedException {
                 latch.countDown();
             });
 
-            latch.await(1, TimeUnit.SECONDS);
+            boolean completed = latch.await(5, TimeUnit.SECONDS);
+            assertThat(completed).as("Timed out waiting for blank message rejection").isTrue();
             assertThat(wasSuccessful[0]).isFalse();
             assertThat(connectionSpy.message).isNull();
         }
@@ -107,7 +111,8 @@ void shouldFailWhenSendingEmptyText() throws InterruptedException {
             latch.countDown();
         });
 
-        latch.await(1, TimeUnit.SECONDS);
+        boolean completed = latch.await(5, TimeUnit.SECONDS);
+        assertThat(completed).as("Timed out waiting for empty text rejection").isTrue();
         assertThat(wasSuccessful[0]).isFalse();
         assertThat(connectionSpy.message).isNull();
     }
@@ -126,7 +131,8 @@ void shouldFailWhenSendingNullMessage() throws InterruptedException {
             latch.countDown();
         });
 
-        latch.await(1, TimeUnit.SECONDS);
+        boolean completed = latch.await(5, TimeUnit.SECONDS);
+        assertThat(completed).as("Timed out waiting for null message rejection").isTrue();
         assertThat(wasSuccessful[0]).isFalse();
         assertThat(connectionSpy.message).isNull();
     }
@@ -153,7 +159,8 @@ public void receive(Consumer<NtfyMessageDto> messageHandler) { }
             latch.countDown();
         });
 
-        latch.await(1, TimeUnit.SECONDS);
+        boolean completed = latch.await(5, TimeUnit.SECONDS);
+        assertThat(completed).as("Timed out waiting for connection failure").isTrue();
         assertThat(wasSuccessful[0]).isFalse();
         assertThat(model.getMessageToSend()).isEqualTo("Fail this message");
     }
@@ -174,17 +181,13 @@ public void receive(Consumer<NtfyMessageDto> messageHandler) { }
         CountDownLatch latch = new CountDownLatch(1);
         boolean[] wasSuccessful = new boolean[1];
 
-        try {
-            model.sendMessageAsync(success -> {
-                wasSuccessful[0] = success;
-                latch.countDown();
-            });
-        } catch (Exception ex) {
-            wasSuccessful[0] = false;
+        model.sendMessageAsync(success -> {
+            wasSuccessful[0] = success;
             latch.countDown();
-        }
+        });
 
-        latch.await(1, TimeUnit.SECONDS);
+        boolean completed = latch.await(5, TimeUnit.SECONDS);
+        assertThat(completed).as("Timed out waiting for exception handling").isTrue();
         assertThat(wasSuccessful[0]).isFalse();
     }
 
@@ -206,7 +209,8 @@ void shouldAddIncomingMessageToList() throws InterruptedException {
 
         connectionSpy.simulateIncoming(incomingMsg);
 
-        assertThat(latch.await(1, TimeUnit.SECONDS)).isTrue();
+        boolean completed = latch.await(5, TimeUnit.SECONDS);
+        assertThat(completed).as("Timed out waiting for incoming message").isTrue();
         assertThat(model.getMessages()).contains(incomingMsg);
     }
 
@@ -224,7 +228,7 @@ void shouldDiscardNullIncomingMessage() throws InterruptedException {
 
         connectionSpy.simulateIncoming(null);
 
-        boolean messageAdded = latch.await(1, TimeUnit.SECONDS);
+        boolean messageAdded = latch.await(5, TimeUnit.SECONDS);
         assertThat(messageAdded).isFalse();
         assertThat(model.getMessages()).isEmpty();
     }
@@ -247,7 +251,7 @@ void shouldIgnoreMessagesWithBlankContent() throws InterruptedException {
         connectionSpy.simulateIncoming(whitespaceMsg);
         connectionSpy.simulateIncoming(emptyMsg);
 
-        boolean messageAdded = latch.await(1, TimeUnit.SECONDS);
+        boolean messageAdded = latch.await(5, TimeUnit.SECONDS);
         assertThat(messageAdded).isFalse();
         assertThat(model.getMessages()).isEmpty();
     }
@@ -268,7 +272,7 @@ void shouldRejectAllInvalidIncomingMessages() throws InterruptedException {
         connectionSpy.simulateIncoming(new NtfyMessageDto("id2", 2, "message", "room", "  "));
         connectionSpy.simulateIncoming(null);
 
-        boolean messageAdded = latch.await(1, TimeUnit.SECONDS);
+        boolean messageAdded = latch.await(5, TimeUnit.SECONDS);
         assertThat(messageAdded).isFalse();
         assertThat(model.getMessages()).isEmpty();
     }
@@ -286,7 +290,8 @@ void shouldCommunicateWithMockedServer(WireMockRuntimeInfo wmInfo) throws Interr
         CountDownLatch latch = new CountDownLatch(1);
         model.sendMessageAsync(success -> latch.countDown());
 
-        assertThat(latch.await(1, TimeUnit.SECONDS)).isTrue();
+        boolean completed = latch.await(5, TimeUnit.SECONDS);
+        assertThat(completed).as("Timed out waiting for server communication").isTrue();
         verify(postRequestedFor(urlEqualTo("/mytopic"))
                 .withRequestBody(matching("Hello World")));
     }

From 234a4e0a570588f860cbf38530c208f68b8891ad Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 13 Nov 2025 17:21:26 +0100
Subject: [PATCH 16/21] fixa javafx headless environment test timeouts

---
 src/main/java/com/example/HelloModel.java     |  2 +-
 src/test/java/com/example/HelloModelTest.java | 21 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index c0b37b0f..656fc7f7 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -80,7 +80,7 @@ private static void runOnFx(Runnable task) {
             } else {
                 Platform.runLater(task);
             }
-        } catch (IllegalStateException notInitialized) {
+        } catch (IllegalStateException | IllegalArgumentException e) {
             task.run();
         }
     }
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 762f467e..69664a3d 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -6,17 +6,16 @@
 import javafx.collections.ListChangeListener;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @WireMockTest
-@Timeout(10) // Global timeout för alla tester i klassen
 class HelloModelTest {
 
     @BeforeAll
@@ -198,19 +197,26 @@ void shouldAddIncomingMessageToList() throws InterruptedException {
         HelloModel model = new HelloModel(connectionSpy);
         NtfyMessageDto incomingMsg = new NtfyMessageDto("Test", 1, "message", "myroom", "Test");
 
+        AtomicBoolean messageReceived = new AtomicBoolean(false);
         CountDownLatch latch = new CountDownLatch(1);
+
         model.getMessages().addListener((ListChangeListener<NtfyMessageDto>) c -> {
             while (c.next()) {
                 if (c.wasAdded()) {
+                    messageReceived.set(true);
                     latch.countDown();
                 }
             }
         });
 
+        //give the listener time to attach
+        Thread.sleep(100);
+
         connectionSpy.simulateIncoming(incomingMsg);
 
         boolean completed = latch.await(5, TimeUnit.SECONDS);
         assertThat(completed).as("Timed out waiting for incoming message").isTrue();
+        assertThat(messageReceived.get()).isTrue();
         assertThat(model.getMessages()).contains(incomingMsg);
     }
 
@@ -226,9 +232,10 @@ void shouldDiscardNullIncomingMessage() throws InterruptedException {
             }
         });
 
+        Thread.sleep(100);
         connectionSpy.simulateIncoming(null);
 
-        boolean messageAdded = latch.await(5, TimeUnit.SECONDS);
+        boolean messageAdded = latch.await(2, TimeUnit.SECONDS);
         assertThat(messageAdded).isFalse();
         assertThat(model.getMessages()).isEmpty();
     }
@@ -245,13 +252,15 @@ void shouldIgnoreMessagesWithBlankContent() throws InterruptedException {
             }
         });
 
+        Thread.sleep(100);
+
         NtfyMessageDto whitespaceMsg = new NtfyMessageDto("id1", 1, "message", "room", "   ");
         NtfyMessageDto emptyMsg = new NtfyMessageDto("id2", 2, "message", "room", "");
 
         connectionSpy.simulateIncoming(whitespaceMsg);
         connectionSpy.simulateIncoming(emptyMsg);
 
-        boolean messageAdded = latch.await(5, TimeUnit.SECONDS);
+        boolean messageAdded = latch.await(2, TimeUnit.SECONDS);
         assertThat(messageAdded).isFalse();
         assertThat(model.getMessages()).isEmpty();
     }
@@ -268,11 +277,13 @@ void shouldRejectAllInvalidIncomingMessages() throws InterruptedException {
             }
         });
 
+        Thread.sleep(100);
+
         connectionSpy.simulateIncoming(new NtfyMessageDto("id1", 1, "message", "room", ""));
         connectionSpy.simulateIncoming(new NtfyMessageDto("id2", 2, "message", "room", "  "));
         connectionSpy.simulateIncoming(null);
 
-        boolean messageAdded = latch.await(5, TimeUnit.SECONDS);
+        boolean messageAdded = latch.await(2, TimeUnit.SECONDS);
         assertThat(messageAdded).isFalse();
         assertThat(model.getMessages()).isEmpty();
     }

From 120da00e197a3f28380f36681923c1398ffc9b60 Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 13 Nov 2025 19:21:42 +0100
Subject: [PATCH 17/21] Async

---
 .../java/com/example/HelloController.java     | 56 +++++++-------
 src/main/java/com/example/HelloModel.java     | 75 ++++++++-----------
 src/main/java/com/example/NtfyConnection.java | 11 +--
 .../java/com/example/NtfyConnectionImpl.java  | 50 ++++++++-----
 src/test/java/com/example/HelloModelTest.java | 13 ++--
 .../java/com/example/NtfyConnectionSpy.java   | 16 ++--
 6 files changed, 110 insertions(+), 111 deletions(-)

diff --git a/src/main/java/com/example/HelloController.java b/src/main/java/com/example/HelloController.java
index e1db5145..1ce67548 100644
--- a/src/main/java/com/example/HelloController.java
+++ b/src/main/java/com/example/HelloController.java
@@ -4,8 +4,6 @@
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
-import javafx.scene.control.ListCell;
-
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -14,32 +12,23 @@ public class HelloController {
 
     private final HelloModel model = new HelloModel(new NtfyConnectionImpl());
 
-    @FXML
-    private Label messageLabel;
+    @FXML private Label messageLabel;
+    @FXML private ListView<NtfyMessageDto> messageView;
+    @FXML private TextArea messageInput;
 
-    @FXML
-    private ListView<NtfyMessageDto> messageView;
-
-    @FXML
-    private TextArea messageInput;
-
-    // Formatter för tid
     private final DateTimeFormatter timeFormatter =
-            DateTimeFormatter.ofPattern("HH:mm:ss")
-                    .withZone(ZoneId.systemDefault());
+            DateTimeFormatter.ofPattern("HH:mm:ss").withZone(ZoneId.systemDefault());
 
     @FXML
     private void initialize() {
-        // Visa hälsning
+        //visa välkomstmeddelande
         messageLabel.setText(model.getGreeting());
 
-        // Koppla ListView till modellens meddelanden
         messageView.setItems(model.getMessages());
 
-        // Bind TextArea till modellens property
         messageInput.textProperty().bindBidirectional(model.messageToSendProperty());
 
-        // Snyggare visning av meddelanden
+        //formatera meddelanden i ListView
         messageView.setCellFactory(lv -> new ListCell<>() {
             @Override
             protected void updateItem(NtfyMessageDto msg, boolean empty) {
@@ -47,25 +36,36 @@ protected void updateItem(NtfyMessageDto msg, boolean empty) {
                 if (empty || msg == null) {
                     setText(null);
                 } else {
-                    setText("[" + timeFormatter.format(Instant.ofEpochMilli(msg.time())) + "] "
-                            + msg.message());
+                    setText("[" + timeFormatter.format(Instant.ofEpochMilli(msg.time())) + "] " + msg.message());
                 }
             }
         });
 
-        // Scrolla automatiskt ner till senaste meddelandet
+        // Scrolla automatiskt till senaste meddelandet
         model.getMessages().addListener((javafx.collections.ListChangeListener<NtfyMessageDto>) change -> {
-            Platform.runLater(() -> {
-                if (!messageView.getItems().isEmpty()) {
-                    messageView.scrollTo(messageView.getItems().size() - 1);
+            while (change.next()) {
+                if (change.wasAdded()) {
+                    Platform.runLater(() -> {
+                        int size = messageView.getItems().size();
+                        if (size > 0) {
+                            messageView.scrollTo(size - 1);
+                        }
+                    });
                 }
-            });
+            }
         });
     }
 
     @FXML
-    private void sendMessage(ActionEvent actionEvent) {
-        model.sendMessage();
-        messageInput.clear();
+    private void sendMessage(ActionEvent event) {
+        //skicka asynkront – HelloModel hanterar rensning och callback
+        model.sendMessageAsync(success -> {
+            if (!success) {
+                Platform.runLater(() -> {
+                    Alert alert = new Alert(Alert.AlertType.ERROR, "Kunde inte skicka meddelandet.");
+                    alert.show();
+                });
+            }
+        });
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/HelloModel.java b/src/main/java/com/example/HelloModel.java
index 656fc7f7..76bb9c78 100644
--- a/src/main/java/com/example/HelloModel.java
+++ b/src/main/java/com/example/HelloModel.java
@@ -11,41 +11,20 @@ public class HelloModel {
 
     private final NtfyConnection connection;
     private final ObservableList<NtfyMessageDto> messages = FXCollections.observableArrayList();
-    private final StringProperty messageToSend = new SimpleStringProperty();
+    private final StringProperty messageToSend = new SimpleStringProperty("");
 
     public HelloModel(NtfyConnection connection) {
         this.connection = connection;
-        receiveMessage();
+        startReceiving();
     }
 
-    public ObservableList<NtfyMessageDto> getMessages() {
-        return messages;
-    }
-
-    public String getMessageToSend() {
-        return messageToSend.get();
-    }
-
-    public StringProperty messageToSendProperty() {
-        return messageToSend;
-    }
-
-    public void setMessageToSend(String message) {
-        messageToSend.set(message);
-    }
-
-    public String getGreeting() {
-        String javaVersion = System.getProperty("java.version");
-        String javafxVersion = System.getProperty("javafx.version");
-        return "Welcome to ChatApp, made in JavaFX " + javafxVersion + ", running on Java " + javaVersion + ".";
-    }
-
-    public void sendMessage() {
-        String msg = messageToSend.get();
-        if (msg == null || msg.isBlank()) {
-            return;
-        }
-        connection.send(msg);
+    private void startReceiving() {
+        connection.receive(incoming -> {
+            if (incoming == null || incoming.message() == null || incoming.message().isBlank()) {
+                return;
+            }
+            runOnFx(() -> messages.add(incoming));
+        });
     }
 
     public void sendMessageAsync(Consumer<Boolean> callback) {
@@ -56,23 +35,25 @@ public void sendMessageAsync(Consumer<Boolean> callback) {
         }
 
         try {
-            boolean success = connection.send(msg);
-            callback.accept(success);
+            connection.send(msg, success -> {
+                if (success) {
+                    runOnFx(() -> {
+                        if (msg.equals(messageToSend.get())) {
+                            messageToSend.set("");
+                        }
+                    });
+                    callback.accept(true);
+                } else {
+                    callback.accept(false);
+                }
+            });
         } catch (Exception e) {
+            // FÅNGA ALLA EXCEPTIONS HÄR!
+            System.err.println("Exception during send: " + e.getMessage());
             callback.accept(false);
         }
     }
 
-    private void receiveMessage() {
-        connection.receive(message -> {
-            if (message == null || message.message() == null || message.message().isBlank()) {
-                return;
-            }
-            runOnFx(() -> messages.add(message));
-        });
-    }
-
-
     private static void runOnFx(Runnable task) {
         try {
             if (Platform.isFxApplicationThread()) {
@@ -80,8 +61,14 @@ private static void runOnFx(Runnable task) {
             } else {
                 Platform.runLater(task);
             }
-        } catch (IllegalStateException | IllegalArgumentException e) {
-            task.run();
+        } catch (Exception e) {
+            task.run(); // fallback i tester
         }
     }
+
+    public ObservableList<NtfyMessageDto> getMessages() { return messages; }
+    public String getMessageToSend() { return messageToSend.get(); }
+    public StringProperty messageToSendProperty() { return messageToSend; }
+    public void setMessageToSend(String v) { messageToSend.set(v); }
+    public String getGreeting() { return "Welcome to ChatApp"; }
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/NtfyConnection.java b/src/main/java/com/example/NtfyConnection.java
index c83095dd..d956cc24 100644
--- a/src/main/java/com/example/NtfyConnection.java
+++ b/src/main/java/com/example/NtfyConnection.java
@@ -2,10 +2,11 @@
 
 import java.util.function.Consumer;
 
-public interface NtfyConnection {
+interface NtfyConnection {
+        void send(String message, Consumer<Boolean> callback);
+        void receive(Consumer<NtfyMessageDto> handler);
+    }
 
-    public boolean send(String message);
+    //public boolean send(String message);
 
-    public void receive(Consumer<NtfyMessageDto> messageHandler);
-
-}
\ No newline at end of file
+    //public void receive(Consumer<NtfyMessageDto> messageHandler);
diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
index 5d2f10b4..5fac29eb 100644
--- a/src/main/java/com/example/NtfyConnectionImpl.java
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -3,7 +3,6 @@
 import io.github.cdimascio.dotenv.Dotenv;
 import tools.jackson.databind.ObjectMapper;
 
-import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
@@ -27,36 +26,47 @@ public NtfyConnectionImpl(String hostName) {
     }
 
     @Override
-    public boolean send(String message) {
-        HttpRequest httpRequest = HttpRequest.newBuilder()
+    public void send(String message, Consumer<Boolean> callback) {
+        HttpRequest request = HttpRequest.newBuilder()
                 .POST(HttpRequest.BodyPublishers.ofString(message))
-                .header("Cache", "no")
                 .uri(URI.create(hostName + "/mytopic"))
+                .header("Cache", "no")
                 .build();
-        try {
-            //Todo: handle long blocking send requests to not freeze the JavaFX thread
-            //1. Use thread send message?
-            //2. Use async?
-            var reponse = http.send(httpRequest, HttpResponse.BodyHandlers.discarding());
-            return true;
-        } catch (IOException e) {
-            System.out.println("Error sending message");
-        } catch (InterruptedException e) {
-            System.out.println("Interruped sending message");
-        }
-        return false;
+
+        http.sendAsync(request, HttpResponse.BodyHandlers.discarding())
+                .thenAccept(response -> {
+                    boolean success = response.statusCode() >= 200 && response.statusCode() < 300;
+                    callback.accept(success);
+                })
+                .exceptionally(throwable -> {
+                    System.err.println("Error sending message: " + throwable.getMessage());
+                    callback.accept(false);
+                    return null;
+                });
     }
 
     @Override
     public void receive(Consumer<NtfyMessageDto> messageHandler) {
-        HttpRequest httpRequest = HttpRequest.newBuilder()
+        HttpRequest request = HttpRequest.newBuilder()
                 .GET()
                 .uri(URI.create(hostName + "/mytopic/json"))
                 .build();
 
-        http.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofLines())
+        http.sendAsync(request, HttpResponse.BodyHandlers.ofLines())
                 .thenAccept(response -> response.body()
-                        .map(s -> mapper.readValue(s, NtfyMessageDto.class))
-                        .forEach(messageHandler));
+                        .map(line -> {
+                            try {
+                                return mapper.readValue(line, NtfyMessageDto.class);
+                            } catch (Exception e) {
+                                System.err.println("Failed to parse message: " + line);
+                                return null;
+                            }
+                        })
+                        .filter(Objects::nonNull)
+                        .forEach(messageHandler))
+                .exceptionally(ex -> {
+                    System.err.println("Error receiving messages: " + ex.getMessage());
+                    return null;
+                });
     }
 }
\ No newline at end of file
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 69664a3d..b3b36e27 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -140,12 +140,15 @@ void shouldFailWhenSendingNullMessage() throws InterruptedException {
     @Test
     void shouldReturnFailureWhenConnectionFails() throws InterruptedException {
         NtfyConnection failingConn = new NtfyConnection() {
-            @Override
+            /*@Override
             public boolean send(String message) {
                 return false;
             }
             @Override
-            public void receive(Consumer<NtfyMessageDto> messageHandler) { }
+            public void receive(Consumer<NtfyMessageDto> messageHandler) { } */
+            @Override
+            public void send(String message, Consumer<Boolean> callback){};  // ASYNKRONT
+            public void receive(Consumer<NtfyMessageDto> messageHandler){};
         };
         HelloModel model = new HelloModel(failingConn);
         model.setMessageToSend("Fail this message");
@@ -158,8 +161,8 @@ public void receive(Consumer<NtfyMessageDto> messageHandler) { }
             latch.countDown();
         });
 
-        boolean completed = latch.await(5, TimeUnit.SECONDS);
-        assertThat(completed).as("Timed out waiting for connection failure").isTrue();
+        //boolean completed = latch.await(5, TimeUnit.SECONDS);
+        //assertThat(completed).as("Timed out waiting for connection failure").isTrue();
         assertThat(wasSuccessful[0]).isFalse();
         assertThat(model.getMessageToSend()).isEqualTo("Fail this message");
     }
@@ -168,7 +171,7 @@ public void receive(Consumer<NtfyMessageDto> messageHandler) { }
     void shouldHandleExceptionsDuringSend() throws InterruptedException {
         NtfyConnection throwingConn = new NtfyConnection() {
             @Override
-            public boolean send(String message) {
+            public void send(String message, Consumer<Boolean> callback) {
                 throw new RuntimeException("Simulated crash");
             }
             @Override
diff --git a/src/test/java/com/example/NtfyConnectionSpy.java b/src/test/java/com/example/NtfyConnectionSpy.java
index 3945cc30..162bb612 100644
--- a/src/test/java/com/example/NtfyConnectionSpy.java
+++ b/src/test/java/com/example/NtfyConnectionSpy.java
@@ -3,23 +3,21 @@
 import java.util.function.Consumer;
 
 public class NtfyConnectionSpy implements NtfyConnection {
-    String message;
-    private Consumer<NtfyMessageDto> messageHandler;
+    public String message;
+    private Consumer<NtfyMessageDto> handler;
 
     @Override
-    public boolean send(String message) {
+    public void send(String message, Consumer<Boolean> callback) {
         this.message = message;
-        return true;
+        callback.accept(true);
     }
 
     @Override
-    public void receive(Consumer<NtfyMessageDto> messageHandler) {
-        this.messageHandler = messageHandler;
+    public void receive(Consumer<NtfyMessageDto> h) {
+        this.handler = h;
     }
 
     public void simulateIncoming(NtfyMessageDto msg) {
-        if (messageHandler != null) {
-            messageHandler.accept(msg);
-        }
+        if (handler != null) handler.accept(msg);
     }
 }
\ No newline at end of file

From 29fefae5c325608037f3ee10b89d6f918b4b0a1d Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 13 Nov 2025 20:34:49 +0100
Subject: [PATCH 18/21] =?UTF-8?q?trycatch=20runt=20send=20async=20s=C3=A5?=
 =?UTF-8?q?=20autograding=20inte=20h=C3=A4nger=20sig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/com/example/HelloModelTest.java | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index b3b36e27..2e23b9f4 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -140,15 +140,12 @@ void shouldFailWhenSendingNullMessage() throws InterruptedException {
     @Test
     void shouldReturnFailureWhenConnectionFails() throws InterruptedException {
         NtfyConnection failingConn = new NtfyConnection() {
-            /*@Override
-            public boolean send(String message) {
-                return false;
-            }
             @Override
-            public void receive(Consumer<NtfyMessageDto> messageHandler) { } */
+            public void send(String message, Consumer<Boolean> callback) {
+                callback.accept(false);
+            }
             @Override
-            public void send(String message, Consumer<Boolean> callback){};  // ASYNKRONT
-            public void receive(Consumer<NtfyMessageDto> messageHandler){};
+            public void receive(Consumer<NtfyMessageDto> messageHandler) { }
         };
         HelloModel model = new HelloModel(failingConn);
         model.setMessageToSend("Fail this message");
@@ -161,8 +158,8 @@ public void receive(Consumer<NtfyMessageDto> messageHandler) { } */
             latch.countDown();
         });
 
-        //boolean completed = latch.await(5, TimeUnit.SECONDS);
-        //assertThat(completed).as("Timed out waiting for connection failure").isTrue();
+        boolean completed = latch.await(5, TimeUnit.SECONDS);
+        assertThat(completed).as("Timed out waiting for connection failure").isTrue();
         assertThat(wasSuccessful[0]).isFalse();
         assertThat(model.getMessageToSend()).isEqualTo("Fail this message");
     }
@@ -183,10 +180,16 @@ public void receive(Consumer<NtfyMessageDto> messageHandler) { }
         CountDownLatch latch = new CountDownLatch(1);
         boolean[] wasSuccessful = new boolean[1];
 
-        model.sendMessageAsync(success -> {
-            wasSuccessful[0] = success;
+        //wrappa i try-catch för att fånga exception från connection
+        try {
+            model.sendMessageAsync(success -> {
+                wasSuccessful[0] = success;
+                latch.countDown();
+            });
+        } catch (Exception e) {
+            wasSuccessful[0] = false;
             latch.countDown();
-        });
+        }
 
         boolean completed = latch.await(5, TimeUnit.SECONDS);
         assertThat(completed).as("Timed out waiting for exception handling").isTrue();
@@ -291,7 +294,7 @@ void shouldRejectAllInvalidIncomingMessages() throws InterruptedException {
         assertThat(model.getMessages()).isEmpty();
     }
 
-    // integration test
+    //integration test
     @Test
     void shouldCommunicateWithMockedServer(WireMockRuntimeInfo wmInfo) throws InterruptedException {
         NtfyConnectionImpl connection = new NtfyConnectionImpl("http://localhost:" + wmInfo.getHttpPort());

From 4c8aaf93cd73255ed78ff8d9bb52fcfa0d83f0eb Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 13 Nov 2025 20:46:50 +0100
Subject: [PATCH 19/21] mocked server test

---
 src/test/java/com/example/HelloModelTest.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 2e23b9f4..afa0d155 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -297,12 +297,15 @@ void shouldRejectAllInvalidIncomingMessages() throws InterruptedException {
     //integration test
     @Test
     void shouldCommunicateWithMockedServer(WireMockRuntimeInfo wmInfo) throws InterruptedException {
+        stubFor(post("/mytopic").willReturn(ok()));
+        stubFor(get("/mytopic/json").willReturn(ok().withBody("")));
+
         NtfyConnectionImpl connection = new NtfyConnectionImpl("http://localhost:" + wmInfo.getHttpPort());
         HelloModel model = new HelloModel(connection);
-        model.setMessageToSend("Hello World");
 
-        stubFor(post("/mytopic").willReturn(ok()));
-        stubFor(get("/mytopic/json").willReturn(ok()));
+        Thread.sleep(100);
+
+        model.setMessageToSend("Hello World");
 
         CountDownLatch latch = new CountDownLatch(1);
         model.sendMessageAsync(success -> latch.countDown());
@@ -311,5 +314,4 @@ void shouldCommunicateWithMockedServer(WireMockRuntimeInfo wmInfo) throws Interr
         assertThat(completed).as("Timed out waiting for server communication").isTrue();
         verify(postRequestedFor(urlEqualTo("/mytopic"))
                 .withRequestBody(matching("Hello World")));
-    }
-}
\ No newline at end of file
+    }
\ No newline at end of file

From a73188280c4b6426c7f1bba4208569e1c25839a1 Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 13 Nov 2025 20:49:04 +0100
Subject: [PATCH 20/21] mocked server test

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

diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index afa0d155..791d860d 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -22,7 +22,8 @@ class HelloModelTest {
     static void setupJavaFX() {
         try {
             if (!Platform.isFxApplicationThread()) {
-                Platform.startup(() -> {});
+                Platform.startup(() -> {
+                });
             }
         } catch (IllegalStateException | UnsupportedOperationException e) {
             System.out.println("Headless environment detected – skipping JavaFX startup");
@@ -144,8 +145,10 @@ void shouldReturnFailureWhenConnectionFails() throws InterruptedException {
             public void send(String message, Consumer<Boolean> callback) {
                 callback.accept(false);
             }
+
             @Override
-            public void receive(Consumer<NtfyMessageDto> messageHandler) { }
+            public void receive(Consumer<NtfyMessageDto> messageHandler) {
+            }
         };
         HelloModel model = new HelloModel(failingConn);
         model.setMessageToSend("Fail this message");
@@ -171,8 +174,10 @@ void shouldHandleExceptionsDuringSend() throws InterruptedException {
             public void send(String message, Consumer<Boolean> callback) {
                 throw new RuntimeException("Simulated crash");
             }
+
             @Override
-            public void receive(Consumer<NtfyMessageDto> messageHandler) { }
+            public void receive(Consumer<NtfyMessageDto> messageHandler) {
+            }
         };
         HelloModel model = new HelloModel(throwingConn);
         model.setMessageToSend("Crash this");
@@ -314,4 +319,5 @@ void shouldCommunicateWithMockedServer(WireMockRuntimeInfo wmInfo) throws Interr
         assertThat(completed).as("Timed out waiting for server communication").isTrue();
         verify(postRequestedFor(urlEqualTo("/mytopic"))
                 .withRequestBody(matching("Hello World")));
-    }
\ No newline at end of file
+    }
+}
\ No newline at end of file

From e07b438eb5d6fc01b30ae4e8965eb8a15451f090 Mon Sep 17 00:00:00 2001
From: Rickard Ankar <rickard.ankar@iths.se>
Date: Thu, 13 Nov 2025 21:09:07 +0100
Subject: [PATCH 21/21] potentiell infine loop fix

---
 .../java/com/example/NtfyConnectionImpl.java  | 39 +++++++++++++------
 src/test/java/com/example/HelloModelTest.java |  4 +-
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/example/NtfyConnectionImpl.java b/src/main/java/com/example/NtfyConnectionImpl.java
index 5fac29eb..cb50582e 100644
--- a/src/main/java/com/example/NtfyConnectionImpl.java
+++ b/src/main/java/com/example/NtfyConnectionImpl.java
@@ -7,22 +7,29 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.time.Duration;
 import java.util.Objects;
 import java.util.function.Consumer;
 
 public class NtfyConnectionImpl implements NtfyConnection {
 
-    private final HttpClient http = HttpClient.newHttpClient();
+    private final HttpClient http;
     private final String hostName;
     private final ObjectMapper mapper = new ObjectMapper();
 
     public NtfyConnectionImpl() {
         Dotenv dotenv = Dotenv.load();
         hostName = Objects.requireNonNull(dotenv.get("HOST_NAME"));
+        this.http = HttpClient.newBuilder()
+                .connectTimeout(Duration.ofSeconds(10))
+                .build();
     }
 
     public NtfyConnectionImpl(String hostName) {
         this.hostName = hostName;
+        this.http = HttpClient.newBuilder()
+                .connectTimeout(Duration.ofSeconds(5))
+                .build();
     }
 
     @Override
@@ -31,6 +38,7 @@ public void send(String message, Consumer<Boolean> callback) {
                 .POST(HttpRequest.BodyPublishers.ofString(message))
                 .uri(URI.create(hostName + "/mytopic"))
                 .header("Cache", "no")
+                .timeout(Duration.ofSeconds(10))  //request timeout
                 .build();
 
         http.sendAsync(request, HttpResponse.BodyHandlers.discarding())
@@ -50,20 +58,27 @@ public void receive(Consumer<NtfyMessageDto> messageHandler) {
         HttpRequest request = HttpRequest.newBuilder()
                 .GET()
                 .uri(URI.create(hostName + "/mytopic/json"))
+                .timeout(Duration.ofSeconds(30))  //timeout för receive
                 .build();
 
         http.sendAsync(request, HttpResponse.BodyHandlers.ofLines())
-                .thenAccept(response -> response.body()
-                        .map(line -> {
-                            try {
-                                return mapper.readValue(line, NtfyMessageDto.class);
-                            } catch (Exception e) {
-                                System.err.println("Failed to parse message: " + line);
-                                return null;
-                            }
-                        })
-                        .filter(Objects::nonNull)
-                        .forEach(messageHandler))
+                .thenAccept(response -> {
+                    try {
+                        response.body()
+                                .map(line -> {
+                                    try {
+                                        return mapper.readValue(line, NtfyMessageDto.class);
+                                    } catch (Exception e) {
+                                        System.err.println("Failed to parse message: " + line);
+                                        return null;
+                                    }
+                                })
+                                .filter(Objects::nonNull)
+                                .forEach(messageHandler);
+                    } catch (Exception e) {
+                        System.err.println("Stream processing error: " + e.getMessage());
+                    }
+                })
                 .exceptionally(ex -> {
                     System.err.println("Error receiving messages: " + ex.getMessage());
                     return null;
diff --git a/src/test/java/com/example/HelloModelTest.java b/src/test/java/com/example/HelloModelTest.java
index 791d860d..999e6f91 100644
--- a/src/test/java/com/example/HelloModelTest.java
+++ b/src/test/java/com/example/HelloModelTest.java
@@ -145,10 +145,8 @@ void shouldReturnFailureWhenConnectionFails() throws InterruptedException {
             public void send(String message, Consumer<Boolean> callback) {
                 callback.accept(false);
             }
-
             @Override
-            public void receive(Consumer<NtfyMessageDto> messageHandler) {
-            }
+            public void receive(Consumer<NtfyMessageDto> messageHandler) { }
         };
         HelloModel model = new HelloModel(failingConn);
         model.setMessageToSend("Fail this message");