Author: kono
Date: 2012-07-27 11:25:24 -0700 (Fri, 27 Jul 2012)
New Revision: 30018
Modified:
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/AbstractTreeTableModelTest.java
Log:
fixes #1313 tests had been modified for Java 7's strict error checking.
Modified:
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/AbstractTreeTableModelTest.java
===================================================================
---
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/AbstractTreeTableModelTest.java
2012-07-27 18:03:30 UTC (rev 30017)
+++
core3/api/trunk/swing-util-api/src/test/java/org/cytoscape/util/swing/AbstractTreeTableModelTest.java
2012-07-27 18:25:24 UTC (rev 30018)
@@ -16,6 +16,7 @@
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.objenesis.instantiator.basic.NewInstanceInstantiator;
public class AbstractTreeTableModelTest {
@@ -24,18 +25,26 @@
@Mock Object child1;
@Mock Object child2;
- @Mock TreePath path;
+ TreePath path;
+ TreePath path2;
+
@Mock TreeModelListener tListener;
@Mock Object source;
- int[] childIndices = new int[]{};
- Object[] children = new Object[]{};
- Object[] pathList = new Object[]{path};
+ int[] childIndices = new int[]{1, 2};
+ Object[] children = new Object[]{child1, child2};
+
+ Object[] pathList = new Object[]{path, path2};
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
+ path=new TreePath(new Object[] {root, child1});
+ path2=new TreePath(new Object[] {root, child2});
+ pathList = new Object[]{path, path2};
+ childIndices = new int[]{1, 2};
+ children = new Object[]{child1, child2};
model = new DummyTreeTableModel(root);
}
@@ -124,9 +133,10 @@
private static final class DummyTreeTableModel extends
AbstractTreeTableModel {
+ private static final String DUMMY = "DUMMY";
+
public DummyTreeTableModel(Object root) {
super(root);
- // TODO Auto-generated constructor stub
}
@Override
@@ -143,14 +153,12 @@
@Override
public Object getValueAt(Object node, int column) {
- // TODO Auto-generated method stub
- return null;
+ return DUMMY;
}
@Override
public Object getChild(Object arg0, int arg1) {
- // TODO Auto-generated method stub
- return null;
+ return DUMMY;
}
@Override
--
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.
