Author: kono
Date: 2010-10-28 13:47:25 -0700 (Thu, 28 Oct 2010)
New Revision: 22585
Modified:
core3/parent/trunk/pom.xml
core3/vizmap-impl/trunk/pom.xml
core3/vizmap-impl/trunk/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
Log:
Dependency to easymock removed.
Modified: core3/parent/trunk/pom.xml
===================================================================
--- core3/parent/trunk/pom.xml 2010-10-28 20:46:38 UTC (rev 22584)
+++ core3/parent/trunk/pom.xml 2010-10-28 20:47:25 UTC (rev 22585)
@@ -15,7 +15,6 @@
<spring.version>2.5.6</spring.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
<junit.version>4.8.1</junit.version>
- <easymock.version>3.0</easymock.version>
<maven-bundle-plugin.version>2.1.0</maven-bundle-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Modified: core3/vizmap-impl/trunk/pom.xml
===================================================================
--- core3/vizmap-impl/trunk/pom.xml 2010-10-28 20:46:38 UTC (rev 22584)
+++ core3/vizmap-impl/trunk/pom.xml 2010-10-28 20:47:25 UTC (rev 22585)
@@ -152,18 +152,18 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.cytoscape</groupId>
<artifactId>integration-test-support</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.cytoscape</groupId>
<artifactId>vizmap-api</artifactId>
<version>1.0-SNAPSHOT</version>
Modified:
core3/vizmap-impl/trunk/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
===================================================================
---
core3/vizmap-impl/trunk/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
2010-10-28 20:46:38 UTC (rev 22584)
+++
core3/vizmap-impl/trunk/src/test/java/org/cytoscape/view/vizmap/VisualStyleTest.java
2010-10-28 20:47:25 UTC (rev 22585)
@@ -1,6 +1,6 @@
package org.cytoscape.view.vizmap;
-import static org.easymock.EasyMock.createMock;
+import static org.mockito.Mockito.*;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.view.model.NullDataType;
@@ -22,7 +22,7 @@
lexicon = new TwoDVisualLexicon(twoDRoot);
- final CyEventHelper helperMock =
createMock(CyEventHelper.class);
+ final CyEventHelper helperMock = mock(CyEventHelper.class);
final VisualStyleFactoryImpl visualStyleFactory = new
VisualStyleFactoryImpl(
helperMock);
originalTitle = "Style 1";
--
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.
