Author: kono
Date: 2012-04-17 13:22:26 -0700 (Tue, 17 Apr 2012)
New Revision: 28857
Added:
core3/api/trunk/webservice-api/src/test/java/org/cytoscape/webservice/events/
core3/api/trunk/webservice-api/src/test/java/org/cytoscape/webservice/events/DataImportFinishedEventTest.java
core3/api/trunk/webservice-api/src/test/java/org/cytoscape/webservice/events/SearchFinishedEventTest.java
Modified:
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/events/DataImportFinishedEvent.java
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/events/SearchFinishedEvent.java
core3/api/trunk/webservice-api/src/test/java/org/cytoscape/webservice/AbstractWebServiceClientTest.java
Log:
fixes #864 Unit tests cover all classes.
Modified:
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/events/DataImportFinishedEvent.java
===================================================================
---
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/events/DataImportFinishedEvent.java
2012-04-17 20:12:04 UTC (rev 28856)
+++
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/events/DataImportFinishedEvent.java
2012-04-17 20:22:26 UTC (rev 28857)
@@ -1,28 +1,37 @@
package org.cytoscape.io.webservice.events;
import org.cytoscape.event.AbstractCyEvent;
+import org.cytoscape.io.webservice.WebServiceClient;
/**
* An event indicating that data has been successfully imported.
- * @param <T> the generic type of the object associated with this
DataImportFinishedEvent.
+ *
+ * @param <T>
+ * the generic type of the object associated with this
+ * DataImportFinishedEvent.
* @CyAPI.Final.Class
*/
-public final class DataImportFinishedEvent<T> extends AbstractCyEvent<Object> {
+public final class DataImportFinishedEvent<T> extends
AbstractCyEvent<WebServiceClient> {
private final T imported;
-
+
/**
* Constructs the event.
- * @param source the source of the object that was imported.
- * @param imported the object that was imported.
+ *
+ * @param source
+ * the source of the object that was imported.
+ * @param imported
+ * the object that was imported.
*/
- public DataImportFinishedEvent(final Object source, final T imported) {
+ public DataImportFinishedEvent(final WebServiceClient source, final T
imported) {
super(source, DataImportFinishedListener.class);
-
+
this.imported = imported;
}
- /** Returns the object that was imported.
+ /**
+ * Returns the object that was imported.
+ *
* @return the object that was imported.
*/
public T getImportedObject() {
Modified:
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/events/SearchFinishedEvent.java
===================================================================
---
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/events/SearchFinishedEvent.java
2012-04-17 20:12:04 UTC (rev 28856)
+++
core3/api/trunk/webservice-api/src/main/java/org/cytoscape/io/webservice/events/SearchFinishedEvent.java
2012-04-17 20:22:26 UTC (rev 28857)
@@ -1,29 +1,35 @@
package org.cytoscape.io.webservice.events;
import org.cytoscape.event.AbstractCyEvent;
+import org.cytoscape.io.webservice.WebServiceClient;
/**
* An event that indicates a search has completed.
- * @param <T> The type of the search result.
+ *
+ * @param <T>
+ * The type of the search result.
* @CyAPI.Final.Class
*/
-public final class SearchFinishedEvent<T> extends AbstractCyEvent<Object> {
+public final class SearchFinishedEvent<T> extends
AbstractCyEvent<WebServiceClient> {
private final T searchResult;
-
+
/**
* Constructs the event.
- * @param source the source object firing the event.
- * @param result the search result object.
+ *
+ * @param source
+ * the source object firing the event.
+ * @param result
+ * the search result object.
*/
- public SearchFinishedEvent(final Object source, final T result) {
+ public SearchFinishedEvent(final WebServiceClient source, final T
result) {
super(source, SearchFinishedListener.class);
-
this.searchResult = result;
}
/**
* Returns The search result.
+ *
* @return The search result.
*/
public T getSearchResult() {
Modified:
core3/api/trunk/webservice-api/src/test/java/org/cytoscape/webservice/AbstractWebServiceClientTest.java
===================================================================
---
core3/api/trunk/webservice-api/src/test/java/org/cytoscape/webservice/AbstractWebServiceClientTest.java
2012-04-17 20:12:04 UTC (rev 28856)
+++
core3/api/trunk/webservice-api/src/test/java/org/cytoscape/webservice/AbstractWebServiceClientTest.java
2012-04-17 20:22:26 UTC (rev 28857)
@@ -1,36 +1,24 @@
package org.cytoscape.webservice;
-import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import java.net.URI;
-import org.cytoscape.io.webservice.WebServiceClient;
+import org.cytoscape.io.webservice.client.AbstractWebServiceClient;
import org.cytoscape.work.TaskIterator;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
public abstract class AbstractWebServiceClientTest {
- protected WebServiceClient client;
+ protected AbstractWebServiceClient client;
protected URI locationUri;
protected String displayName;
protected String description;
protected Object queryObject;
- @Before
- public void setUp() throws Exception {
- }
-
- @After
- public void tearDown() throws Exception {
- }
-
-
-
@Test
public void testGetServiceLocation() {
final URI serviceLocation = client.getServiceLocation();
Added:
core3/api/trunk/webservice-api/src/test/java/org/cytoscape/webservice/events/DataImportFinishedEventTest.java
===================================================================
---
core3/api/trunk/webservice-api/src/test/java/org/cytoscape/webservice/events/DataImportFinishedEventTest.java
(rev 0)
+++
core3/api/trunk/webservice-api/src/test/java/org/cytoscape/webservice/events/DataImportFinishedEventTest.java
2012-04-17 20:22:26 UTC (rev 28857)
@@ -0,0 +1,39 @@
+package org.cytoscape.webservice.events;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.cytoscape.io.webservice.WebServiceClient;
+import org.cytoscape.io.webservice.events.DataImportFinishedEvent;
+import org.cytoscape.io.webservice.events.DataImportFinishedListener;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class DataImportFinishedEventTest {
+
+ private DataImportFinishedEvent<?> event;
+
+ @Mock private WebServiceClient source;
+ @Mock private Object importedData;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ event = new DataImportFinishedEvent<Object>(source,
importedData);
+ }
+
+ @Test
+ public void testDataImportFinishedEvent() {
+ assertNotNull(event);
+ assertEquals(source, event.getSource());
+ assertEquals(DataImportFinishedListener.class,
event.getListenerClass());
+ }
+
+ @Test
+ public void testGetImportedObject() {
+ assertEquals(importedData, event.getImportedObject());
+ }
+
+}
Added:
core3/api/trunk/webservice-api/src/test/java/org/cytoscape/webservice/events/SearchFinishedEventTest.java
===================================================================
---
core3/api/trunk/webservice-api/src/test/java/org/cytoscape/webservice/events/SearchFinishedEventTest.java
(rev 0)
+++
core3/api/trunk/webservice-api/src/test/java/org/cytoscape/webservice/events/SearchFinishedEventTest.java
2012-04-17 20:22:26 UTC (rev 28857)
@@ -0,0 +1,38 @@
+package org.cytoscape.webservice.events;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.cytoscape.io.webservice.WebServiceClient;
+import org.cytoscape.io.webservice.events.SearchFinishedEvent;
+import org.cytoscape.io.webservice.events.SearchFinishedListener;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class SearchFinishedEventTest {
+
+ private SearchFinishedEvent<?> event;
+
+ @Mock private WebServiceClient source;
+ @Mock private Object result;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ event = new SearchFinishedEvent<Object>(source, result);
+ }
+
+ @Test
+ public void testSearchFinishedEvent() {
+ assertNotNull(event);
+ assertEquals(source, event.getSource());
+ assertEquals(SearchFinishedListener.class,
event.getListenerClass());
+ }
+
+ @Test
+ public void testGetSearchResult() {
+ assertEquals(result, event.getSearchResult());
+ }
+}
--
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.
