Author: mes
Date: 2010-10-25 16:16:05 -0700 (Mon, 25 Oct 2010)
New Revision: 22413
Modified:
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPlugin.java
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
core3/plugin-api/trunk/src/test/java/org/cytoscape/plugin/CyPluginAdapterTest.java
Log:
fixes to unit tests and renamed method
Modified:
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPlugin.java
===================================================================
--- core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPlugin.java
2010-10-25 23:12:54 UTC (rev 22412)
+++ core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPlugin.java
2010-10-25 23:16:05 UTC (rev 22413)
@@ -37,6 +37,8 @@
* </pre></blockquote>
*/
public CyPlugin(final CyPluginAdapter adapter) {
+ if ( adapter == null )
+ throw new NullPointerException("null adapter");
this.adapter = adapter;
}
}
Modified:
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
===================================================================
---
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
2010-10-25 23:12:54 UTC (rev 22412)
+++
core3/plugin-api/trunk/src/main/java/org/cytoscape/plugin/CyPluginAdapter.java
2010-10-25 23:16:05 UTC (rev 22413)
@@ -39,7 +39,7 @@
* Returns an instance of {...@link CyTableFactory}.
* @return an instance of {...@link CyTableFactory}.
*/
- CyTableFactory getCyDataTableFactory();
+ CyTableFactory getCyTableFactory();
/**
* Returns an instance of {...@link CyRootNetworkFactory}.
Modified:
core3/plugin-api/trunk/src/test/java/org/cytoscape/plugin/CyPluginAdapterTest.java
===================================================================
---
core3/plugin-api/trunk/src/test/java/org/cytoscape/plugin/CyPluginAdapterTest.java
2010-10-25 23:12:54 UTC (rev 22412)
+++
core3/plugin-api/trunk/src/test/java/org/cytoscape/plugin/CyPluginAdapterTest.java
2010-10-25 23:16:05 UTC (rev 22413)
@@ -1,76 +1,64 @@
package org.cytoscape.plugin;
import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
+public abstract class CyPluginAdapterTest {
-public abstract class CyPluginAdapterTest extends TestCase {
-
protected CyPluginAdapter adapter;
@Test
- public void testGetCyDataTableFactory(){
- assertNotNull("dataTable
exists",adapter.getCyDataTableFactory());
+ public void testGetCyTableFactory() {
+ assertNotNull("dataTable exists",adapter.getCyTableFactory());
}
@Test
- public void testGetCyEventHelper()
- {
+ public void testGetCyEventHelper() {
assertNotNull("dataTable exists",adapter.getCyEventHelper());
}
@Test
- public void testGetCyLayouts()
- {
+ public void testGetCyLayouts() {
assertNotNull("CyLayouts exists",adapter.getCyLayouts());
}
@Test
- public void testGetCyNetworkFactory()
- {
+ public void testGetCyNetworkFactory() {
assertNotNull("CyLayouts exists",adapter.getCyNetworkFactory());
}
@Test
- public void testGetCyNetworkManager()
- {
+ public void testGetCyNetworkManager() {
assertNotNull("CyNetworkManager
exists",adapter.getCyNetworkManager());
}
@Test
- public void testGetCyNetworkViewFactory()
- {
+ public void testGetCyNetworkViewFactory() {
assertNotNull("CyLayouts
exists",adapter.getCyNetworkViewFactory());
}
@Test
- public void testGetCyRootNetworkFactory()
- {
+ public void testGetCyRootNetworkFactory() {
assertNotNull("CyLayouts
exists",adapter.getCyRootNetworkFactory());
}
@Test
- public void testGetCySessionManager()
- {
+ public void testGetCySessionManager() {
assertNotNull("CyLayouts exists",adapter.getCySessionManager());
}
@Test
- public void testGetPresentationFactory()
- {
+ public void testGetPresentationFactory() {
assertNotNull("PresentationFactory
exists",adapter.getPresentationFactory());
}
@Test
- public void testGetTaskManager()
- {
+ public void testGetTaskManager() {
assertNotNull("TaskManager exists",adapter.getTaskManager());
}
@Test
- public void testGetVisualMappingManager()
- {
+ public void testGetVisualMappingManager() {
assertNotNull("VisualMappingManager
exists",adapter.getVisualMappingManager());
}
-
}
--
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.
