Author: ruschein Date: 2010-12-09 10:35:24 -0800 (Thu, 09 Dec 2010) New Revision: 23146
Modified: core3/test-support/trunk/pom.xml core3/test-support/trunk/src/test/java/org/cytoscape/test/support/DataTableTestSupportTest.java Log: Fixed test failures. Modified: core3/test-support/trunk/pom.xml =================================================================== --- core3/test-support/trunk/pom.xml 2010-12-09 18:32:03 UTC (rev 23145) +++ core3/test-support/trunk/pom.xml 2010-12-09 18:35:24 UTC (rev 23146) @@ -1,5 +1,5 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -19,7 +19,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> @@ -34,7 +34,7 @@ <version>1.0-SNAPSHOT</version> <type>test-jar</type> </dependency> - <!-- the APIs we're supporting - these should remain relatively static --> + <!-- the APIs we're supporting - these should remain relatively static --> <dependency> <groupId>org.cytoscape</groupId> <artifactId>event-api</artifactId> @@ -67,11 +67,11 @@ <version>1.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.cytoscape</groupId> - <artifactId>equations-impl</artifactId> - <version>1.0-SNAPSHOT</version> - </dependency> + <dependency> + <groupId>org.cytoscape</groupId> + <artifactId>equations-impl</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.mockito</groupId> Modified: core3/test-support/trunk/src/test/java/org/cytoscape/test/support/DataTableTestSupportTest.java =================================================================== --- core3/test-support/trunk/src/test/java/org/cytoscape/test/support/DataTableTestSupportTest.java 2010-12-09 18:32:03 UTC (rev 23145) +++ core3/test-support/trunk/src/test/java/org/cytoscape/test/support/DataTableTestSupportTest.java 2010-12-09 18:35:24 UTC (rev 23146) @@ -1,20 +1,24 @@ package org.cytoscape.test.support; + import org.cytoscape.model.AbstractCyTableTest; import org.cytoscape.model.CyTableFactory; import org.cytoscape.model.CyTable; import org.cytoscape.model.CyRow; + +import org.junit.Before; +import org.junit.After; + import java.util.Random; + /** * This will verify that the network created by NetworkTestSupport * is a good network. */ public class DataTableTestSupportTest extends AbstractCyTableTest { - DataTableTestSupport support; CyTableFactory factory; - CyTable mgr; Random rand; public DataTableTestSupportTest() { @@ -23,14 +27,16 @@ rand = new Random(15); } + @Before public void setUp() { eventHelper = support.getDummyCyEventHelper(); - CyTable mgr = factory.createTable(Integer.toString( rand.nextInt(10000) ), "SUID", Long.class, false); - attrs = mgr.getRow(1l); + table = factory.createTable(Integer.toString( rand.nextInt(10000) ), "SUID", Long.class, false); + attrs = table.getRow(1l); } + @After public void tearDown() { - mgr = null; + table = null; attrs = null; } } -- 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.
