From f1b825ab872e341b077ccb45a68b01ca71fda257 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 18 Mar 2019 11:11:28 +0100
Subject: [PATCH] unit tests for InfoFrame
---
.../mapviewer/cdplugin/info/InfoFrame.java | 13 ++++---
.../mapviewer/cdplugin/AllCdPluginTests.java | 4 ++-
.../mapviewer/cdplugin/CdPluginFunctions.java | 2 +-
.../mapviewer/cdplugin/info/AllInfoTests.java | 11 ++++++
.../cdplugin/info/InfoFrameTest.java | 36 +++++++++++++++++++
5 files changed, 60 insertions(+), 6 deletions(-)
create mode 100644 CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/info/AllInfoTests.java
create mode 100644 CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/info/InfoFrameTest.java
diff --git a/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/info/InfoFrame.java b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/info/InfoFrame.java
index 161cc2f346..c1ed38a65d 100644
--- a/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/info/InfoFrame.java
+++ b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/info/InfoFrame.java
@@ -7,6 +7,7 @@ import java.awt.Font;
import java.awt.GridLayout;
import java.awt.Toolkit;
import java.util.ArrayList;
+import java.util.List;
import javax.swing.Box;
import javax.swing.BoxLayout;
@@ -22,7 +23,7 @@ import org.apache.log4j.Logger;
import jp.sbi.celldesigner.plugin.PluginSpeciesAlias;
/**
- * This class represent a frame that visualise MIRIAM data and notes for a
+ * This class represent a frame that visualize MIRIAM data and notes for a
* species. Only one instance of JFrame is stored in the class (only one window
* of this type can be created).
*
@@ -65,7 +66,7 @@ public final class InfoFrame {
* Default class logger.
*/
@SuppressWarnings("unused")
- private final Logger logger = Logger.getLogger(InfoFrame.class.getName());
+ private final Logger logger = Logger.getLogger(InfoFrame.class);
/**
* Instance of the JFrame representation of windows.
@@ -86,7 +87,7 @@ public final class InfoFrame {
/**
* List of selected aliases.
*/
- private ArrayList<PluginSpeciesAlias> species = new ArrayList<PluginSpeciesAlias>();
+ private List<PluginSpeciesAlias> species = new ArrayList<>();
/**
* Default constructor.
@@ -145,7 +146,7 @@ public final class InfoFrame {
* @param species
* - species to be shown in the form
*/
- public void setSpecies(ArrayList<PluginSpeciesAlias> species) {
+ public void setSpecies(List<PluginSpeciesAlias> species) {
this.species = species;
updateSpecies();
}
@@ -270,4 +271,8 @@ public final class InfoFrame {
frame.setAlwaysOnTop(always);
}
+ public List<PluginSpeciesAlias> getSpecies() {
+ return species;
+ }
+
}
diff --git a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/AllCdPluginTests.java b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/AllCdPluginTests.java
index f1235c0a0f..7e4c879930 100644
--- a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/AllCdPluginTests.java
+++ b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/AllCdPluginTests.java
@@ -5,9 +5,11 @@ import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
import lcsb.mapviewer.cdplugin.copypaste.AllCopyPasteTests;
+import lcsb.mapviewer.cdplugin.info.AllInfoTests;
@RunWith(Suite.class)
-@SuiteClasses({ AllCopyPasteTests.class })
+@SuiteClasses({ AllCopyPasteTests.class,
+ AllInfoTests.class })
public class AllCdPluginTests {
}
diff --git a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/CdPluginFunctions.java b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/CdPluginFunctions.java
index 381af8d102..778b0f0714 100644
--- a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/CdPluginFunctions.java
+++ b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/CdPluginFunctions.java
@@ -75,7 +75,7 @@ public class CdPluginFunctions {
return list;
}
- private PluginSpeciesAlias createSpeciesAlias(String id) {
+ protected PluginSpeciesAlias createSpeciesAlias(String id) {
PluginSpecies species = Mockito.mock(PluginSpecies.class);
Mockito.when(species.getId()).thenReturn(id);
Mockito.when(species.getAnnotationString()).thenReturn(rdfString);
diff --git a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/info/AllInfoTests.java b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/info/AllInfoTests.java
new file mode 100644
index 0000000000..c1283ace00
--- /dev/null
+++ b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/info/AllInfoTests.java
@@ -0,0 +1,11 @@
+package lcsb.mapviewer.cdplugin.info;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({ InfoFrameTest.class })
+public class AllInfoTests {
+
+}
diff --git a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/info/InfoFrameTest.java b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/info/InfoFrameTest.java
new file mode 100644
index 0000000000..51d3a14e63
--- /dev/null
+++ b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/info/InfoFrameTest.java
@@ -0,0 +1,36 @@
+package lcsb.mapviewer.cdplugin.info;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.swing.JScrollPane;
+
+import org.apache.log4j.Logger;
+import org.junit.Test;
+
+import jp.sbi.celldesigner.plugin.PluginSpeciesAlias;
+import lcsb.mapviewer.cdplugin.CdPluginFunctions;
+
+public class InfoFrameTest extends CdPluginFunctions{
+ Logger logger = Logger.getLogger(InfoFrameTest .class);
+
+ @Test
+ public void testSetEmptySpeciesList() {
+ InfoFrame frame = InfoFrame.getInstance();
+ List<PluginSpeciesAlias> list = new ArrayList<>();
+ frame.setSpecies(list);
+ assertEquals(list, frame.getSpecies());
+ }
+
+ @Test
+ public void testSetNotEmptySpeciesList() {
+ InfoFrame frame = InfoFrame.getInstance();
+ frame.setSpecies(Arrays.asList(super.createSpeciesAlias("id"), super.createSpeciesAlias("id2")));
+ assertEquals(2, frame.getSpecies().size());
+ }
+
+
+}
--
GitLab