Author: kono
Date: 2012-04-20 13:05:02 -0700 (Fri, 20 Apr 2012)
New Revision: 28907
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AbstractCyActionTest.java
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AbstractViewUpdaterTest.java
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/ViewUpdaterTest.java
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.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 19:34:09 UTC (rev 28906)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
2012-04-20 20:05:02 UTC (rev 28907)
@@ -103,11 +103,6 @@
*/
protected boolean inMenuBar = true;
- /**
- * The string defining the possible system states that the
- * action is enabled for.
- */
- protected String enableFor = null;
/**
* The name of the action.
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AbstractCyActionTest.java
===================================================================
---
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AbstractCyActionTest.java
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AbstractCyActionTest.java
2012-04-20 20:05:02 UTC (rev 28907)
@@ -0,0 +1,115 @@
+package org.cytoscape.application.swing;
+
+import static org.junit.Assert.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.KeyStroke;
+
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.work.TaskFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+
+public abstract class AbstractCyActionTest {
+
+ protected AbstractCyAction action;
+
+ protected String name = "action name";
+ protected Map<String, String> configProps = new HashMap<String,
String>();
+ @Mock protected CyApplicationManager applicationManager;
+ @Mock protected CyNetworkViewManager networkViewManager;
+ @Mock protected TaskFactory factory;
+ protected String enableFor;
+
+ @Test
+ public abstract void testAbstractCyActionConstructor();
+
+
+ @Test
+ public void testSetName() {
+ final String newName ="New name";
+ action.setName(newName);
+ assertEquals(newName, action.getName());
+ }
+
+
+ @Test
+ public void testIsInMenuBar() {
+ assertTrue(action.isInMenuBar());
+ }
+
+ @Test
+ public void testIsInToolBar() {
+ assertFalse(action.isInToolBar());
+ }
+
+ @Test
+ public void testSetMenuGravity() {
+ action.setMenuGravity(10.2f);
+ assertTrue(action.getMenuGravity() == 10.2f);
+ }
+
+ @Test
+ public void testSetToolbarGravity() {
+ action.setToolbarGravity(10.2f);
+ assertTrue(action.getToolbarGravity() == 10.2f);
+ }
+
+ @Test
+ public void testSetAcceleratorKeyStroke() {
+ final KeyStroke testStroke = KeyStroke.getKeyStroke("s");
+ action.setAcceleratorKeyStroke(testStroke);
+ assertEquals(testStroke, action.getAcceleratorKeyStroke());
+ }
+
+ @Test
+ public void testSetPreferredMenu() {
+ action.setPreferredMenu("file");
+ assertEquals("file", action.getPreferredMenu());
+ }
+
+ @Test
+ public void testUseCheckBoxMenuItem() {
+ assertFalse(action.useCheckBoxMenuItem());
+ }
+
+ @Test
+ public void testMenuCanceled() {
+ action.menuCanceled(null);
+ }
+
+ @Test
+ public void testMenuDeselected() {
+ action.menuDeselected(null);
+ }
+
+ @Test
+ public void testMenuSelected() {
+ action.menuSelected(null);
+ }
+
+ @Test
+ public void testPopupMenuWillBecomeVisible() {
+ action.popupMenuWillBecomeVisible(null);
+ }
+
+ @Test
+ public void testPopupMenuWillBecomeInvisible() {
+ action.popupMenuWillBecomeInvisible(null);
+ }
+
+ @Test
+ public void testPopupMenuCanceled() {
+ action.popupMenuCanceled(null);
+ }
+
+ @Test
+ public void testUpdateEnableState() {
+ action.updateEnableState();
+ }
+}
\ No newline at end of file
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AbstractViewUpdaterTest.java
===================================================================
---
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AbstractViewUpdaterTest.java
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/AbstractViewUpdaterTest.java
2012-04-20 20:05:02 UTC (rev 28907)
@@ -0,0 +1,41 @@
+package org.cytoscape.application.swing;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.cytoscape.model.CyRow;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.model.events.RowSetRecord;
+import org.cytoscape.model.events.RowsSetEvent;
+import org.junit.Test;
+import org.mockito.Mock;
+
+import static org.mockito.Mockito.*;
+
+public abstract class AbstractViewUpdaterTest {
+
+ protected AbstractViewUpdater<?> updater;
+ @Mock private CyTable source;
+
+ private Collection<RowSetRecord> rows;
+
+ @Mock private CyRow row;
+ @Mock private Object value;
+ @Mock private Object rawValue;
+
+ @Test
+ public abstract void testAbstractViewUpdater();
+
+ @Test
+ public void testHandleEvent() {
+ rows = new ArrayList<RowSetRecord>();
+ RowSetRecord rec1 = new RowSetRecord(row, "test", value,
rawValue);
+ rows.add(rec1);
+ RowsSetEvent event = new RowsSetEvent(source, rows);
+ updater.handleEvent(event);
+
+ verify(row, times(0)).getAllValues();
+
+ }
+
+}
Added:
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
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/CyActionTest.java
2012-04-20 20:05:02 UTC (rev 28907)
@@ -0,0 +1,66 @@
+package org.cytoscape.application.swing;
+
+import static org.junit.Assert.*;
+
+import java.awt.event.ActionEvent;
+import java.util.Map;
+
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.work.TaskFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.MockitoAnnotations;
+
+public class CyActionTest extends AbstractCyActionTest {
+
+
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+
+ action = new DummyAction(configProps, applicationManager,
networkViewManager);
+ action.setName(name);
+ }
+
+ @Override
+ public void testAbstractCyActionConstructor() {
+ action = new DummyAction(configProps, applicationManager,
networkViewManager);
+ action = new DummyAction(name);
+ action = new DummyAction(configProps, factory);
+ action = new DummyAction(configProps, applicationManager,
networkViewManager, factory);
+ action = new DummyAction(name, applicationManager, enableFor,
networkViewManager);
+ }
+
+ private static final class DummyAction extends AbstractCyAction {
+
+ public DummyAction(Map<String, String> configProps,
CyApplicationManager applicationManager,
+ CyNetworkViewManager networkViewManager,
TaskFactory factory) {
+ super(configProps, applicationManager,
networkViewManager, factory);
+ }
+
+ public DummyAction(String name) {
+ super(name);
+ }
+
+ public DummyAction(Map<String, String> configProps, TaskFactory
predicate) {
+ super(configProps, predicate);
+ }
+
+ public DummyAction(Map<String, String> configProps,
CyApplicationManager applicationManager,
+ CyNetworkViewManager networkViewManager) {
+ super(configProps, applicationManager,
networkViewManager);
+ }
+
+ public DummyAction(String name, CyApplicationManager
applicationManager, String enableFor,
+ CyNetworkViewManager networkViewManager) {
+ super(name, applicationManager, enableFor,
networkViewManager);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ }
+ }
+}
Added:
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/ViewUpdaterTest.java
===================================================================
---
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/ViewUpdaterTest.java
(rev 0)
+++
core3/api/trunk/swing-application-api/src/test/java/org/cytoscape/application/swing/ViewUpdaterTest.java
2012-04-20 20:05:02 UTC (rev 28907)
@@ -0,0 +1,44 @@
+package org.cytoscape.application.swing;
+
+import static org.junit.Assert.*;
+
+import java.awt.Paint;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.cytoscape.model.CyRow;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualProperty;
+import org.cytoscape.view.presentation.property.BasicVisualLexicon;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.MockitoAnnotations;
+
+public class ViewUpdaterTest extends AbstractViewUpdaterTest {
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+
+ String columnName ="test";
+ Map<CyRow, View<?>> rowViewMap = new HashMap<CyRow, View<?>>();
+ updater = new
DummyViewUpdater<Paint>(BasicVisualLexicon.NODE_FILL_COLOR, columnName,
rowViewMap);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ @Override
+ public void testAbstractViewUpdater() {
+ assertNotNull(updater);
+ }
+
+ private static final class DummyViewUpdater<T> extends
AbstractViewUpdater<T> {
+
+ public DummyViewUpdater(VisualProperty<T> vp, String
columnName, Map<CyRow, View<?>> rowViewMap) {
+ super(vp, columnName, rowViewMap);
+ }
+ }
+}
--
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.
