Author: mes
Date: 2010-09-30 13:39:53 -0700 (Thu, 30 Sep 2010)
New Revision: 22107
Modified:
core3/session-api/trunk/src/main/java/org/cytoscape/session/CySession.java
core3/session-api/trunk/src/main/java/org/cytoscape/session/CySessionManager.java
core3/session-api/trunk/src/test/java/org/cytoscape/session/AbstractCySessionManagerTest.java
core3/session-api/trunk/src/test/java/org/cytoscape/session/AbstractCySessionTest.java
Log:
updated session api based on existing session reader
Modified:
core3/session-api/trunk/src/main/java/org/cytoscape/session/CySession.java
===================================================================
--- core3/session-api/trunk/src/main/java/org/cytoscape/session/CySession.java
2010-09-30 20:22:43 UTC (rev 22106)
+++ core3/session-api/trunk/src/main/java/org/cytoscape/session/CySession.java
2010-09-30 20:39:53 UTC (rev 22107)
@@ -21,18 +21,15 @@
*/
public interface CySession {
- String getSessionName();
-
- Set<CyNetwork> getNetworks();
-
Set<CyNetworkView> getNetworkViews();
Set<CyTable> getTables();
- Set<VisualStyle> getVisualStyles();
+ Map<CyNetworkView,String> getViewVisualStyleMap();
- Map<String,Properties> getProperties();
+ Properties getCytoscapeProperties();
- String getFileName();
+ Properties getVizmapProperties();
+ Properties getDesktopProperties();
}
Modified:
core3/session-api/trunk/src/main/java/org/cytoscape/session/CySessionManager.java
===================================================================
---
core3/session-api/trunk/src/main/java/org/cytoscape/session/CySessionManager.java
2010-09-30 20:22:43 UTC (rev 22106)
+++
core3/session-api/trunk/src/main/java/org/cytoscape/session/CySessionManager.java
2010-09-30 20:39:53 UTC (rev 22107)
@@ -10,6 +10,7 @@
*/
public interface CySessionManager {
+ // TODO do we need this?
enum State {
NEW,
OPENED,
@@ -17,10 +18,10 @@
CLOSED,
}
- State getCurrentSessionState();
-
CySession getCurrentSession();
- void setCurrentSession(CySession session);
+ void setCurrentSession(CySession session, String fileName);
+
+ String getCurrentSessionFileName();
}
Modified:
core3/session-api/trunk/src/test/java/org/cytoscape/session/AbstractCySessionManagerTest.java
===================================================================
---
core3/session-api/trunk/src/test/java/org/cytoscape/session/AbstractCySessionManagerTest.java
2010-09-30 20:22:43 UTC (rev 22106)
+++
core3/session-api/trunk/src/test/java/org/cytoscape/session/AbstractCySessionManagerTest.java
2010-09-30 20:39:53 UTC (rev 22107)
@@ -22,15 +22,25 @@
public void testSetCurrentSession() {
assertNotNull(mgr);
CySession session = mock(CySession.class);
- mgr.setCurrentSession(session);
+ mgr.setCurrentSession(session,"someFile");
assertNotNull(mgr.getCurrentSession());
assertEquals(session,mgr.getCurrentSession());
}
-
+
@Test
- public void testGetCurrentSessionState() {
+ public void testSetCurrentSessionFileName() {
assertNotNull(mgr);
- assertNotNull(mgr.getCurrentSessionState());
- // TODO not sure what to test here
+ CySession session = mock(CySession.class);
+ mgr.setCurrentSession(session,"someFile");
+ assertEquals("someFile",mgr.getCurrentSessionFileName());
}
+
+ // TODO should we allow this? For new sessions?
+ @Test
+ public void testSetNullCurrentSessionFileName() {
+ assertNotNull(mgr);
+ CySession session = mock(CySession.class);
+ mgr.setCurrentSession(session,null);
+ assertNull(mgr.getCurrentSessionFileName());
+ }
}
Modified:
core3/session-api/trunk/src/test/java/org/cytoscape/session/AbstractCySessionTest.java
===================================================================
---
core3/session-api/trunk/src/test/java/org/cytoscape/session/AbstractCySessionTest.java
2010-09-30 20:22:43 UTC (rev 22106)
+++
core3/session-api/trunk/src/test/java/org/cytoscape/session/AbstractCySessionTest.java
2010-09-30 20:39:53 UTC (rev 22107)
@@ -11,27 +11,12 @@
protected CySession session;
-
@Test
- public void testSessionName() {
- assertNotNull(session);
- assertNotNull(session.getSessionName());
- assertFalse(session.getSessionName().equals(""));
- }
-
- @Test
- public void testGetNetworks() {
- assertNotNull(session);
- assertNotNull(session.getNetworks());
- }
-
- @Test
public void testGetNetworkViews() {
assertNotNull(session);
assertNotNull(session.getNetworkViews());
}
-
-
+
@Test
public void testGetTables() {
assertNotNull(session);
@@ -39,23 +24,27 @@
}
@Test
- public void testGetVisualStyles() {
+ public void testGetViewVisualStyleMap() {
assertNotNull(session);
- assertNotNull(session.getVisualStyles());
+ assertNotNull(session.getViewVisualStyleMap());
}
@Test
- public void testGetProperties() {
+ public void testGetCytoscapeProperties() {
assertNotNull(session);
- assertNotNull(session.getProperties());
- assertNotNull(session.getProperties().get("cytoscape"));
- assertNotNull(session.getProperties().get("vizmap"));
+ assertNotNull(session.getCytoscapeProperties());
}
-
+
@Test
- public void testGetFilename() {
+ public void testGetVizmapProperties() {
assertNotNull(session);
- assertNotNull(session.getFileName());
- assertFalse(session.getSessionName().equals(""));
+ assertNotNull(session.getVizmapProperties());
}
+
+ @Test
+ public void testGetDesktopProperties() {
+ assertNotNull(session);
+ assertNotNull(session.getDesktopProperties());
+ }
+
}
--
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.
