Author: pwang
Date: 2012-03-26 15:25:08 -0700 (Mon, 26 Mar 2012)
New Revision: 28651
Added:
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyIdentifiableTest.java
Modified:
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/CyIdentifiable.java
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/subnetwork/CyRootNetwork.java
Log:
Fixed bug#810
Modified:
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/CyIdentifiable.java
===================================================================
---
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/CyIdentifiable.java
2012-03-26 21:26:04 UTC (rev 28650)
+++
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/CyIdentifiable.java
2012-03-26 22:25:08 UTC (rev 28651)
@@ -29,7 +29,7 @@
/**
- * CyTableEntry is an interface that indicates that the implementing
+ * CyIdentifiable is an interface that indicates that the implementing
* object can be considered a key into a table. In general, table
* entries will be things like nodes, edges, and networks..
* @CyAPI.Api.Interface
Modified:
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/subnetwork/CyRootNetwork.java
===================================================================
---
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/subnetwork/CyRootNetwork.java
2012-03-26 21:26:04 UTC (rev 28650)
+++
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/subnetwork/CyRootNetwork.java
2012-03-26 22:25:08 UTC (rev 28651)
@@ -74,7 +74,7 @@
/**
* The name of the shared name column found in the SHARED_ATTRS table.
This
- * column value will be updated any time the value of the
CyTableEntry.NAME
+ * column value will be updated any time the value of the
CyNetwork.NAME
* column in a default table is set. The purpose of this column is to
serve
* as a join key for virtual columns to be added to the shared table.
*/
Copied:
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyIdentifiableTest.java
(from rev 28646,
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyTableEntryTest.java)
===================================================================
---
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyIdentifiableTest.java
(rev 0)
+++
core3/api/trunk/model-api/src/test/java/org/cytoscape/model/AbstractCyIdentifiableTest.java
2012-03-26 22:25:08 UTC (rev 28651)
@@ -0,0 +1,64 @@
+/*
+ Copyright (c) 2008, 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
+ by the Free Software Foundation; either version 2.1 of the License, or
+ any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
+ documentation provided hereunder is on an "as is" basis, and the
+ Institute for Systems Biology and the Whitehead Institute
+ have no obligations to provide maintenance, support,
+ updates, enhancements or modifications. In no event shall the
+ Institute for Systems Biology and the Whitehead Institute
+ be liable to any party for direct, indirect, special,
+ incidental or consequential damages, including lost profits, arising
+ out of the use of this software and its documentation, even if the
+ Institute for Systems Biology and the Whitehead Institute
+ have been advised of the possibility of such damage. See
+ the GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+*/
+package org.cytoscape.model;
+
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNode;
+
+import java.lang.RuntimeException;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public abstract class AbstractCyIdentifiableTest {
+ protected CyNetwork net;
+
+ @Test
+ public void testGetSUID() {
+ CyNode n1 = net.addNode();
+ assertTrue("suid >= 0", n1.getSUID() >= 0);
+
+ CyNode n2 = net.addNode();
+ assertTrue("suid >= 0", n2.getSUID() >= 0);
+
+ CyEdge e1 = net.addEdge(n1, n2, true);
+ assertTrue("suid >= 0", e1.getSUID() >= 0);
+
+ CyEdge e2 = net.addEdge(n1, n2, false);
+ assertTrue("suid >= 0", e2.getSUID() >= 0);
+
+ assertTrue("suid >= 0", net.getSUID() >= 0);
+ }
+}
--
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.
