Author: kono
Date: 2012-04-17 14:48:33 -0700 (Tue, 17 Apr 2012)
New Revision: 28867
Added:
core3/api/trunk/datasource-api/src/test/java/org/cytoscape/datasource/DefaultDataSourceTest.java
Modified:
core3/api/trunk/datasource-api/src/main/java/org/cytoscape/datasource/DefaultDataSource.java
core3/api/trunk/datasource-api/src/test/java/org/cytoscape/datasource/AbstractDataSourceTest.java
Log:
fixes #866 Unit tests had been added to Datasource-api.
Modified:
core3/api/trunk/datasource-api/src/main/java/org/cytoscape/datasource/DefaultDataSource.java
===================================================================
---
core3/api/trunk/datasource-api/src/main/java/org/cytoscape/datasource/DefaultDataSource.java
2012-04-17 21:45:54 UTC (rev 28866)
+++
core3/api/trunk/datasource-api/src/main/java/org/cytoscape/datasource/DefaultDataSource.java
2012-04-17 21:48:33 UTC (rev 28867)
@@ -10,7 +10,7 @@
* In general, most of the data sources can be encoded with this default
implementation.
*
*/
-public class DefaultDataSource implements DataSource {
+public final class DefaultDataSource implements DataSource {
private final String name;
private final String provider;
Modified:
core3/api/trunk/datasource-api/src/test/java/org/cytoscape/datasource/AbstractDataSourceTest.java
===================================================================
---
core3/api/trunk/datasource-api/src/test/java/org/cytoscape/datasource/AbstractDataSourceTest.java
2012-04-17 21:45:54 UTC (rev 28866)
+++
core3/api/trunk/datasource-api/src/test/java/org/cytoscape/datasource/AbstractDataSourceTest.java
2012-04-17 21:48:33 UTC (rev 28867)
@@ -1,17 +1,54 @@
package org.cytoscape.datasource;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.net.URL;
+
+import org.cytoscape.io.DataCategory;
import org.junit.Test;
public abstract class AbstractDataSourceTest {
- private final DataSource source;
+ protected DataSource source;
+ protected String provider;
+ protected String name;
+ protected String description;
+ protected DataCategory category;
+ protected URL location;
+
- AbstractDataSourceTest(final DataSource source) {
- this.source = source;
- }
-
@Test
public void testDataSource() {
- source.getDataCategory();
+ assertNotNull(source);
}
-}
+
+ @Test
+ public void testGetProvider() {
+ final String provider = source.getProvider();
+ assertEquals(this.provider, provider);
+ }
+
+ @Test
+ public void testGetName() {
+ final String name = source.getName();
+ assertEquals(this.name, name);
+ }
+
+ @Test
+ public void testGetDescription() {
+ assertEquals(this.description, source.getDescription());
+ }
+
+ @Test
+ public void testGetDataCategory() {
+ final DataCategory category = source.getDataCategory();
+ assertEquals(this.category, category);
+ }
+
+ @Test
+ public void testGetLocation() {
+ final URL location = source.getLocation();
+ assertEquals(this.location, location);
+ }
+}
\ No newline at end of file
Added:
core3/api/trunk/datasource-api/src/test/java/org/cytoscape/datasource/DefaultDataSourceTest.java
===================================================================
---
core3/api/trunk/datasource-api/src/test/java/org/cytoscape/datasource/DefaultDataSourceTest.java
(rev 0)
+++
core3/api/trunk/datasource-api/src/test/java/org/cytoscape/datasource/DefaultDataSourceTest.java
2012-04-17 21:48:33 UTC (rev 28867)
@@ -0,0 +1,23 @@
+package org.cytoscape.datasource;
+
+import static org.junit.Assert.*;
+
+import java.net.URL;
+
+import org.cytoscape.io.DataCategory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class DefaultDataSourceTest extends AbstractDataSourceTest {
+
+ @Before
+ public void setUp() throws Exception {
+ this.name = "test source";
+ this.provider = "dummy provider";
+ this.description = "dummy data source";
+ this.category = DataCategory.NETWORK;
+ this.location = new URL("http://chianti.ucsd.edu/test.sif";);
+ this.source = new DefaultDataSource(name, provider,
description, category, location);
+ }
+}
--
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.
