more changes in tests and style

Author: fredrikmohlen

pom.xml

@@ -61,6 +61,12 @@
             <version>4.0.0-beta.15</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.3.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/resources/css/style.css

@@ -7,6 +7,7 @@ styles.css
     -fx-background-color: #ffffff, linear-gradient(to bottom, #8b0000, #ffd700);
     -fx-background-insets: 0, 5;
     -fx-background-radius: 0, 10;
+
 }
 /*.list-view{*/
 /*    -fx-background-color: linear-gradient(to bottom, #8b0000, #ffd700);*/
@@ -30,7 +31,6 @@ styles.css
     -fx-background-color: #e0e0e0;
     -fx-text-fill: #000000;
 }
-
 /* ------------------------------------------------------------------- */
 /* 3. STYLA DEN MARKERADE CELLEN (SELECTED) */
 /* ------------------------------------------------------------------- */
@@ -48,10 +48,15 @@ styles.css
     -fx-font-weight: bold;
 }
 .text-area{
-    -fx-padding: 10px 20px;
+    -fx-padding: 5px 7px;
     -fx-text-fill: black;
-    -fx-border-color: #ffd700 #ffd700 #ffd700;
+    -fx-font-size: 14;
+    -fx-border: 1px solid #ccc;
+    -fx-border-radius: 8px;
+    -fx-background-color: transparent;
+    -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.2), 5, 0, 0, 0);
 }
+.text-area:focus {}
 .button{
     -fx-background-color: #007bff;
     -fx-text-fill: white;

src/test/java/com/example/HelloModelTest.java

@@ -9,7 +9,9 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.awaitility.Awaitility;
 
+import java.time.Duration;
 import java.util.concurrent.ExecutionException;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
@@ -70,34 +72,37 @@ void checkReceivedMessagesAfterSendingAMessageToServer() throws InterruptedExcep
         model.setMessageToSend("Hello World");
         //Act - When
 
-        model.sendMessage();
-
-        model.receiveMessage();
-
-        Thread.sleep(1000);
+        model.sendMessage().join();
 
-        var messageList = model.getMessages();
         //Assert
-        assertThat(messageList).extracting(NtfyMessageDto::message).contains("Hello World");
+        Awaitility.await()
+                .atMost(Duration.ofSeconds(5))
+                .pollInterval(Duration.ofMillis(100))
+                .untilAsserted(() -> {
+                    assertThat(model.getMessages()).isNotEmpty();
+                    assertThat(model.getMessages().getLast().message()).contains("Hello World");
+                });
     }
 
     @Test
     void checkReceivedMessagesAfterSendingAMessageToAFakeServer(WireMockRuntimeInfo wmRunTimeInfo) throws InterruptedException {
         // Arrange
         var conImp = new NtfyConnectionImpl("http://localhost:" + wmRunTimeInfo.getHttpPort());
 
-        //stubFor(get("/mytopic/json").willReturn(ok("{\"message\":\"hej\"}")));
         stubFor(get("/mytopic/json")
                 .willReturn(aResponse()
                         .withHeader("Content-type", "application/json")
                         .withBody("{\"event\": \"message\",\"message\": \"Hello World\", \"time\": \"12314244\"}")));
 
         var model = new HelloModel(conImp);
 
-        Thread.sleep(1000);
-
-        assertThat(model.getMessages().getLast().message()).isEqualTo("Hello World");
-
+        Awaitility.await()
+                .atMost(Duration.ofSeconds(4))
+                .pollInterval(Duration.ofMillis(100)) // Kolla var 100:e ms
+                .untilAsserted(() -> {
+                    assertThat(model.getMessages()).isNotEmpty();
+                    assertThat(model.getMessages().getLast().message()).isEqualTo("Hello World");
+                });
     }
 
     // Test som skickar in ett fake:at meddelande via record och kollar att meddelandet finns i observablelistan