Author: clopes
Date: 2012-07-20 11:33:54 -0700 (Fri, 20 Jul 2012)
New Revision: 29948
Modified:
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/read/xgmml/GenericXGMMLReaderTest.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/BasicIntegrationTest.java
Log:
Minor change to tests that assert the custom columns from Cy2 sessions are
mutable.
Modified:
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/read/xgmml/GenericXGMMLReaderTest.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/read/xgmml/GenericXGMMLReaderTest.java
2012-07-20 18:29:57 UTC (rev 29947)
+++
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/read/xgmml/GenericXGMMLReaderTest.java
2012-07-20 18:33:54 UTC (rev 29948)
@@ -85,7 +85,7 @@
List<CyNetworkView> views = getViews("galFiltered.xgmml");
CyNetwork net = checkSingleNetwork(views, 331, 362);
findInteraction(net, "YGR136W", "YGR058W", "pp", 1);
- testCustomColumnsAreMutable(net);
+ assertCustomColumnsAreMutable(net);
}
@Test
@@ -111,7 +111,7 @@
CyTable hiddenEdgeTbl = net.getRow(net.getEdgeList().get(0),
CyNetwork.HIDDEN_ATTRS).getTable();
assertNotNull(hiddenEdgeTbl.getColumn("_private_real"));
- testCustomColumnsAreMutable(net);
+ assertCustomColumnsAreMutable(net);
}
@Test
@@ -136,8 +136,8 @@
assertNotNull(grNet.getRow(n,
CyNetwork.HIDDEN_ATTRS).get("__metanodeHintX", Double.class));
assertNotNull(grNet.getRow(n,
CyNetwork.HIDDEN_ATTRS).get("__metanodeHintY", Double.class));
}
- testCustomColumnsAreMutable(net);
- testCustomColumnsAreMutable(grNet);
+ assertCustomColumnsAreMutable(net);
+ assertCustomColumnsAreMutable(grNet);
}
@Test
@@ -212,7 +212,7 @@
assertEquals("SansSerif,bold,12",
GenericXGMMLReader.convertOldFontValue("SansSerif,bold,12"));
}
- private void testCustomColumnsAreMutable(CyNetwork net) {
+ private void assertCustomColumnsAreMutable(CyNetwork net) {
// User or non-default columns should be immutable
CyTable[] tables = new CyTable[] {
net.getTable(CyNetwork.class, CyNetwork.DEFAULT_ATTRS),
@@ -227,7 +227,7 @@
String name = c.getName();
if (!name.equals(CyNetwork.SUID) &&
!name.equals(CyNetwork.NAME) &&
!name.equals(CyNetwork.SELECTED) &&
!name.equals(CyEdge.INTERACTION) &&
- !c.getVirtualColumnInfo().isVirtual()) {
+ !name.equals(CyRootNetwork.SHARED_NAME)
&& !name.equals(CyRootNetwork.SHARED_INTERACTION)) {
assertFalse("Column " + c.getName() + "
should NOT be immutable", c.isImmutable());
}
}
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/BasicIntegrationTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/BasicIntegrationTest.java
2012-07-20 18:29:57 UTC (rev 29947)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/BasicIntegrationTest.java
2012-07-20 18:33:54 UTC (rev 29948)
@@ -25,7 +25,6 @@
import static org.ops4j.pax.exam.CoreOptions.frameworkStartLevel;
import java.io.File;
-import java.util.List;
import javax.inject.Inject;
@@ -40,6 +39,7 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableManager;
+import org.cytoscape.model.subnetwork.CyRootNetwork;
import org.cytoscape.task.read.OpenSessionTaskFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.model.VisualLexicon;
@@ -230,7 +230,7 @@
String name = c.getName();
if (!name.equals(CyNetwork.SUID) &&
!name.equals(CyNetwork.NAME) &&
!name.equals(CyNetwork.SELECTED) &&
!name.equals(CyEdge.INTERACTION) &&
- !c.getVirtualColumnInfo().isVirtual()) {
+ !name.equals(CyRootNetwork.SHARED_NAME)
&& !name.equals(CyRootNetwork.SHARED_INTERACTION)) {
assertFalse("Column " + c.getName() + "
should NOT be immutable", c.isImmutable());
}
}
--
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.
