Author: kono
Date: 2012-04-19 17:52:41 -0700 (Thu, 19 Apr 2012)
New Revision: 28894
Added:
core3/api/trunk/swing-application-api/src/test/
core3/api/trunk/swing-application-api/src/test/java/
core3/api/trunk/swing-application-api/src/test/java/org/
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AcceleratorParserTest.java
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CyMenuItemTest.java
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CytoPanelNameTest.java
Modified:
core3/api/trunk/swing-application-api/pom.xml
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CyMenuItem.java
Log:
refs #868 New unit tests had been added to swing-application-api.
Modified: core3/api/trunk/swing-application-api/pom.xml
===================================================================
--- core3/api/trunk/swing-application-api/pom.xml 2012-04-20 00:41:04 UTC
(rev 28893)
+++ core3/api/trunk/swing-application-api/pom.xml 2012-04-20 00:52:41 UTC
(rev 28894)
@@ -90,5 +90,16 @@
<version>${project.version}</version>
</dependency>
+ <!-- Testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CyMenuItem.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CyMenuItem.java
2012-04-20 00:41:04 UTC (rev 28893)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/CyMenuItem.java
2012-04-20 00:52:41 UTC (rev 28894)
@@ -1,5 +1,3 @@
-
-
/*
File: CyMenuItem.java
@@ -52,6 +50,7 @@
/**
* Constructor.
+ *
* @param menuItem to JMenuItem to be added to the menu.
* @param gravity the gravity of the menu item to be added.
*/
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AcceleratorParserTest.java
===================================================================
---
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AcceleratorParserTest.java
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AcceleratorParserTest.java
2012-04-20 00:52:41 UTC (rev 28894)
@@ -0,0 +1,21 @@
+package org.cytoscape.application.swing;
+
+import static org.junit.Assert.*;
+
+import javax.swing.KeyStroke;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AcceleratorParserTest {
+
+ @Test
+ public void testParse() {
+ final KeyStroke shortCut1 = AcceleratorParser.parse("cmd s");
+
+ assertNotNull(shortCut1);
+ //assertEquals("aaa", shortCut1.toString());
+ }
+
+}
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CyMenuItemTest.java
===================================================================
---
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CyMenuItemTest.java
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CyMenuItemTest.java
2012-04-20 00:52:41 UTC (rev 28894)
@@ -0,0 +1,39 @@
+package org.cytoscape.application.swing;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import javax.swing.JMenuItem;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class CyMenuItemTest {
+
+ private CyMenuItem menuItem;
+
+ private JMenuItem item = new JMenuItem("Test");
+ private float gravity = 10;
+
+ @Before
+ public void setUp() throws Exception {
+ menuItem = new CyMenuItem(item, gravity);
+ }
+
+ @Test
+ public void testCyMenuItem() {
+ assertNotNull(menuItem);
+ }
+
+ @Test
+ public void testGetMenuItem() {
+ assertEquals(item, menuItem.getMenuItem());
+ }
+
+ @Test
+ public void testGetMenuGravity() {
+ assertTrue(gravity == menuItem.getMenuGravity());
+ }
+
+}
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CytoPanelNameTest.java
===================================================================
---
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CytoPanelNameTest.java
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CytoPanelNameTest.java
2012-04-20 00:52:41 UTC (rev 28894)
@@ -0,0 +1,25 @@
+package org.cytoscape.application.swing;
+
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CytoPanelNameTest {
+
+
+
+ @Test
+ public void testGetTitle() {
+ assertEquals("Table Panel", CytoPanelName.SOUTH.getTitle());
+ assertEquals("Tool Panel", CytoPanelName.SOUTH_WEST.getTitle());
+ assertEquals("Results Panel", CytoPanelName.EAST.getTitle());
+ assertEquals("Control Panel", CytoPanelName.WEST.getTitle());
+ }
+
+ @Test
+ public void checkNumber() {
+ assertEquals(4, CytoPanelName.values().length);
+ }
+}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
