Author: mes Date: 2010-10-26 11:07:27 -0700 (Tue, 26 Oct 2010) New Revision: 22442
Modified: core3/test-support/trunk/pom.xml core3/test-support/trunk/src/main/java/org/cytoscape/test/support/DataTableTestSupport.java core3/test-support/trunk/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java Log: support for CyTableFactory and CyTableManager refactoring Modified: core3/test-support/trunk/pom.xml =================================================================== --- core3/test-support/trunk/pom.xml 2010-10-26 18:06:51 UTC (rev 22441) +++ core3/test-support/trunk/pom.xml 2010-10-26 18:07:27 UTC (rev 22442) @@ -1,38 +1,19 @@ <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";> + <modelVersion>4.0.0</modelVersion> + <parent> <artifactId>parent</artifactId> <groupId>org.cytoscape</groupId> <version>1.0-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <groupId>org.cytoscape</groupId> <artifactId>test-support</artifactId> <packaging>jar</packaging> <version>1.0-SNAPSHOT</version> <name>test-support</name> - <url>http://maven.apache.org</url> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <optimize>true</optimize> - <showWarnings>true</showWarnings> - <showDeprecation>true</showDeprecation> - <compilerArguments> - <Xlint:all></Xlint:all> - <Xlint:-path></Xlint:-path> - <Xmaxwarns>10000</Xmaxwarns> - <Xmaxerrs>10000</Xmaxerrs> - </compilerArguments> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <!-- testing the testers!!! --> <dependency> Modified: core3/test-support/trunk/src/main/java/org/cytoscape/test/support/DataTableTestSupport.java =================================================================== --- core3/test-support/trunk/src/main/java/org/cytoscape/test/support/DataTableTestSupport.java 2010-10-26 18:06:51 UTC (rev 22441) +++ core3/test-support/trunk/src/main/java/org/cytoscape/test/support/DataTableTestSupport.java 2010-10-26 18:07:27 UTC (rev 22442) @@ -8,7 +8,10 @@ import org.cytoscape.model.CyTableFactory; import org.cytoscape.model.internal.CyTableFactoryImpl; +import org.cytoscape.model.internal.CyTableManagerImpl; +import static org.mockito.Mockito.*; + public class DataTableTestSupport { protected CyTableFactory tableFactory; @@ -16,7 +19,7 @@ public DataTableTestSupport() { eventHelper = new DummyCyEventHelper(); - tableFactory = new CyTableFactoryImpl( eventHelper ); + tableFactory = new CyTableFactoryImpl( eventHelper, mock(CyTableManagerImpl.class) ); } public CyTableFactory getDataTableFactory() { Modified: core3/test-support/trunk/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java =================================================================== --- core3/test-support/trunk/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java 2010-10-26 18:06:51 UTC (rev 22441) +++ core3/test-support/trunk/src/main/java/org/cytoscape/test/support/NetworkTestSupport.java 2010-10-26 18:07:27 UTC (rev 22442) @@ -22,7 +22,7 @@ public NetworkTestSupport() { eventHelper = new DummyCyEventHelper(); tableMgr = mock(CyTableManagerImpl.class); - CyTableFactoryImpl tableFactory = new CyTableFactoryImpl(eventHelper); + CyTableFactoryImpl tableFactory = new CyTableFactoryImpl(eventHelper,tableMgr); networkFactory = new CyNetworkFactoryImpl( eventHelper, tableMgr, tableFactory ); } -- 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.
