Author: clopes
Date: 2012-08-10 11:49:32 -0700 (Fri, 10 Aug 2012)
New Revision: 30160
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/Cy252SimpleSessionLodingTest.java
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy283ComplexSessionLodingTest.java
Log:
Just updated tests that assert Cy2 attributes are created as mutable columns.
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-08-10 18:45:29 UTC (rev 30159)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/BasicIntegrationTest.java
2012-08-10 18:49:32 UTC (rev 30160)
@@ -15,10 +15,17 @@
*/
package org.cytoscape.session;
+import static org.cytoscape.model.CyNetwork.DEFAULT_ATTRS;
+import static org.cytoscape.model.CyNetwork.HIDDEN_ATTRS;
+import static org.cytoscape.model.CyNetwork.LOCAL_ATTRS;
+import static org.cytoscape.model.CyNetwork.NAME;
+import static org.cytoscape.model.subnetwork.CyRootNetwork.SHARED_ATTRS;
import static org.junit.Assert.*;
import static org.ops4j.pax.exam.CoreOptions.*;
import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
import javax.inject.Inject;
@@ -211,22 +218,38 @@
);
}
- protected void assertCustomColumnsAreMutable(CyNetwork net) {
- // User or non-default columns must be immutable (2.x sessions
only)
- CyTable[] tables = new CyTable[] {
- net.getTable(CyNetwork.class, CyNetwork.DEFAULT_ATTRS),
- net.getTable(CyNetwork.class, CyNetwork.HIDDEN_ATTRS),
- net.getTable(CyNode.class, CyNetwork.DEFAULT_ATTRS),
- net.getTable(CyNode.class, CyNetwork.HIDDEN_ATTRS),
- net.getTable(CyEdge.class, CyNetwork.DEFAULT_ATTRS),
- net.getTable(CyEdge.class, CyNetwork.HIDDEN_ATTRS)
- };
+ /**
+ * Cy2 sessions only!
+ * @param net
+ */
+ protected void assertCy2CustomColumnsAreMutable(CyNetwork net) {
+ // User or non-default columns should be immutable
+ List<CyTable> tables = new ArrayList<CyTable>();
+ tables.add(net.getTable(CyNetwork.class, LOCAL_ATTRS));
+ tables.add(net.getTable(CyNetwork.class, HIDDEN_ATTRS));
+ tables.add(net.getTable(CyNetwork.class, DEFAULT_ATTRS));
+ tables.add(net.getTable(CyNode.class, LOCAL_ATTRS));
+ tables.add(net.getTable(CyNode.class, HIDDEN_ATTRS));
+ tables.add(net.getTable(CyNode.class, DEFAULT_ATTRS));
+ tables.add(net.getTable(CyEdge.class, LOCAL_ATTRS));
+ tables.add(net.getTable(CyEdge.class, HIDDEN_ATTRS));
+ tables.add(net.getTable(CyEdge.class, DEFAULT_ATTRS));
+
+ if (net instanceof CyRootNetwork) {
+ tables.add(net.getTable(CyNetwork.class, SHARED_ATTRS));
+ tables.add(net.getTable(CyNode.class, SHARED_ATTRS));
+ tables.add(net.getTable(CyEdge.class, SHARED_ATTRS));
+ }
+
for (CyTable t : tables) {
for (CyColumn c : t.getColumns()) {
String name = c.getName();
- if (!name.equals(CyNetwork.SUID) &&
!name.equals(CyNetwork.NAME) &&
- !name.equals(CyNetwork.SELECTED) &&
!name.equals(CyEdge.INTERACTION) &&
- !name.equals(CyRootNetwork.SHARED_NAME)
&& !name.equals(CyRootNetwork.SHARED_INTERACTION)) {
+ if (!name.equals(CyNetwork.SUID)
+ && !name.equals(NAME)
+ &&
!name.equals(CyNetwork.SELECTED)
+ &&
!name.equals(CyEdge.INTERACTION)
+ &&
!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/Cy252SimpleSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
2012-08-10 18:45:29 UTC (rev 30159)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy252SimpleSessionLodingTest.java
2012-08-10 18:49:32 UTC (rev 30160)
@@ -82,7 +82,7 @@
assertEquals(362, network.getEdgeCount());
// Non-default columns should not be immutable
- assertCustomColumnsAreMutable(network);
+ assertCy2CustomColumnsAreMutable(network);
// Selection state
Collection<CyRow> selectedNodes =
network.getDefaultNodeTable().getMatchingRows(CyNetwork.SELECTED, true);
Modified:
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy283ComplexSessionLodingTest.java
===================================================================
---
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy283ComplexSessionLodingTest.java
2012-08-10 18:45:29 UTC (rev 30159)
+++
core3/impl/trunk/session-impl/integration-test/src/test/java/org/cytoscape/session/Cy283ComplexSessionLodingTest.java
2012-08-10 18:49:32 UTC (rev 30160)
@@ -94,7 +94,7 @@
for (CyNetwork network : networks) {
// Non-default columns should not be immutable
- assertCustomColumnsAreMutable(network);
+ assertCy2CustomColumnsAreMutable(network);
if (network instanceof CySubNetwork)
rootNetworks.add(((CySubNetwork)network).getRootNetwork());
@@ -114,7 +114,7 @@
}
for (CyRootNetwork rootNet : rootNetworks)
- assertCustomColumnsAreMutable(rootNet);
+ assertCy2CustomColumnsAreMutable(rootNet);
}
private void testNetwork1(CyNetwork network) {
--
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.
