upgraded to jupiter based

src/test/java/CalculatorResourceTest.java

-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import resources.CalculatorResource;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CalculatorResourceTest{
 

src/test/java/MessageDAOTest.java

@@ -4,11 +4,12 @@ import data.Message;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.glassfish.jersey.test.TestProperties;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 
 import jakarta.ws.rs.core.Application;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -16,8 +17,9 @@ import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.*;
-
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 public class MessageDAOTest extends JerseyTest {
     private Connection connection;
@@ -25,7 +27,7 @@ public class MessageDAOTest extends JerseyTest {
     private Statement statement;
     private int user1 = 1, user2 = 2;
 
-    @Before
+    @BeforeEach
     public void SetUp () {
         try{
             connection = Database.instance().getConnection();
@@ -131,7 +133,7 @@ public class MessageDAOTest extends JerseyTest {
         }
     }
 
-    @After
+    @AfterEach
     public void tearDown () {
         try {
             messageDAO = null;
@@ -186,8 +188,8 @@ public class MessageDAOTest extends JerseyTest {
         List<String> afterNewMessage = new ArrayList<>();
         for (Message message1 : messageList) afterNewMessage.add(message1.getMessageContent());
 
-        assertNotEquals("Should not be equal, adding new message to list",beforeNewMessage.size(),afterNewMessage.size());
-        assertEquals("Should be equal",expectedMessage,actualMessage);
+        assertNotEquals(beforeNewMessage.size(),afterNewMessage.size());
+        assertEquals(expectedMessage,actualMessage);
 
     }
 }
\ No newline at end of file

src/test/java/MessageResourceTest.java

@@ -47,7 +47,7 @@ public class MessageResourceTest extends JerseyTest {
         message.setMessageContent("Testing newMessage method");
         Response output = target("message").request().post(Entity.entity(message, MediaType.APPLICATION_JSON_TYPE));
 
-        assertEquals("Should return status 200",200,output.getStatus());
+        assertEquals(200,output.getStatus());
         assertEquals("Testing newMessage method",message.getMessageContent());
         assertEquals("application/json",output.getHeaderString("Content-type"));
     }

src/test/java/UserDAOTest.java

@@ -4,25 +4,27 @@ import data.User;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.glassfish.jersey.test.TestProperties;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 
 import jakarta.ws.rs.core.Application;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+
 
 public class UserDAOTest extends JerseyTest {
     private Connection connection;
     private Statement statement;
     private UserDAO userDAO;
 
-    @Before
+    @BeforeEach
     public void SetUp () {
         try {
             connection = Database.instance().getConnection();
@@ -132,7 +134,7 @@ public class UserDAOTest extends JerseyTest {
         }
     }
 
-    @After
+    @AfterEach
     public void tearDown () {
         try {
             userDAO = null;

src/test/java/UserResourceTest.java

@@ -3,7 +3,7 @@ import data.User;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.test.JerseyTest;
 import org.glassfish.jersey.test.TestProperties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import resources.UserResource;
 
 import jakarta.ws.rs.client.Entity;