diff --git a/src/test/java/CalculatorResourceTest.java b/src/test/java/CalculatorResourceTest.java index 84e068075c666421346c0387c845343fc0b0b1be..d96c4b97d6f9a8d8229877be26cf98aaf2a4c91d 100644 --- a/src/test/java/CalculatorResourceTest.java +++ b/src/test/java/CalculatorResourceTest.java @@ -1,7 +1,7 @@ -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{ diff --git a/src/test/java/MessageDAOTest.java b/src/test/java/MessageDAOTest.java index 2e430cd02bb2f2cd19a13b51dd7f91c40ebc4023..ddec2fcef0a0c3a2c51c2b94aa5828af40557d72 100644 --- a/src/test/java/MessageDAOTest.java +++ b/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 diff --git a/src/test/java/MessageResourceTest.java b/src/test/java/MessageResourceTest.java index e872a7d79af6e735c0806470215069c3face759a..6ff1ae69d2a8079582c411b7e7257d3e843bd424 100644 --- a/src/test/java/MessageResourceTest.java +++ b/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")); } diff --git a/src/test/java/UserDAOTest.java b/src/test/java/UserDAOTest.java index 2c8f49c32a610973e7fc99be92091cfb1de439e3..e025ec42f7e30aa6e335c90931f2ef96ade91d9f 100644 --- a/src/test/java/UserDAOTest.java +++ b/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; diff --git a/src/test/java/UserResourceTest.java b/src/test/java/UserResourceTest.java index 490a30b1cfa2bf8051cca1e732db84ac6fd9df37..d29738327d118b3b8d7962b8bd4489944c339295 100644 --- a/src/test/java/UserResourceTest.java +++ b/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;