From a44907865c8f04ccaa87140682f3f0d3c3774c66 Mon Sep 17 00:00:00 2001 From: Merel Steenbergen Date: Mon, 15 Apr 2019 14:16:18 +0200 Subject: [PATCH 1/3] ADD:: Test for ApplicationException. --- .../test/java/ApplicationExceptionTest.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/Common/src/test/java/ApplicationExceptionTest.java diff --git a/src/Common/src/test/java/ApplicationExceptionTest.java b/src/Common/src/test/java/ApplicationExceptionTest.java new file mode 100644 index 0000000..b24a343 --- /dev/null +++ b/src/Common/src/test/java/ApplicationExceptionTest.java @@ -0,0 +1,22 @@ +import greenify.common.ApplicationException; +import greenify.common.ErrorResponse; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class ApplicationExceptionTest { + + @Test + public void setAndGetTest() { + ApplicationException ex = new ApplicationException("This is an exception"); + assertEquals(ex.getMessage(), "This is an exception"); + } + + @Test + public void equalsTest() { + ApplicationException ex = new ApplicationException("This is an exception"); + ApplicationException test = new ApplicationException("This is an exception"); + assertEquals(ex.getMessage(), test.getMessage()); + } + +} From f31449508e9cb8777ab0dae2d630f0a06c0f1940 Mon Sep 17 00:00:00 2001 From: Merel Steenbergen Date: Mon, 15 Apr 2019 14:24:20 +0200 Subject: [PATCH 2/3] ADD::Package for features to make test coverage clearer --- .../java/greenify/client/controller/DashBoardController.java | 4 ++-- .../src/main/java/greenify/client/{ => features}/Friend.java | 2 +- .../src/main/java/greenify/client/{ => features}/Hints.java | 2 +- src/Client/src/test/java/FriendTest.java | 2 +- src/Client/src/test/java/HintsTest.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename src/Client/src/main/java/greenify/client/{ => features}/Friend.java (97%) rename src/Client/src/main/java/greenify/client/{ => features}/Hints.java (99%) diff --git a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java index 1565bf1..f275456 100644 --- a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java +++ b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java @@ -2,8 +2,8 @@ package greenify.client.controller; import com.sun.javafx.scene.control.skin.ButtonSkin; import greenify.client.Application; -import greenify.client.Friend; -import greenify.client.Hints; +import greenify.client.features.Friend; +import greenify.client.features.Hints; import greenify.client.rest.UserService; import javafx.animation.FadeTransition; import javafx.animation.KeyFrame; diff --git a/src/Client/src/main/java/greenify/client/Friend.java b/src/Client/src/main/java/greenify/client/features/Friend.java similarity index 97% rename from src/Client/src/main/java/greenify/client/Friend.java rename to src/Client/src/main/java/greenify/client/features/Friend.java index 0ec4bf4..e3d0018 100644 --- a/src/Client/src/main/java/greenify/client/Friend.java +++ b/src/Client/src/main/java/greenify/client/features/Friend.java @@ -1,4 +1,4 @@ -package greenify.client; +package greenify.client.features; import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.property.SimpleIntegerProperty; diff --git a/src/Client/src/main/java/greenify/client/Hints.java b/src/Client/src/main/java/greenify/client/features/Hints.java similarity index 99% rename from src/Client/src/main/java/greenify/client/Hints.java rename to src/Client/src/main/java/greenify/client/features/Hints.java index cc7f053..b88021d 100644 --- a/src/Client/src/main/java/greenify/client/Hints.java +++ b/src/Client/src/main/java/greenify/client/features/Hints.java @@ -1,4 +1,4 @@ -package greenify.client; +package greenify.client.features; import java.util.ArrayList; import java.util.Random; diff --git a/src/Client/src/test/java/FriendTest.java b/src/Client/src/test/java/FriendTest.java index 15cd2f9..32abeb1 100644 --- a/src/Client/src/test/java/FriendTest.java +++ b/src/Client/src/test/java/FriendTest.java @@ -1,6 +1,6 @@ import static org.junit.Assert.assertEquals; -import greenify.client.Friend; +import greenify.client.features.Friend; import org.junit.Test; import org.junit.jupiter.api.Assertions; diff --git a/src/Client/src/test/java/HintsTest.java b/src/Client/src/test/java/HintsTest.java index 5964852..b4d637e 100644 --- a/src/Client/src/test/java/HintsTest.java +++ b/src/Client/src/test/java/HintsTest.java @@ -2,7 +2,7 @@ import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import greenify.client.Hints; +import greenify.client.features.Hints; import org.junit.Test; public class HintsTest { From 6faa5edd57d2636aba4e8ece9d6335745d823aeb Mon Sep 17 00:00:00 2001 From: Merel Steenbergen Date: Mon, 15 Apr 2019 12:38:57 +0000 Subject: [PATCH 3/3] FIX::Checkstyle error.java --- src/Common/src/test/java/ApplicationExceptionTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Common/src/test/java/ApplicationExceptionTest.java b/src/Common/src/test/java/ApplicationExceptionTest.java index b24a343..82020e7 100644 --- a/src/Common/src/test/java/ApplicationExceptionTest.java +++ b/src/Common/src/test/java/ApplicationExceptionTest.java @@ -1,9 +1,8 @@ -import greenify.common.ApplicationException; -import greenify.common.ErrorResponse; -import org.junit.Test; - import static org.junit.Assert.assertEquals; +import greenify.common.ApplicationException; +import org.junit.Test; + public class ApplicationExceptionTest { @Test