Author: ruschein
Date: 2010-10-25 14:22:39 -0700 (Mon, 25 Oct 2010)
New Revision: 22385
Added:
core3/session-api/trunk/src/test/java/org/cytoscape/session/events/
core3/session-api/trunk/src/test/java/org/cytoscape/session/events/AbstractNetworkEventTest.java
core3/session-api/trunk/src/test/java/org/cytoscape/session/events/AbstractNetworkViewEventTest.java
Modified:
core3/session-api/trunk/src/main/java/org/cytoscape/session/events/AbstractNetworkEvent.java
core3/session-api/trunk/src/main/java/org/cytoscape/session/events/AbstractNetworkViewEvent.java
Log:
Added more tests and tightened up the API by checking for certain null values.
Modified:
core3/session-api/trunk/src/main/java/org/cytoscape/session/events/AbstractNetworkEvent.java
===================================================================
---
core3/session-api/trunk/src/main/java/org/cytoscape/session/events/AbstractNetworkEvent.java
2010-10-25 21:21:15 UTC (rev 22384)
+++
core3/session-api/trunk/src/main/java/org/cytoscape/session/events/AbstractNetworkEvent.java
2010-10-25 21:22:39 UTC (rev 22385)
@@ -1,22 +1,26 @@
+package org.cytoscape.session.events;
-package org.cytoscape.session.events;
-
import org.cytoscape.session.CyNetworkManager;
import org.cytoscape.event.AbstractCyEvent;
import org.cytoscape.model.CyNetwork;
+
/**
- *
+ * Base class for all derived concrete event classes classes in this package
that require a CyNetwork.
*/
class AbstractNetworkEvent extends AbstractCyEvent<CyNetworkManager> {
private final CyNetwork net;
+
AbstractNetworkEvent(final CyNetworkManager source, final Class
listenerClass, final CyNetwork net) {
super(source, listenerClass);
+
+ if (net == null)
+ throw new NullPointerException("the \"net\" parameter
must never be null!");
this.net = net;
}
- public CyNetwork getNetwork() {
+ public final CyNetwork getNetwork() {
return net;
}
}
Modified:
core3/session-api/trunk/src/main/java/org/cytoscape/session/events/AbstractNetworkViewEvent.java
===================================================================
---
core3/session-api/trunk/src/main/java/org/cytoscape/session/events/AbstractNetworkViewEvent.java
2010-10-25 21:21:15 UTC (rev 22384)
+++
core3/session-api/trunk/src/main/java/org/cytoscape/session/events/AbstractNetworkViewEvent.java
2010-10-25 21:22:39 UTC (rev 22385)
@@ -1,22 +1,26 @@
+package org.cytoscape.session.events;
-package org.cytoscape.session.events;
-
import org.cytoscape.session.CyNetworkManager;
import org.cytoscape.event.AbstractCyEvent;
import org.cytoscape.view.model.CyNetworkView;
+
/**
- *
+ * Base class for all derived concrete event classes classes in this package
that require a CyNetworkView.
*/
class AbstractNetworkViewEvent extends AbstractCyEvent<CyNetworkManager> {
private final CyNetworkView view;
+
AbstractNetworkViewEvent(final CyNetworkManager source, final Class
listenerClass, final CyNetworkView view) {
super(source, listenerClass);
+
+ if (view == null)
+ throw new NullPointerException("the \"view\" parameter
must never be null!");
this.view = view;
}
- public CyNetworkView getNetworkView() {
+ final public CyNetworkView getNetworkView() {
return view;
}
}
Added:
core3/session-api/trunk/src/test/java/org/cytoscape/session/events/AbstractNetworkEventTest.java
===================================================================
---
core3/session-api/trunk/src/test/java/org/cytoscape/session/events/AbstractNetworkEventTest.java
(rev 0)
+++
core3/session-api/trunk/src/test/java/org/cytoscape/session/events/AbstractNetworkEventTest.java
2010-10-25 21:22:39 UTC (rev 22385)
@@ -0,0 +1,34 @@
+package org.cytoscape.session.events;
+
+
+import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.model.CyNetwork;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+import static org.mockito.Mockito.*;
+
+
+public class AbstractNetworkEventTest {
+ @Test
+ public final void testGetNetwork() {
+ final CyNetworkManager networkManager =
mock(CyNetworkManager.class);
+ final CyNetwork network = mock(CyNetwork.class);
+ final AbstractNetworkEvent event = new
AbstractNetworkEvent(networkManager, Object.class, network);
+ assertEquals("Network returned by getNetwork() is *not* the one
passed into the constructor!",
+ network, event.getNetwork());
+ }
+
+ @Test
+ public final void testNullNetworkConstructorFailure() {
+ final CyNetworkManager networkManager =
mock(CyNetworkManager.class);
+ try {
+ final AbstractNetworkEvent event = new
AbstractNetworkEvent(networkManager, Object.class, null);
+ } catch (final NullPointerException e) {
+ return;
+ }
+
+ fail("The expected NullPointerException was *not* triggered!");
+ }
+}
\ No newline at end of file
Added:
core3/session-api/trunk/src/test/java/org/cytoscape/session/events/AbstractNetworkViewEventTest.java
===================================================================
---
core3/session-api/trunk/src/test/java/org/cytoscape/session/events/AbstractNetworkViewEventTest.java
(rev 0)
+++
core3/session-api/trunk/src/test/java/org/cytoscape/session/events/AbstractNetworkViewEventTest.java
2010-10-25 21:22:39 UTC (rev 22385)
@@ -0,0 +1,36 @@
+package org.cytoscape.session.events;
+
+
+import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.view.model.CyNetworkView;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+import static org.mockito.Mockito.*;
+
+
+public class AbstractNetworkViewEventTest {
+ @Test
+ public final void testGetNetwork() {
+ final CyNetworkManager networkManager =
mock(CyNetworkManager.class);
+ final CyNetworkView networkView = mock(CyNetworkView.class);
+ final AbstractNetworkViewEvent event =
+ new AbstractNetworkViewEvent(networkManager,
Object.class, networkView);
+ assertEquals("Network returned by getNetworkView() is *not* the
one passed into the constructor!",
+ networkView, event.getNetworkView());
+ }
+
+ @Test
+ public final void testNullNetworkConstructorFailure() {
+ final CyNetworkManager networkManager =
mock(CyNetworkManager.class);
+ try {
+ final AbstractNetworkViewEvent event =
+ new AbstractNetworkViewEvent(networkManager,
Object.class, null);
+ } catch (final NullPointerException e) {
+ return;
+ }
+
+ fail("The expected NullPointerException was *not* triggered!");
+ }
+}
\ No newline at end of file
--
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.
