Author: kono
Date: 2012-04-20 17:03:12 -0700 (Fri, 20 Apr 2012)
New Revision: 28940

Added:
   
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AlwaysEnabledEnableSupportTest.java
Modified:
   
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CyActionTest.java
Log:
fixes #868 New unit tests had been added to swing-application-api.

Added: 
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AlwaysEnabledEnableSupportTest.java
===================================================================
--- 
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AlwaysEnabledEnableSupportTest.java
                             (rev 0)
+++ 
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AlwaysEnabledEnableSupportTest.java
     2012-04-21 00:03:12 UTC (rev 28940)
@@ -0,0 +1,46 @@
+package org.cytoscape.application.swing;
+
+import static org.junit.Assert.*;
+
+import javax.swing.Action;
+import javax.swing.JMenuItem;
+
+import org.cytoscape.work.swing.DynamicSubmenuListener;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class AlwaysEnabledEnableSupportTest {
+       
+       private AlwaysEnabledEnableSupport support;
+       
+       @Mock private DynamicSubmenuListener submenuListener;
+       @Mock private Action action;
+
+       @Before
+       public void setUp() throws Exception {
+               MockitoAnnotations.initMocks(this);
+               support = new AlwaysEnabledEnableSupport(action);
+       }
+
+
+       @Test
+       public void testUpdateEnableState() {
+               support.setEnabled(false);
+               assertFalse(support.isCurrentlyEnabled());
+               support.updateEnableState();
+               assertTrue(support.isCurrentlyEnabled());
+       }
+
+       @Test
+       public void testAlwaysEnabledEnableSupportConstructor() {
+               support = new AlwaysEnabledEnableSupport(action);
+               assertNotNull(support);
+               support = new AlwaysEnabledEnableSupport(submenuListener);
+               assertNotNull(support);
+               support = new AlwaysEnabledEnableSupport(new JMenuItem());
+               assertNotNull(support);
+       }
+}

Modified: 
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CyActionTest.java
===================================================================
--- 
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CyActionTest.java
       2012-04-20 23:53:11 UTC (rev 28939)
+++ 
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CyActionTest.java
       2012-04-21 00:03:12 UTC (rev 28940)
@@ -7,6 +7,7 @@
 
 import org.cytoscape.application.CyApplicationManager;
 import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.work.ServiceProperties;
 import org.cytoscape.work.TaskFactory;
 import org.junit.After;
 import org.junit.Before;
@@ -21,6 +22,20 @@
        public void setUp() throws Exception {
                MockitoAnnotations.initMocks(this);
 
+               configProps.put(ServiceProperties.PREFERRED_MENU, "File");
+               configProps.put(ServiceProperties.ACCELERATOR, "cmd s");
+               configProps.put(ServiceProperties.COMMAND, "test");
+               configProps.put(ServiceProperties.COMMAND_NAMESPACE, "dummy");
+               configProps.put(ServiceProperties.ENABLE_FOR, 
StringEnableSupport.ENABLE_FOR_NETWORK);
+               configProps.put(ServiceProperties.ID, "dummyAction");
+               configProps.put(ServiceProperties.IN_MENU_BAR, "true");
+               configProps.put(ServiceProperties.IN_TOOL_BAR, "false");
+               configProps.put(ServiceProperties.LARGE_ICON_URL, "test.png");
+               configProps.put(ServiceProperties.SMALL_ICON_URL, "small.png");
+               configProps.put(ServiceProperties.MENU_GRAVITY, "10.0");
+               configProps.put(ServiceProperties.TITLE, "Dummy Cy Action");
+               configProps.put(ServiceProperties.TOOL_BAR_GRAVITY, "200");
+               configProps.put(ServiceProperties.TOOLTIP, "This is a dummy 
action.");
                action = new DummyAction(configProps, applicationManager, 
networkViewManager);
                action.setName(name);
        }

-- 
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.

Reply via email to