Author: kono
Date: 2012-03-21 15:52:00 -0700 (Wed, 21 Mar 2012)
New Revision: 28609
Modified:
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
Log:
Minor updates for network test cases.
Modified:
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
===================================================================
---
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
2012-03-21 22:35:16 UTC (rev 28608)
+++
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyNetworkTest.java
2012-03-21 22:52:00 UTC (rev 28609)
@@ -844,8 +844,8 @@
// 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.
// Leave that to the CyRow unit tests.
- assertNotNull("cyattrs exists", net.getRow(net,"USER"));
- assertTrue("cyattrs is CyRow", net.getRow(net,"USER")
instanceof CyRow);
+ assertNotNull("cyattrs exists", net.getRow(net,
CyNetwork.DEFAULT_ATTRS));
+ assertTrue("cyattrs is CyRow", net.getRow(net,
CyNetwork.DEFAULT_ATTRS) instanceof CyRow);
}
@Test(expected=NullPointerException.class)
@@ -865,24 +865,24 @@
@Test
public void testDefaultAttributes() {
- assertEquals(String.class,
net.getRow(net).getTable().getColumn("name").getType());
+ assertEquals(String.class,
net.getRow(net).getTable().getColumn(CyTableEntry.NAME).getType());
}
@Test
public void testGetDefaultNetworkTable() {
assertNotNull(net.getDefaultNetworkTable());
- assertEquals(String.class,
net.getDefaultNetworkTable().getColumn("name").getType());
+ assertEquals(String.class,
net.getDefaultNetworkTable().getColumn(CyTableEntry.NAME).getType());
}
@Test
public void testGetDefaultNodeTable() {
assertNotNull(net.getDefaultNodeTable());
- assertEquals(String.class,
net.getDefaultNodeTable().getColumn("name").getType());
+ assertEquals(String.class,
net.getDefaultNodeTable().getColumn(CyTableEntry.NAME).getType());
}
@Test
public void testGetDefaultEdgeTable() {
assertNotNull(net.getDefaultEdgeTable());
- assertEquals(String.class,
net.getDefaultEdgeTable().getColumn("name").getType());
+ assertEquals(String.class,
net.getDefaultEdgeTable().getColumn(CyTableEntry.NAME).getType());
}
}
--
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.
