diff --git a/model/src/test/java/lcsb/mapviewer/model/ProjectTest.java b/model/src/test/java/lcsb/mapviewer/model/ProjectTest.java index ec95a2738e445d55b50cba9db379c214ccaa0ce5..7684abc5e90ca6821b03605c4e535f8025ed748f 100644 --- a/model/src/test/java/lcsb/mapviewer/model/ProjectTest.java +++ b/model/src/test/java/lcsb/mapviewer/model/ProjectTest.java @@ -91,7 +91,11 @@ public class ProjectTest { String name = "name3"; MiriamData disease = new MiriamData(); Project project = new Project("str"); + boolean sbgn = true; + project.setSbgnFormat(sbgn); + assertEquals(sbgn, project.isSbgnFormat()); + project.setId(id); assertEquals(id, project.getId()); diff --git a/model/src/test/java/lcsb/mapviewer/model/user/AllUserTests.java b/model/src/test/java/lcsb/mapviewer/model/user/AllUserTests.java index 783660efd184799364df0ace810dd3ac289621f2..db80b08b4f362a82d3c1d755f5badaa0527c71ed 100644 --- a/model/src/test/java/lcsb/mapviewer/model/user/AllUserTests.java +++ b/model/src/test/java/lcsb/mapviewer/model/user/AllUserTests.java @@ -6,7 +6,8 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) @SuiteClasses({ BasicPrivilegeTest.class, // - ConfigurationElementTypeTest.class, // + ConfigurationElementTypeTest.class, // + ConfigurationElementEditTypeTest.class, // ConfigurationTest.class, // ObjectPrivilegeTest.class, // PrivilegeTypeTest.class, // diff --git a/model/src/test/java/lcsb/mapviewer/model/user/ConfigurationElementEditTypeTest.java b/model/src/test/java/lcsb/mapviewer/model/user/ConfigurationElementEditTypeTest.java new file mode 100644 index 0000000000000000000000000000000000000000..839105c1d0e2c89e2a58b05a55adfb3626b5ce95 --- /dev/null +++ b/model/src/test/java/lcsb/mapviewer/model/user/ConfigurationElementEditTypeTest.java @@ -0,0 +1,31 @@ +package lcsb.mapviewer.model.user; + +import static org.junit.Assert.*; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.Test; + +public class ConfigurationElementEditTypeTest { + + @AfterClass + public static void tearDownAfterClass() throws Exception { + } + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void testValues() { + for (ConfigurationElementEditType type: ConfigurationElementEditType.values()){ + assertNotNull(ConfigurationElementEditType.valueOf(type.toString())); + } + } + +} diff --git a/model/src/test/java/lcsb/mapviewer/model/user/ConfigurationElementTypeTest.java b/model/src/test/java/lcsb/mapviewer/model/user/ConfigurationElementTypeTest.java index 1f34d76b0d1053262fb2ad02fa498ed2556154fe..0624e5daf6196904e66f0e86600cf6a45619d95e 100644 --- a/model/src/test/java/lcsb/mapviewer/model/user/ConfigurationElementTypeTest.java +++ b/model/src/test/java/lcsb/mapviewer/model/user/ConfigurationElementTypeTest.java @@ -25,6 +25,7 @@ public class ConfigurationElementTypeTest { ConfigurationElementType.valueOf(type.toString()); assertNotNull(type.getCommonName()); assertNotNull(type.getDefaultValue()); + assertNotNull(type.getEditType()); } } } diff --git a/model/src/test/java/lcsb/mapviewer/model/user/UserTest.java b/model/src/test/java/lcsb/mapviewer/model/user/UserTest.java index 2de8a4b7d3f3e30eff523ebbaf915432a84e9685..e2638d3efa8bde5c269350606c7f5815e7c5d69b 100644 --- a/model/src/test/java/lcsb/mapviewer/model/user/UserTest.java +++ b/model/src/test/java/lcsb/mapviewer/model/user/UserTest.java @@ -3,6 +3,7 @@ package lcsb.mapviewer.model.user; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import java.awt.Color; import java.util.HashSet; import java.util.Set; @@ -66,7 +67,15 @@ public class UserTest { Set<BasicPrivilege> privileges = new HashSet<>(); boolean removed = true; UserAnnotationSchema annotationSchema = new UserAnnotationSchema(); + Color minColor = Color.BLACK; + Color maxColor = Color.BLUE; + user.setMaxColor(maxColor); + assertEquals(maxColor, user.getMaxColor()); + + user.setMinColor(minColor); + assertEquals(minColor, user.getMinColor()); + user.setId(id); assertEquals((Integer)id, user.getId());