Author: kono
Date: 2011-09-28 10:39:37 -0700 (Wed, 28 Sep 2011)
New Revision: 27009
Modified:
core3/impl/trunk/table-import-impl/pom.xml
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/GeneAssociationReaderTest.java
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/OBOReaderTest.java
Log:
Imports are organized to use Ding test support.
Modified: core3/impl/trunk/table-import-impl/pom.xml
===================================================================
--- core3/impl/trunk/table-import-impl/pom.xml 2011-09-28 17:36:23 UTC (rev
27008)
+++ core3/impl/trunk/table-import-impl/pom.xml 2011-09-28 17:39:37 UTC (rev
27009)
@@ -231,6 +231,19 @@
<artifactId>equations-api</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>ding-presentation-impl</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cytoscape</groupId>
+ <artifactId>ding-presentation-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/GeneAssociationReaderTest.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/GeneAssociationReaderTest.java
2011-09-28 17:36:23 UTC (rev 27008)
+++
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/GeneAssociationReaderTest.java
2011-09-28 17:39:37 UTC (rev 27009)
@@ -1,13 +1,17 @@
package org.cytoscape.tableimport.internal.reader.ontology;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import java.io.File;
import java.util.List;
import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.ding.NetworkViewTestSupport;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
@@ -16,12 +20,10 @@
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.CyTableManager;
+import org.cytoscape.model.NetworkTestSupport;
import org.cytoscape.model.TableTestSupport;
-import org.cytoscape.model.NetworkTestSupport;
-import org.cytoscape.view.model.NetworkViewTestSupport;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.work.TaskMonitor;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified:
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/OBOReaderTest.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/OBOReaderTest.java
2011-09-28 17:36:23 UTC (rev 27008)
+++
core3/impl/trunk/table-import-impl/src/test/java/org/cytoscape/tableimport/internal/reader/ontology/OBOReaderTest.java
2011-09-28 17:39:37 UTC (rev 27009)
@@ -1,18 +1,18 @@
package org.cytoscape.tableimport.internal.reader.ontology;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.mock;
import java.io.File;
-import java.util.Map;
+import org.cytoscape.ding.NetworkViewTestSupport;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkFactory;
import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.NetworkTestSupport;
-import org.cytoscape.view.model.NetworkViewTestSupport;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.junit.After;
import org.junit.Before;
--
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.
