Merge branch 'Test/common' into 'master'

Add/package in client to make code coverage clearer.

See merge request cse1105/2018-2019/oopp-group-43/template!94
This commit is contained in:
Merel Steenbergen
2019-04-15 12:40:21 +00:00
6 changed files with 27 additions and 6 deletions

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package greenify.client;
package greenify.client.features;
import javafx.beans.property.SimpleDoubleProperty;
import javafx.beans.property.SimpleIntegerProperty;

View File

@@ -1,4 +1,4 @@
package greenify.client;
package greenify.client.features;
import java.util.ArrayList;
import java.util.Random;

View File

@@ -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;

View File

@@ -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 {

View File

@@ -0,0 +1,21 @@
import static org.junit.Assert.assertEquals;
import greenify.common.ApplicationException;
import org.junit.Test;
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());
}
}