Author: kono
Date: 2012-04-20 16:05:34 -0700 (Fri, 20 Apr 2012)
New Revision: 28928
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AbstractToolBarComponentTest.java
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/StringEnableSupportTest.java
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoPanelComponentSelectedListener.java
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoPanelStateChangedListener.java
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/PreferencesUpdatedListener.java
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/TaskFactoryEnableSupportTest.java
Log:
refs #868 New unit tests had been added to swing-application-api.
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
2012-04-20 22:57:31 UTC (rev 28927)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
2012-04-20 23:05:34 UTC (rev 28928)
@@ -112,7 +112,7 @@
/**
* A support class for deciding whether the action should be enabled.
*/
- private final AbstractEnableSupport enabler;
+ private final AbstractEnableSupport enabler;
/**
* Creates a new AbstractCyAction object.
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoPanelComponentSelectedListener.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoPanelComponentSelectedListener.java
2012-04-20 22:57:31 UTC (rev 28927)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoPanelComponentSelectedListener.java
2012-04-20 23:05:34 UTC (rev 28928)
@@ -13,5 +13,5 @@
* Handles specified event.
* @param e The event to be handled.
*/
- public void handleEvent(CytoPanelComponentSelectedEvent e);
+ void handleEvent(CytoPanelComponentSelectedEvent e);
}
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoPanelStateChangedListener.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoPanelStateChangedListener.java
2012-04-20 22:57:31 UTC (rev 28927)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoPanelStateChangedListener.java
2012-04-20 23:05:34 UTC (rev 28928)
@@ -13,5 +13,5 @@
* Handles specified event.
* @param e The event to be handled.
*/
- public void handleEvent(CytoPanelStateChangedEvent e);
+ void handleEvent(CytoPanelStateChangedEvent e);
}
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/PreferencesUpdatedListener.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/PreferencesUpdatedListener.java
2012-04-20 22:57:31 UTC (rev 28927)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/PreferencesUpdatedListener.java
2012-04-20 23:05:34 UTC (rev 28928)
@@ -13,5 +13,5 @@
* Process the specified event.
* @param e The even to be processed.
*/
- public void handleEvent(PreferencesUpdatedEvent e);
+ void handleEvent(PreferencesUpdatedEvent e);
}
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AbstractToolBarComponentTest.java
===================================================================
---
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AbstractToolBarComponentTest.java
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AbstractToolBarComponentTest.java
2012-04-20 23:05:34 UTC (rev 28928)
@@ -0,0 +1,35 @@
+package org.cytoscape.application.swing;
+
+import static org.junit.Assert.*;
+
+import java.awt.Component;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AbstractToolBarComponentTest {
+
+ private AbstractToolBarComponent toolBarComponent;
+
+ @Before
+ public void setUp() throws Exception {
+ toolBarComponent = new DummyToolBarComponent();
+ }
+
+ @Test
+ public void testSetToolBarGravity() {
+ toolBarComponent.setToolBarGravity(12f);
+ assertTrue(12f == toolBarComponent.getToolBarGravity());
+ }
+
+ private static final class DummyToolBarComponent extends
AbstractToolBarComponent {
+
+ @Override
+ public Component getComponent() {
+ return null;
+ }
+
+ }
+
+}
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/StringEnableSupportTest.java
===================================================================
---
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/StringEnableSupportTest.java
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/StringEnableSupportTest.java
2012-04-20 23:05:34 UTC (rev 28928)
@@ -0,0 +1,78 @@
+package org.cytoscape.application.swing;
+
+import static org.junit.Assert.*;
+
+import javax.swing.JMenuItem;
+
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
+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 StringEnableSupportTest {
+
+ private StringEnableSupport support;
+
+ @Mock private DynamicSubmenuListener action;
+ private String enableFor = StringEnableSupport.ENABLE_FOR_NETWORK;
+ @Mock private CyApplicationManager applicationManager;
+ @Mock private CyNetworkViewManager networkViewManager;
+ @Mock private DynamicSubmenuListener submenuListener;
+
+ private JMenuItem menuItem = new JMenuItem();
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ support = new StringEnableSupport(action, enableFor,
applicationManager, networkViewManager);
+ }
+
+ @Test
+ public void testUpdateEnableState() {
+ support = new
StringEnableSupport(action,StringEnableSupport.ENABLE_FOR_NETWORK,
applicationManager, networkViewManager);
+ support.updateEnableState();
+ assertFalse(support.isCurrentlyEnabled());
+
+ support = new
StringEnableSupport(action,StringEnableSupport.ENABLE_FOR_NETWORK_AND_VIEW,
applicationManager, networkViewManager);
+ support.updateEnableState();
+ assertFalse(support.isCurrentlyEnabled());
+
+ support = new
StringEnableSupport(action,StringEnableSupport.ENABLE_FOR_NETWORK_WITHOUT_VIEW,
applicationManager, networkViewManager);
+ support.updateEnableState();
+ assertFalse(support.isCurrentlyEnabled());
+
+ support = new
StringEnableSupport(action,StringEnableSupport.ENABLE_FOR_SELECTED_EDGES,
applicationManager, networkViewManager);
+ support.updateEnableState();
+ assertFalse(support.isCurrentlyEnabled());
+
+ support = new
StringEnableSupport(action,StringEnableSupport.ENABLE_FOR_SELECTED_NODES,
applicationManager, networkViewManager);
+ support.updateEnableState();
+ assertFalse(support.isCurrentlyEnabled());
+
+ support = new
StringEnableSupport(action,StringEnableSupport.ENABLE_FOR_SELECTED_NODES_OR_EDGES,
applicationManager, networkViewManager);
+ support.updateEnableState();
+ assertFalse(support.isCurrentlyEnabled());
+
+ support = new
StringEnableSupport(action,StringEnableSupport.ENABLE_FOR_TABLE,
applicationManager, networkViewManager);
+ support.updateEnableState();
+ assertFalse(support.isCurrentlyEnabled());
+
+ support = new StringEnableSupport(action,null,
applicationManager, networkViewManager);
+ support.updateEnableState();
+ assertTrue(support.isCurrentlyEnabled());
+ }
+
+ @Test
+ public void testStringEnableSupportConstructor() {
+ support = new StringEnableSupport(action, enableFor,
applicationManager, networkViewManager);
+ assertNotNull(support);
+ support = new StringEnableSupport(submenuListener, enableFor,
applicationManager, networkViewManager);
+ assertNotNull(support);
+ support = new StringEnableSupport(menuItem, enableFor,
applicationManager, networkViewManager);
+ assertNotNull(support);
+ }
+}
Modified:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/TaskFactoryEnableSupportTest.java
===================================================================
---
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/TaskFactoryEnableSupportTest.java
2012-04-20 22:57:31 UTC (rev 28927)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/TaskFactoryEnableSupportTest.java
2012-04-20 23:05:34 UTC (rev 28928)
@@ -22,6 +22,7 @@
@Mock
private TaskFactory tfp;
+ @Mock
private DynamicSubmenuListener submenuListener;
@Before
--
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.
