Author: ruschein
Date: 2011-08-03 08:49:47 -0700 (Wed, 03 Aug 2011)
New Revision: 26363
Modified:
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyEdgeTest.java
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyNodeTest.java
core3/model-api/trunk/src/test/java/org/cytoscape/model/events/AddedEdgeEventTest.java
core3/model-api/trunk/src/test/java/org/cytoscape/model/events/AddedNodeEventTest.java
core3/model-api/trunk/src/test/java/org/cytoscape/model/events/ColumnCreatedEventTest.java
Log:
Finished closing Redmine bug #333.
Modified:
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyEdgeTest.java
===================================================================
---
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyEdgeTest.java
2011-08-03 15:34:25 UTC (rev 26362)
+++
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyEdgeTest.java
2011-08-03 15:49:47 UTC (rev 26363)
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2008, 2010, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2008, 2010-2011, The Cytoscape Consortium (www.cytoscape.org)
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -28,10 +28,11 @@
package org.cytoscape.model;
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
+import org.junit.Test;
-public abstract class AbstractCyEdgeTest extends TestCase {
+public abstract class AbstractCyEdgeTest {
protected CyNetwork net;
private CyEdge eDir;
@@ -50,18 +51,21 @@
eUndir = net.addEdge(n2, n3, false);
}
+ @Test
public void testIsDirected() {
defaultSetUp();
assertTrue("eDir is directed", eDir.isDirected());
assertFalse("eUndir is undirected", eUndir.isDirected());
}
+ @Test
public void testGetIndex() {
defaultSetUp();
assertTrue("edge index >= 0", eDir.getIndex() >= 0);
assertTrue("edge index >= 0", eUndir.getIndex() >= 0);
}
+ @Test
public void testGetSource() {
defaultSetUp();
assertNotNull("source exists", eDir.getSource());
@@ -77,6 +81,7 @@
assertTrue("source for eUndir", ((eUndir.getSource() == n3) ||
(eUndir.getSource() == n2)));
}
+ @Test
public void testGetTarget() {
defaultSetUp();
assertNotNull("target exists", eDir.getTarget());
@@ -92,6 +97,7 @@
assertTrue("target for eUndir", ((eUndir.getTarget() == n3) ||
(eUndir.getTarget() == n2)));
}
+ @Test
public void testToString() {
defaultSetUp();
assertNotNull("string is not null", eDir.toString());
@@ -100,6 +106,7 @@
assertTrue("string has non zero length",
eUndir.toString().length() > 0);
}
+ @Test
public void testDefaultAttributes() {
defaultSetUp();
Modified:
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
===================================================================
---
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
2011-08-03 15:34:25 UTC (rev 26362)
+++
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
2011-08-03 15:49:47 UTC (rev 26363)
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2008, 2010, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2008, 2010-2011, The Cytoscape Consortium (www.cytoscape.org)
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -33,31 +33,25 @@
import java.util.Collections;
import java.util.List;
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
+import org.junit.Test;
-/**
- * DOCUMENT ME!
- */
-public abstract class AbstractCyNetworkTest extends TestCase {
+public abstract class AbstractCyNetworkTest {
protected CyNetwork net;
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testAddNode() {
CyNode n = net.addNode();
assertNotNull("node is not null", n);
assertTrue("node index >= 0", n.getIndex() >= 0);
-
+
// Doesn't make sense for subnetworks
//assertTrue("node index < num node", n.getIndex() <
net.getNodeCount());
}
-
- /**
- * DOCUMENT ME!
- */
+
+ @Test
public void testRemoveNode() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -99,9 +93,7 @@
assertEquals("num nodes == 0", 0, net.getNodeCount());
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testRemoveNodeWithEdges() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -129,9 +121,7 @@
assertEquals("num edges", 0, net.getEdgeCount());
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testAddEdge() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -213,9 +203,7 @@
assertEquals("edge count", 8, net.getEdgeCount());
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testRemoveEdge() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -251,7 +239,7 @@
CyEdge e6 = net.addEdge(n1, n1, true);
assertEquals("num edges == 4", 4, net.getEdgeCount());
- // remove self edge
+ // remove self edge
boolean rem6 = net.removeEdges(Collections.singletonList(e6));
assertTrue("remove edge 6 success", rem6);
assertEquals("num edges == 3", 3, net.getEdgeCount());
@@ -276,9 +264,7 @@
}
// this is functionality is tested elsewhere too
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testGetNodeCount() {
assertEquals("num nodes == 0", 0, net.getNodeCount());
@@ -304,9 +290,7 @@
}
// this is functionality is tested elsewhere too
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testGetEdgeCount() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -324,9 +308,7 @@
assertEquals("num edges == 2", 2, net.getEdgeCount());
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testGetNodeList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -354,9 +336,7 @@
assertEquals("list size", 2, l.size());
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testGetEdgeList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -393,9 +373,7 @@
assertEquals("edge list size", 3, l.size());
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testIsNode() {
CyNode n1 = net.addNode();
CyNode n2 = new DummyCyNode(20);
@@ -403,9 +381,7 @@
assertFalse("node 2 is not", net.containsNode(n2));
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testIsEdgeFromEdge() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -417,9 +393,7 @@
assertFalse("edge 2 is not", net.containsEdge(e2));
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testIsEdgeFromNodes() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -436,9 +410,7 @@
assertFalse("bad source node", net.containsEdge(n4, n1));
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testBasicGetNeighborList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -475,9 +447,7 @@
assertEquals("two neighbors", 2, l.size());
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testBadNodeNeighborList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -494,9 +464,7 @@
}
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testUndirectedGetNeighborList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -536,9 +504,7 @@
assertEquals("node 2 neighbors", 0, l.size());
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testDirectedGetNeighborList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -585,9 +551,7 @@
assertTrue("contains node 3", l.contains(n3));
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testBasicGetAdjacentEdgeList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -619,9 +583,7 @@
assertEquals("one adjacent edge?", 1, l.size());
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testBadNodeAdjacentEdgeList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -638,9 +600,7 @@
}
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testUndirectedGetAdjacentEdgeList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -680,9 +640,7 @@
assertEquals("node 2 adjacent edges", 0, l.size());
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testDirectedGetAdjacentEdgeList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -729,9 +687,7 @@
assertTrue("contains edge 2", l.contains(e2));
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testBasicGetConnectingEdgeList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -769,9 +725,7 @@
assertTrue("contains edge 2", l.contains(e2));
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testBadTargetNodeConnectingEdgeList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -788,9 +742,7 @@
}
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testBadSourceNodeConnectingEdgeList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -807,9 +759,7 @@
}
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testUndirectedBasicGetConnectingEdgeList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -827,9 +777,7 @@
assertTrue("contains edge 3", l.contains(e3));
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testDirectedBasicGetConnectingEdgeList() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -849,9 +797,7 @@
assertTrue("contains edge 4", l.contains(e4));
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testGetNode() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -871,9 +817,7 @@
assertNull("node is null ", net.getNode(-1));
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testGetEdge() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -895,20 +839,16 @@
assertNull("edge is null ", net.getEdge(-1));
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testGetCyRow() {
// As long as the object is not null and is an instance of
CyRow, we
- // should be satisfied. Don't test any other properties of
CyRow.
+ // should be satisfied. Don't test any other properties of
CyRow.
// Leave that to the CyRow unit tests.
assertNotNull("cyattrs exists", net.getCyRow("USER"));
assertTrue("cyattrs is CyRow", net.getCyRow("USER") instanceof
CyRow);
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testGetCyRowNullNamespace() {
try {
net.getCyRow(null);
@@ -920,9 +860,7 @@
fail("didn't catch what was thrown");
}
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testCyRowBadNamespace() {
try {
net.getCyRow("homeradfasdf");
@@ -934,23 +872,24 @@
fail("didn't catch what was thrown");
}
- /**
- * Make sure the proper default attributes are created
- */
+ @Test
public void testDefaultAttributes() {
assertEquals(String.class,
net.getCyRow().getTable().getColumn("name").getType());
}
+ @Test
public void testGetDefaultNetworkTable() {
assertNotNull(net.getDefaultNetworkTable());
assertEquals(String.class,
net.getDefaultNetworkTable().getColumn("name").getType());
}
+ @Test
public void testGetDefaultNodeTable() {
assertNotNull(net.getDefaultNodeTable());
assertEquals(String.class,
net.getDefaultNodeTable().getColumn("name").getType());
}
+ @Test
public void testGetDefaultEdgeTable() {
assertNotNull(net.getDefaultEdgeTable());
assertEquals(String.class,
net.getDefaultEdgeTable().getColumn("name").getType());
Modified:
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyNodeTest.java
===================================================================
---
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyNodeTest.java
2011-08-03 15:34:25 UTC (rev 26362)
+++
core3/model-api/trunk/src/test/java/org/cytoscape/model/AbstractCyNodeTest.java
2011-08-03 15:49:47 UTC (rev 26363)
@@ -28,10 +28,8 @@
package org.cytoscape.model;
-import junit.framework.Assert;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import static org.junit.Assert.*;
+import org.junit.Test;
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
@@ -50,13 +48,10 @@
/** Base class for CyNode tests. */
-public abstract class AbstractCyNodeTest extends TestCase {
+public abstract class AbstractCyNodeTest {
protected CyNetwork net;
-
- /**
- * DOCUMENT ME!
- */
+ @Test
public void testGetIndex() {
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
@@ -64,6 +59,7 @@
assertTrue("index >= 0", n2.getIndex() >= 0);
}
+ @Test
public void testDefaultAttributes() {
CyNode n1 = net.addNode();
assertEquals(String.class,
@@ -73,11 +69,13 @@
}
// by default a node should have a null nested network
+ @Test
public void testInitGetNestedNetwork() {
CyNode n1 = net.addNode();
assertNull(n1.getNetwork());
}
+ @Test
public void testSetNestedNetwork() {
CyNode n1 = net.addNode();
CyNetwork net2 = mock(CyNetwork.class);
@@ -87,6 +85,7 @@
}
// self nested networks are allowed
+ @Test
public void testSetSelfNestedNetwork() {
CyNode n1 = net.addNode();
n1.setNetwork( net );
@@ -95,20 +94,22 @@
}
// null nested networks are allowed
+ @Test
public void testSetNullNestedNetwork() {
CyNode n1 = net.addNode();
- // put a real network here first
+ // put a real network here first
CyNetwork net2 = mock(CyNetwork.class);
n1.setNetwork( net2 );
assertNotNull(n1.getNetwork());
assertEquals(net2, n1.getNetwork());
-
+
// now put a null network to verify that we've "unset" things
n1.setNetwork( null );
assertNull(n1.getNetwork());
}
+ @Test
public void testRemoveNodeIndexStaysConstant() {
assertEquals(0,net.getNodeCount());
CyNode n0 = net.addNode();
@@ -121,6 +122,7 @@
assertEquals(1,n1i);
}
+ @Test
public void testRemoveNodeGetNodeFromIndex() {
assertEquals(0,net.getNodeCount());
CyNode n0 = net.addNode();
Modified:
core3/model-api/trunk/src/test/java/org/cytoscape/model/events/AddedEdgeEventTest.java
===================================================================
---
core3/model-api/trunk/src/test/java/org/cytoscape/model/events/AddedEdgeEventTest.java
2011-08-03 15:34:25 UTC (rev 26362)
+++
core3/model-api/trunk/src/test/java/org/cytoscape/model/events/AddedEdgeEventTest.java
2011-08-03 15:49:47 UTC (rev 26363)
@@ -34,8 +34,6 @@
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyEdge;
@@ -43,7 +41,7 @@
import static org.mockito.Mockito.*;
-public class AddedEdgeEventTest extends TestCase {
+public class AddedEdgeEventTest {
AddedEdgesEvent event;
Collection<CyEdge> edgeCollection;
CyNetwork net;
Modified:
core3/model-api/trunk/src/test/java/org/cytoscape/model/events/AddedNodeEventTest.java
===================================================================
---
core3/model-api/trunk/src/test/java/org/cytoscape/model/events/AddedNodeEventTest.java
2011-08-03 15:34:25 UTC (rev 26362)
+++
core3/model-api/trunk/src/test/java/org/cytoscape/model/events/AddedNodeEventTest.java
2011-08-03 15:49:47 UTC (rev 26363)
@@ -34,8 +34,6 @@
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
@@ -43,7 +41,7 @@
import static org.mockito.Mockito.*;
-public class AddedNodeEventTest extends TestCase {
+public class AddedNodeEventTest {
AddedNodesEvent event;
Collection<CyNode> nodeCollection;
CyNetwork net;
Modified:
core3/model-api/trunk/src/test/java/org/cytoscape/model/events/ColumnCreatedEventTest.java
===================================================================
---
core3/model-api/trunk/src/test/java/org/cytoscape/model/events/ColumnCreatedEventTest.java
2011-08-03 15:34:25 UTC (rev 26362)
+++
core3/model-api/trunk/src/test/java/org/cytoscape/model/events/ColumnCreatedEventTest.java
2011-08-03 15:49:47 UTC (rev 26363)
@@ -31,15 +31,13 @@
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
import org.cytoscape.model.CyTable;
import static org.mockito.Mockito.*;
-public class ColumnCreatedEventTest extends TestCase {
+public class ColumnCreatedEventTest {
ColumnCreatedEvent event;
CyTable table;
final String columnName = "asdf";
--
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.
