Author: kono
Date: 2011-08-12 13:41:12 -0700 (Fri, 12 Aug 2011)
New Revision: 26545
Modified:
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyEdgeTest.java
core3/impl/trunk/model-impl/impl/src/test/java/org/cytoscape/model/CyEdgeTest.java
Log:
Unnecessary method calls had been consolidated.
Modified:
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyEdgeTest.java
===================================================================
---
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyEdgeTest.java
2011-08-12 20:27:04 UTC (rev 26544)
+++
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyEdgeTest.java
2011-08-12 20:41:12 UTC (rev 26545)
@@ -29,10 +29,13 @@
import static org.junit.Assert.*;
+
+import org.junit.Before;
import org.junit.Test;
public abstract class AbstractCyEdgeTest {
+
protected CyNetwork net;
private CyEdge eDir;
@@ -41,7 +44,7 @@
private CyNode n2;
private CyNode n3;
- private void defaultSetUp() {
+ protected void defaultSetUp() {
n1 = net.addNode();
n2 = net.addNode();
n3 = net.addNode();
@@ -53,21 +56,18 @@
@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());
assertTrue("source is a CyNode", eDir.getSource() instanceof
CyNode);
@@ -83,7 +83,6 @@
@Test
public void testGetTarget() {
- defaultSetUp();
assertNotNull("target exists", eDir.getTarget());
assertTrue("target is a CyNode", eDir.getTarget() instanceof
CyNode);
@@ -99,7 +98,6 @@
@Test
public void testToString() {
- defaultSetUp();
assertNotNull("string is not null", eDir.toString());
assertNotNull("string is not null", eUndir.toString());
assertTrue("string has non zero length",
eDir.toString().length() > 0);
@@ -108,8 +106,6 @@
@Test
public void testDefaultAttributes() {
- defaultSetUp();
-
CyNode n1 = net.addNode();
CyNode n2 = net.addNode();
CyEdge e1 = net.addEdge(n1,n2,true);
Modified:
core3/impl/trunk/model-impl/impl/src/test/java/org/cytoscape/model/CyEdgeTest.java
===================================================================
---
core3/impl/trunk/model-impl/impl/src/test/java/org/cytoscape/model/CyEdgeTest.java
2011-08-12 20:27:04 UTC (rev 26544)
+++
core3/impl/trunk/model-impl/impl/src/test/java/org/cytoscape/model/CyEdgeTest.java
2011-08-12 20:41:12 UTC (rev 26545)
@@ -28,8 +28,6 @@
package org.cytoscape.model;
-import org.cytoscape.model.CyNetwork;
-
import org.junit.After;
import org.junit.Before;
@@ -38,6 +36,7 @@
@Before
public void setUp() {
net = TestCyNetworkFactory.getInstance();
+ defaultSetUp();
}
@After
--
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.
