Author: kono
Date: 2011-08-11 18:36:45 -0700 (Thu, 11 Aug 2011)
New Revision: 26538
Removed:
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/CyApplicationManager.java
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkEvent.java
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkListener.java
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkViewEvent.java
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkViewListener.java
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentRenderingEngineEvent.java
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentRenderingEngineListener.java
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworkViewsEvent.java
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworkViewsListener.java
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworksEvent.java
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworksListener.java
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetCurrentNetworkEventTest.java
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetCurrentNetworkViewEventTest.java
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetCurrentRenderingEngineEventTest.java
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetSelectedNetworksEventTest.java
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetSelectedNteworkViewsEventTest.java
Modified:
core3/api/trunk/session-api/pom.xml
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SessionLoadedEventTest.java
Log:
Other bundles had been refactored to use new application-api.
Modified: core3/api/trunk/session-api/pom.xml
===================================================================
--- core3/api/trunk/session-api/pom.xml 2011-08-12 01:28:02 UTC (rev 26537)
+++ core3/api/trunk/session-api/pom.xml 2011-08-12 01:36:45 UTC (rev 26538)
@@ -13,7 +13,6 @@
</properties>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.cytoscape</groupId>
<artifactId>session-api</artifactId>
<name>${bundle.symbolicName}</name>
Deleted:
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/CyApplicationManager.java
===================================================================
---
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/CyApplicationManager.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/CyApplicationManager.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,120 +0,0 @@
-/*
- File: CyApplicationManager.java
-
- Copyright (c) 2006, 2010, 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.session;
-
-
-import java.util.List;
-
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.presentation.RenderingEngine;
-
-
-/**
- * Basic access to current and/or currently selected networks,
- * views and rendering engines in an instance of Cytoscape.
- */
-public interface CyApplicationManager {
- /**
- * Provides access to the current network.
- * @return the current network or null if there is no current network
- */
- public CyNetwork getCurrentNetwork();
-
- /**
- * Sets the current network to the one with the provided network SUID.
- * @param network_id must be the SUID of a network
- */
- public void setCurrentNetwork(final long network_id);
-
- /**
- * Returns the current network view.
- * @return the current network view or null if no network
- * is currently being visualised
- */
- public CyNetworkView getCurrentNetworkView();
-
- /**
- * Sets the current network view based on the specified id.
- * @param view_id The <i>network</i> SUID of the network view to
- * be made current.
- */
- public void setCurrentNetworkView(final long view_id);
-
- /**
- * Returns the list of selected networks.
- * @return The list of selected networks.
- */
- public List<CyNetwork> getSelectedNetworks();
-
- /**
- * Returns the list of selected network views.
- * @return The list of selected network views.
- */
- public List<CyNetworkView> getSelectedNetworkViews();
-
- /**
- * Sets the network views associated with the specified network
- * ids as selected.
- * @param modelIDs The <i>model</i> SUIDs of the networks that have
- * been selected.
- */
- public void setSelectedNetworkViews(final List<Long> modelIDs);
-
- /**
- * Sets the networks associated with the specified ids as selected.
- * @param ids The SUIDs of the networks that have been selected.
- */
- public void setSelectedNetworks(final List<Long> ids);
-
- /**
- * Returns the rendering engine associated with the current network
view.
- * @return The rendering engine associated with the current network
view.
- */
- public RenderingEngine<CyNetwork> getCurrentRenderingEngine();
-
- /**
- * Sets the current rendering engine.
- * @param engine The rendering engine that should be made current.
- */
- public void setCurrentRenderingEngine(final RenderingEngine<CyNetwork>
engine);
-
- /**
- * Returns the currently active table.
- */
- public CyTable getCurrentTable();
-
- /**
- * Sets the currently active table.
- * @param table The table that should be made current.
- */
- public void setCurrentTable(CyTable table);
-}
Deleted:
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkEvent.java
===================================================================
---
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkEvent.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkEvent.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,34 +0,0 @@
-package org.cytoscape.session.events;
-
-
-import org.cytoscape.event.AbstractCyEvent;
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.session.CyApplicationManager;
-
-
-/**
- * An event signaling that the a network has been set to current.
- */
-public final class SetCurrentNetworkEvent extends
AbstractCyEvent<CyApplicationManager> {
-
-
- private final CyNetwork net;
-
- /**
- * Returns the network associated with this event. The network returned
may be null!
- * @return the network associated with this event.
- */
- public final CyNetwork getNetwork() {
- return net;
- }
-
- /**
- * Constructor.
- * @param source The application manager that is the source of the
event.
- * @param net The network that has been set to the current network.
- */
- public SetCurrentNetworkEvent(final CyApplicationManager source, final
CyNetwork net) {
- super(source, SetCurrentNetworkListener.class);
- this.net = net;
- }
-}
Deleted:
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkListener.java
===================================================================
---
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkListener.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkListener.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,15 +0,0 @@
-
-package org.cytoscape.session.events;
-
-import org.cytoscape.event.CyListener;
-
-/**
- * A listener for {@link SetCurrentNetworkEvent}s.
- */
-public interface SetCurrentNetworkListener extends CyListener {
- /**
- * Processes the specified event when fired.
- * @param e The event that the listener is listening for.
- */
- public void handleEvent(SetCurrentNetworkEvent e);
-}
Deleted:
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkViewEvent.java
===================================================================
---
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkViewEvent.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkViewEvent.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,35 +0,0 @@
-package org.cytoscape.session.events;
-
-
-import org.cytoscape.event.AbstractCyEvent;
-import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.view.model.CyNetworkView;
-
-
-/**
- * An event indicating that a network view has been set to current.
- */
-public final class SetCurrentNetworkViewEvent extends
AbstractCyEvent<CyApplicationManager> {
-
-
- private final CyNetworkView view;
-
- /**
- * Returns the network view associated with this event. The view
returned may be null!
- * @return the network view associated with this event.
- */
- final public CyNetworkView getNetworkView() {
- return view;
- }
-
-
- /**
- * Constructor.
- * @param source The application manager firing this event.
- * @param view The network view that has been set as current.
- */
- public SetCurrentNetworkViewEvent(final CyApplicationManager source,
final CyNetworkView view) {
- super(source, SetCurrentNetworkViewListener.class);
- this.view = view;
- }
-}
Deleted:
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkViewListener.java
===================================================================
---
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkViewListener.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentNetworkViewListener.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,15 +0,0 @@
-
-package org.cytoscape.session.events;
-
-import org.cytoscape.event.CyListener;
-
-/**
- * A listener for {@link SetCurrentNetworkViewEvent}s.
- */
-public interface SetCurrentNetworkViewListener extends CyListener {
- /**
- * Processes the specified event when fired.
- * @param e The event that the listener is listening for.
- */
- public void handleEvent(SetCurrentNetworkViewEvent e);
-}
Deleted:
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentRenderingEngineEvent.java
===================================================================
---
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentRenderingEngineEvent.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentRenderingEngineEvent.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,29 +0,0 @@
-package org.cytoscape.session.events;
-
-import org.cytoscape.event.AbstractCyEvent;
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.view.presentation.RenderingEngine;
-
-public final class SetCurrentRenderingEngineEvent extends
- AbstractCyEvent<CyApplicationManager>{
-
- private final RenderingEngine<CyNetwork> engine;
-
- /**
- * Constructor.
- *
- * @param source
- * The application manager firing this event.
- * @param engine
- * The rendering engine (presentation) that has been set as
current.
- */
- public SetCurrentRenderingEngineEvent(final CyApplicationManager
source, final RenderingEngine<CyNetwork> engine) {
- super(source, SetCurrentRenderingEngineListener.class);
- this.engine = engine;
- }
-
- public RenderingEngine<CyNetwork> getRenderingEngine() {
- return this.engine;
- }
-}
\ No newline at end of file
Deleted:
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentRenderingEngineListener.java
===================================================================
---
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentRenderingEngineListener.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetCurrentRenderingEngineListener.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,13 +0,0 @@
-package org.cytoscape.session.events;
-
-import org.cytoscape.event.CyListener;
-
-public interface SetCurrentRenderingEngineListener extends CyListener {
- /**
- * Processes the specified event when fired.
- *
- * @param e
- * The event that the listener is listening for.
- */
- public void handleEvent(final SetCurrentRenderingEngineEvent e);
-}
Deleted:
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworkViewsEvent.java
===================================================================
---
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworkViewsEvent.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworkViewsEvent.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,34 +0,0 @@
-package org.cytoscape.session.events;
-
-
-import java.util.List;
-
-import org.cytoscape.event.AbstractCyEvent;
-import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.view.model.CyNetworkView;
-
-
-/**
- * An event that indicates that a collection of network views has been
selected.
- */
-public final class SetSelectedNetworkViewsEvent extends
AbstractCyEvent<CyApplicationManager> {
- private final List<CyNetworkView> views;
-
- /**
- * Constructor.
- * @param source The application manager firing the event.
- * @param views A list of CyNetworkViews that have been selected.
- */
- public SetSelectedNetworkViewsEvent(final CyApplicationManager source,
final List<CyNetworkView> views) {
- super(source, SetSelectedNetworkViewsListener.class);
- this.views = views;
- }
-
- /**
- * Returns the list of network views that have been selected.
- * @return The list of network views that have been selected.
- */
- public List<CyNetworkView> getNetworkViews() {
- return views;
- }
-}
Deleted:
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworkViewsListener.java
===================================================================
---
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworkViewsListener.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworkViewsListener.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,15 +0,0 @@
-
-package org.cytoscape.session.events;
-
-import org.cytoscape.event.CyListener;
-
-/**
- * A listener for {@link SetSelectedNetworkViewsEvent}s.
- */
-public interface SetSelectedNetworkViewsListener extends CyListener {
- /**
- * Processes the specified event when fired.
- * @param e The event that the listener is listening for.
- */
- public void handleEvent(SetSelectedNetworkViewsEvent e);
-}
Deleted:
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworksEvent.java
===================================================================
---
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworksEvent.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworksEvent.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,33 +0,0 @@
-package org.cytoscape.session.events;
-
-
-import java.util.List;
-
-import org.cytoscape.event.AbstractCyEvent;
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.session.CyApplicationManager;
-
-/**
- * An event indicating the a collection of networks has been selected.
- */
-public final class SetSelectedNetworksEvent extends
AbstractCyEvent<CyApplicationManager> {
- private final List<CyNetwork> networks;
-
- /**
- * Constructor.
- * @param source the application manager firing the event.
- * @param networks the collection of networks that has been selected.
- */
- public SetSelectedNetworksEvent(final CyApplicationManager source,
final List<CyNetwork> networks) {
- super(source,SetSelectedNetworksListener.class);
- this.networks = networks;
- }
-
- /**
- * Returns the list of networks selected.
- * @return The list of networks selected.
- */
- public List<CyNetwork> getNetworks() {
- return networks;
- }
-}
Deleted:
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworksListener.java
===================================================================
---
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworksListener.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/main/java/org/cytoscape/session/events/SetSelectedNetworksListener.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,15 +0,0 @@
-
-package org.cytoscape.session.events;
-
-import org.cytoscape.event.CyListener;
-
-/**
- * A listener for {@link SetSelectedNetworksEvent}s.
- */
-public interface SetSelectedNetworksListener extends CyListener {
- /**
- * Processes the specified event when fired.
- * @param e The event that the listener is listening for.
- */
- public void handleEvent(SetSelectedNetworksEvent e);
-}
Modified:
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SessionLoadedEventTest.java
===================================================================
---
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SessionLoadedEventTest.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SessionLoadedEventTest.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,9 +1,9 @@
package org.cytoscape.session.events;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import java.io.File;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -12,7 +12,6 @@
import org.cytoscape.model.CyTableMetadata;
import org.cytoscape.property.bookmark.Bookmarks;
import org.cytoscape.property.session.Cysession;
-import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.CySession;
import org.cytoscape.session.CySessionManager;
import org.cytoscape.view.model.CyNetworkView;
Deleted:
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetCurrentNetworkEventTest.java
===================================================================
---
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetCurrentNetworkEventTest.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetCurrentNetworkEventTest.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,30 +0,0 @@
-package org.cytoscape.session.events;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.mock;
-
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.session.CyApplicationManager;
-import org.junit.Test;
-
-public class SetCurrentNetworkEventTest {
-
- @Test
- public void testGoodGetNetwork() {
- CyApplicationManager source = mock(CyApplicationManager.class);
- CyNetwork n = mock(CyNetwork.class);
- SetCurrentNetworkEvent e = new SetCurrentNetworkEvent(source,n);
- assertNotNull( e.getNetwork() );
- assertEquals( n,e.getNetwork() );
- }
-
- @Test
- public void testNullGetNetwork() {
- CyApplicationManager source = mock(CyApplicationManager.class);
- SetCurrentNetworkEvent e = new
SetCurrentNetworkEvent(source,null);
- assertNull( e.getNetwork() );
- }
-
-}
Deleted:
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetCurrentNetworkViewEventTest.java
===================================================================
---
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetCurrentNetworkViewEventTest.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetCurrentNetworkViewEventTest.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,30 +0,0 @@
-package org.cytoscape.session.events;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.mock;
-
-import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.view.model.CyNetworkView;
-import org.junit.Test;
-
-public class SetCurrentNetworkViewEventTest {
-
- @Test
- public void testGoodGetNetworkView() {
- CyApplicationManager source = mock(CyApplicationManager.class);
- CyNetworkView n = mock(CyNetworkView.class);
- SetCurrentNetworkViewEvent e = new
SetCurrentNetworkViewEvent(source,n);
- assertNotNull( e.getNetworkView() );
- assertEquals( n,e.getNetworkView() );
- }
-
- @Test
- public void testNullGetNetworkView() {
- CyApplicationManager source = mock(CyApplicationManager.class);
- SetCurrentNetworkViewEvent e = new
SetCurrentNetworkViewEvent(source,null);
- assertNull( e.getNetworkView() );
- }
-
-}
Deleted:
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetCurrentRenderingEngineEventTest.java
===================================================================
---
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetCurrentRenderingEngineEventTest.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetCurrentRenderingEngineEventTest.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,39 +0,0 @@
-package org.cytoscape.session.events;
-
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.view.presentation.RenderingEngine;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class SetCurrentRenderingEngineEventTest {
-
- @Mock
- private RenderingEngine<CyNetwork> engine;
- @Mock
- private CyApplicationManager source;
-
- @Before
- public void initMocks() {
- MockitoAnnotations.initMocks(this);
- }
-
- @Test
- public void testGoodGetRenderingEngine() {
- final SetCurrentRenderingEngineEvent e = new
SetCurrentRenderingEngineEvent(source, engine);
- assertNotNull(e.getRenderingEngine());
- assertEquals(engine, e.getRenderingEngine());
- }
-
- @Test
- public void testNullGetRenderingEngine() {
- final SetCurrentRenderingEngineEvent e = new
SetCurrentRenderingEngineEvent(source, null);
- assertNull(e.getRenderingEngine());
- }
-}
Deleted:
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetSelectedNetworksEventTest.java
===================================================================
---
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetSelectedNetworksEventTest.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetSelectedNetworksEventTest.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,39 +0,0 @@
-package org.cytoscape.session.events;
-
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.session.CyApplicationManager;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class SetSelectedNetworksEventTest {
-
- @Mock
- private CyApplicationManager source;
-
- @Before
- public void initMocks() {
- MockitoAnnotations.initMocks(this);
- }
-
- @Test
- public void testGoodGetSelectedNetworksEvent() {
- final List<CyNetwork> networks = new ArrayList<CyNetwork>();
- final SetSelectedNetworksEvent e = new
SetSelectedNetworksEvent(source, networks);
- assertNotNull(e.getNetworks());
- assertEquals(networks, e.getNetworks());
- }
-
- @Test
- public void testNullGetSelectedNetworksEvent() {
- final SetSelectedNetworksEvent e = new
SetSelectedNetworksEvent(source, null);
- assertNull(e.getNetworks());
- }
-
-}
Deleted:
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetSelectedNteworkViewsEventTest.java
===================================================================
---
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetSelectedNteworkViewsEventTest.java
2011-08-12 01:28:02 UTC (rev 26537)
+++
core3/api/trunk/session-api/src/test/java/org/cytoscape/session/events/SetSelectedNteworkViewsEventTest.java
2011-08-12 01:36:45 UTC (rev 26538)
@@ -1,40 +0,0 @@
-package org.cytoscape.session.events;
-
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.view.model.CyNetworkView;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class SetSelectedNteworkViewsEventTest {
-
- @Mock
- private CyApplicationManager source;
-
- @Before
- public void initMocks() {
- MockitoAnnotations.initMocks(this);
- }
-
- @Test
- public void testGoodGetSelectedNetworkViewsEvent() {
- final List<CyNetworkView> views = new
ArrayList<CyNetworkView>();
- final SetSelectedNetworkViewsEvent e = new
SetSelectedNetworkViewsEvent(source, views);
- assertNotNull(e.getNetworkViews());
- assertEquals(views, e.getNetworkViews());
- }
-
- @Test
- public void testNullGetSelectedNetworkViewsEvent() {
- final SetSelectedNetworkViewsEvent e = new
SetSelectedNetworkViewsEvent(source, null);
- assertNull(e.getNetworkViews());
- }
-
-}
--
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.
