Author: kono
Date: 2012-04-20 13:42:11 -0700 (Fri, 20 Apr 2012)
New Revision: 28909
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CytoPanelStateTest.java
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/events/
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/events/CytoPanelComponentSelectedEventTest.java
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/events/CytoPanelStateChangedEventTest.java
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/events/PreferencesUpdatedEventTest.java
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoPanelComponentSelectedEvent.java
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/PreferencesUpdatedEvent.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/events/CytoPanelComponentSelectedEvent.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoPanelComponentSelectedEvent.java
2012-04-20 20:25:29 UTC (rev 28908)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/CytoPanelComponentSelectedEvent.java
2012-04-20 20:42:11 UTC (rev 28909)
@@ -2,7 +2,6 @@
package org.cytoscape.application.swing.events;
import org.cytoscape.application.swing.CytoPanel;
-import org.cytoscape.application.swing.CytoPanelState;
import org.cytoscape.event.AbstractCyEvent;
/**
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/PreferencesUpdatedEvent.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/PreferencesUpdatedEvent.java
2012-04-20 20:25:29 UTC (rev 28908)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/events/PreferencesUpdatedEvent.java
2012-04-20 20:42:11 UTC (rev 28909)
@@ -9,6 +9,7 @@
* @CyAPI.Final.Class
*/
public final class PreferencesUpdatedEvent extends AbstractCyEvent<Object> {
+
private final Properties oldProps;
private final Properties newProps;
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CytoPanelStateTest.java
===================================================================
---
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CytoPanelStateTest.java
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CytoPanelStateTest.java
2012-04-20 20:42:11 UTC (rev 28909)
@@ -0,0 +1,19 @@
+package org.cytoscape.application.swing;
+
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CytoPanelStateTest {
+
+ @Test
+ public void test() {
+ assertEquals(3, CytoPanelState.values().length);
+
+ assertEquals(CytoPanelState.valueOf("DOCK"),
CytoPanelState.DOCK);
+ assertEquals(CytoPanelState.valueOf("FLOAT"),
CytoPanelState.FLOAT);
+ assertEquals(CytoPanelState.valueOf("HIDE"),
CytoPanelState.HIDE);
+ }
+}
Added:
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
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/TaskFactoryEnableSupportTest.java
2012-04-20 20:42:11 UTC (rev 28909)
@@ -0,0 +1,49 @@
+package org.cytoscape.application.swing;
+
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import javax.swing.JMenuItem;
+
+import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.swing.DynamicSubmenuListener;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class TaskFactoryEnableSupportTest {
+
+ private TaskFactoryEnableSupport support;
+
+ @Mock
+ private DynamicSubmenuListener action;
+ @Mock
+ private TaskFactory tfp;
+
+ private DynamicSubmenuListener submenuListener;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+
+ support = new TaskFactoryEnableSupport(action, tfp);
+ }
+
+ @Test
+ public void testUpdateEnableState() {
+ support.updateEnableState();
+ verify(tfp, times(1)).isReady();
+ }
+
+ @Test
+ public void testTaskFactoryEnableSupportConstructor() {
+ support = new TaskFactoryEnableSupport(action, tfp);
+ assertNotNull(support);
+ support = new TaskFactoryEnableSupport(submenuListener, tfp);
+ assertNotNull(support);
+ support = new TaskFactoryEnableSupport(new JMenuItem(), tfp);
+ assertNotNull(support);
+ }
+}
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/events/CytoPanelComponentSelectedEventTest.java
===================================================================
---
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/events/CytoPanelComponentSelectedEventTest.java
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/events/CytoPanelComponentSelectedEventTest.java
2012-04-20 20:42:11 UTC (rev 28909)
@@ -0,0 +1,43 @@
+package org.cytoscape.application.swing.events;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.cytoscape.application.swing.CytoPanel;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class CytoPanelComponentSelectedEventTest {
+
+ CytoPanelComponentSelectedEvent event;
+ @Mock
+ private Object source;
+ @Mock
+ private CytoPanel cp;
+
+ private int index = 0;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ event = new CytoPanelComponentSelectedEvent(source, cp, index);
+ }
+
+ @Test
+ public void testCytoPanelComponentSelectedEvent() {
+ assertNotNull(event);
+ }
+
+ @Test
+ public void testGetCytoPanel() {
+ assertEquals(cp, event.getCytoPanel());
+ }
+
+ @Test
+ public void testGetSelectedIndex() {
+ assertEquals(index, event.getSelectedIndex());
+ }
+
+}
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/events/CytoPanelStateChangedEventTest.java
===================================================================
---
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/events/CytoPanelStateChangedEventTest.java
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/events/CytoPanelStateChangedEventTest.java
2012-04-20 20:42:11 UTC (rev 28909)
@@ -0,0 +1,43 @@
+package org.cytoscape.application.swing.events;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.cytoscape.application.swing.CytoPanel;
+import org.cytoscape.application.swing.CytoPanelState;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class CytoPanelStateChangedEventTest {
+
+ CytoPanelStateChangedEvent event;
+
+ @Mock
+ private Object source;
+ @Mock
+ private CytoPanel cp;
+ private CytoPanelState newState = CytoPanelState.DOCK;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ event = new CytoPanelStateChangedEvent(source, cp, newState);
+ }
+
+ @Test
+ public void testCytoPanelStateChangedEvent() {
+ assertNotNull(event);
+ }
+
+ @Test
+ public void testGetCytoPanel() {
+ assertEquals(cp, event.getCytoPanel());
+ }
+
+ @Test
+ public void testGetNewState() {
+ assertEquals(newState, event.getNewState());
+ }
+}
\ No newline at end of file
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/events/PreferencesUpdatedEventTest.java
===================================================================
---
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/events/PreferencesUpdatedEventTest.java
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/events/PreferencesUpdatedEventTest.java
2012-04-20 20:42:11 UTC (rev 28909)
@@ -0,0 +1,44 @@
+package org.cytoscape.application.swing.events;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Properties;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class PreferencesUpdatedEventTest {
+
+ private PreferencesUpdatedEvent event;
+
+ @Mock
+ private Object source;
+ @Mock
+ private Properties oldProps;
+ @Mock
+ private Properties newProps;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ event = new PreferencesUpdatedEvent(source, oldProps, newProps);
+ }
+
+ @Test
+ public void testPreferencesUpdatedEvent() {
+ assertNotNull(event);
+ }
+
+ @Test
+ public void testGetOldProperties() {
+ assertEquals(oldProps, event.getOldProperties());
+ }
+
+ @Test
+ public void testGetNewProperties() {
+ assertEquals(newProps, event.getNewProperties());
+ }
+}
--
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.
