Author: kono
Date: 2012-04-24 11:11:59 -0700 (Tue, 24 Apr 2012)
New Revision: 28962
Added:
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/AbstractCellEditorTest.java
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/internal/CyActivatorTest.java
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/AbstractCellEditor.java
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JTreeTable.java
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/CyActivator.java
Log:
fixes #875 New unit tests had been added to swing-util-api.
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/AbstractCellEditor.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/AbstractCellEditor.java
2012-04-24 17:31:18 UTC (rev 28961)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/AbstractCellEditor.java
2012-04-24 18:11:59 UTC (rev 28962)
@@ -29,7 +29,7 @@
* should be probably be overridden.
* @CyAPI.Abstract.Class
*/
-public class AbstractCellEditor implements CellEditor {
+public abstract class AbstractCellEditor implements CellEditor {
protected EventListenerList listenerList = new EventListenerList();
@@ -65,12 +65,6 @@
return true;
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void cancelCellEditing() {
- }
/**
* {@inheritDoc}
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JTreeTable.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JTreeTable.java
2012-04-24 17:31:18 UTC (rev 28961)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JTreeTable.java
2012-04-24 18:11:59 UTC (rev 28962)
@@ -337,6 +337,9 @@
return false;
}
+
+ @Override
+ public void cancelCellEditing() {}
}
/**
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/CyActivator.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/CyActivator.java
2012-04-24 17:31:18 UTC (rev 28961)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/internal/CyActivator.java
2012-04-24 18:11:59 UTC (rev 28962)
@@ -1,7 +1,3 @@
-
-
-
-
package org.cytoscape.util.swing.internal;
import org.cytoscape.property.CyProperty;
@@ -13,21 +9,20 @@
import org.cytoscape.service.util.AbstractCyActivator;
import java.util.Properties;
-
public class CyActivator extends AbstractCyActivator {
public CyActivator() {
super();
}
-
@Override
public void start(BundleContext bc) {
- CyProperty<Properties> cytoscapePropertiesServiceRef =
getService(bc,CyProperty.class,"(cyPropertyName=cytoscape3.props)");
-
- FileUtilImpl fileUtil = new
FileUtilImpl(cytoscapePropertiesServiceRef);
+
OpenBrowserImpl openBrowser = new OpenBrowserImpl();
-
- registerService(bc,fileUtil,FileUtil.class, new Properties());
- registerService(bc,openBrowser,OpenBrowser.class, new
Properties());
+ registerService(bc, openBrowser, OpenBrowser.class, new
Properties());
+
+ CyProperty<Properties> cytoscapePropertiesServiceRef =
getService(bc, CyProperty.class,
+ "(cyPropertyName=cytoscape3.props)");
+ FileUtilImpl fileUtil = new
FileUtilImpl(cytoscapePropertiesServiceRef);
+ registerService(bc, fileUtil, FileUtil.class, new Properties());
}
}
Added:
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/AbstractCellEditorTest.java
===================================================================
---
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/AbstractCellEditorTest.java
(rev 0)
+++
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/AbstractCellEditorTest.java
2012-04-24 18:11:59 UTC (rev 28962)
@@ -0,0 +1,75 @@
+package org.cytoscape.util.swing;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import javax.swing.event.CellEditorListener;
+import javax.swing.event.ChangeEvent;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+
+public class AbstractCellEditorTest {
+
+ AbstractCellEditor editor;
+
+ @Before
+ public void setUp() throws Exception {
+ editor = new DummyCellEditor();
+ }
+
+ @Test
+ public void testGetCellEditorValue() {
+ assertNull(editor.getCellEditorValue());
+ }
+
+ @Test
+ public void testIsCellEditable() {
+ assertTrue(editor.isCellEditable(null));
+ }
+
+ @Test
+ public void testShouldSelectCell() {
+ assertFalse(editor.shouldSelectCell(null));
+ }
+
+ @Test
+ public void testStopCellEditing() {
+ assertTrue(editor.stopCellEditing());
+ }
+
+ @Test
+ public void testAddCellEditorListener() {
+ CellEditorListener l = mock(CellEditorListener.class);
+ editor.addCellEditorListener(l);
+ assertEquals(1, editor.listenerList.getListenerCount());
+
+ editor.removeCellEditorListener(l);
+ assertEquals(0, editor.listenerList.getListenerCount());
+ }
+
+ @Test
+ public void testFireEditingStopped() {
+ CellEditorListener l = mock(CellEditorListener.class);
+ editor.addCellEditorListener(l);
+ editor.fireEditingStopped();
+ verify(l, times(1)).editingStopped((ChangeEvent) any());
+ }
+
+ @Test
+ public void testFireEditingCanceled() {
+ CellEditorListener l = mock(CellEditorListener.class);
+ editor.addCellEditorListener(l);
+ editor.fireEditingCanceled();
+ verify(l, times(1)).editingCanceled((ChangeEvent) any());
+ }
+
+ private static final class DummyCellEditor extends AbstractCellEditor {
+
+ @Override
+ public void cancelCellEditing() {}
+ }
+
+}
Added:
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/internal/CyActivatorTest.java
===================================================================
---
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/internal/CyActivatorTest.java
(rev 0)
+++
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/internal/CyActivatorTest.java
2012-04-24 18:11:59 UTC (rev 28962)
@@ -0,0 +1,38 @@
+package org.cytoscape.util.swing.internal;
+
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+public class CyActivatorTest {
+ @Mock BundleContext bc;
+ @Mock ServiceReference reference;
+
+ CyActivator activator;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ ServiceReference[] refs = new ServiceReference[]{reference};
+ when(bc.getServiceReferences(anyString(),
anyString())).thenReturn(refs);
+ activator = new CyActivator();
+ }
+
+
+ @Test
+ public void testCyActivator() {
+ assertNotNull(activator);
+ }
+
+ @Test(expected=NullPointerException.class)
+ public void testStart() {
+ activator.start(bc);
+ }
+}
--
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.
