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:
@@ -2,8 +2,8 @@ package greenify.client.controller;
|
|||||||
|
|
||||||
import com.sun.javafx.scene.control.skin.ButtonSkin;
|
import com.sun.javafx.scene.control.skin.ButtonSkin;
|
||||||
import greenify.client.Application;
|
import greenify.client.Application;
|
||||||
import greenify.client.Friend;
|
import greenify.client.features.Friend;
|
||||||
import greenify.client.Hints;
|
import greenify.client.features.Hints;
|
||||||
import greenify.client.rest.UserService;
|
import greenify.client.rest.UserService;
|
||||||
import javafx.animation.FadeTransition;
|
import javafx.animation.FadeTransition;
|
||||||
import javafx.animation.KeyFrame;
|
import javafx.animation.KeyFrame;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package greenify.client;
|
package greenify.client.features;
|
||||||
|
|
||||||
import javafx.beans.property.SimpleDoubleProperty;
|
import javafx.beans.property.SimpleDoubleProperty;
|
||||||
import javafx.beans.property.SimpleIntegerProperty;
|
import javafx.beans.property.SimpleIntegerProperty;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package greenify.client;
|
package greenify.client.features;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
|
|
||||||
import greenify.client.Friend;
|
import greenify.client.features.Friend;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.jupiter.api.Assertions;
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import static junit.framework.TestCase.assertTrue;
|
|||||||
import static org.junit.Assert.assertFalse;
|
import static org.junit.Assert.assertFalse;
|
||||||
import static org.junit.Assert.assertNotNull;
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
|
||||||
import greenify.client.Hints;
|
import greenify.client.features.Hints;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class HintsTest {
|
public class HintsTest {
|
||||||
|
|||||||
21
src/Common/src/test/java/ApplicationExceptionTest.java
Normal file
21
src/Common/src/test/java/ApplicationExceptionTest.java
Normal 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());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user