Author: mes
Date: 2010-10-28 13:14:29 -0700 (Thu, 28 Oct 2010)
New Revision: 22570
Modified:
core3/presentation-api/trunk/pom.xml
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/PresentationEventsTest.java
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/RenderingEngineManagerTest.java
Log:
switched to mockito
Modified: core3/presentation-api/trunk/pom.xml
===================================================================
--- core3/presentation-api/trunk/pom.xml 2010-10-28 20:07:53 UTC (rev
22569)
+++ core3/presentation-api/trunk/pom.xml 2010-10-28 20:14:29 UTC (rev
22570)
@@ -6,7 +6,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.cytoscape</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.0.0-alpha3</version>
</parent>
<properties>
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>viewmodel-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>3.0.0-alpha1</version>
</dependency>
<!-- For Testing -->
@@ -97,9 +97,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>${easymock.version}</version>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/PresentationEventsTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/PresentationEventsTest.java
2010-10-28 20:07:53 UTC (rev 22569)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/PresentationEventsTest.java
2010-10-28 20:14:29 UTC (rev 22570)
@@ -1,7 +1,7 @@
package org.cytoscape.view.presentation;
-import static org.easymock.EasyMock.*;
+import static org.mockito.Mockito.*;
import static org.junit.Assert.*;
import javax.swing.JComponent;
@@ -27,8 +27,8 @@
@Test
public void testEvents() {
- final RenderingEngineFactory<CyNetwork> factory =
createMock(RenderingEngineFactory.class);
- final RenderingEngine<CyNetwork> engine =
createMock(RenderingEngine.class);
+ final RenderingEngineFactory<CyNetwork> factory =
mock(RenderingEngineFactory.class);
+ final RenderingEngine<CyNetwork> engine =
mock(RenderingEngine.class);
final PresentationCreatedEvent createdEvent = new
PresentationCreatedEvent(factory, engine);
assertEquals(factory, createdEvent.getSource());
assertEquals(engine, createdEvent.getRenderingEngine());
Modified:
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/RenderingEngineManagerTest.java
===================================================================
---
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/RenderingEngineManagerTest.java
2010-10-28 20:07:53 UTC (rev 22569)
+++
core3/presentation-api/trunk/src/test/java/org/cytoscape/view/presentation/RenderingEngineManagerTest.java
2010-10-28 20:14:29 UTC (rev 22570)
@@ -1,7 +1,7 @@
package org.cytoscape.view.presentation;
import static org.junit.Assert.*;
-import static org.easymock.EasyMock.*;
+import static org.mockito.Mockito.*;
import java.util.Collection;
import java.util.Set;
@@ -40,19 +40,17 @@
public void testGetRendringEngines() {
// First, create mock view models.
- final CyNetworkView networkView1 =
createMock(CyNetworkView.class);
- final CyNetworkView networkView2 =
createMock(CyNetworkView.class);
+ final CyNetworkView networkView1 = mock(CyNetworkView.class);
+ final CyNetworkView networkView2 = mock(CyNetworkView.class);
- final RenderingEngineFactory<CyNetwork> factory =
createMock(RenderingEngineFactory.class);
+ final RenderingEngineFactory<CyNetwork> factory =
mock(RenderingEngineFactory.class);
- final RenderingEngine<CyNetwork> engine1 =
createMock(RenderingEngine.class);
+ final RenderingEngine<CyNetwork> engine1 =
mock(RenderingEngine.class);
- final RenderingEngine<CyNetwork> engine2 =
createMock(RenderingEngine.class);
-
expect(engine2.getViewModel()).andReturn(networkView1).anyTimes();
- replay(engine2);
- final RenderingEngine<CyNetwork> engine3 =
createMock(RenderingEngine.class);
-
expect(engine3.getViewModel()).andReturn(networkView2).anyTimes();
- replay(engine3);
+ final RenderingEngine<CyNetwork> engine2 =
mock(RenderingEngine.class);
+ when(engine2.getViewModel()).thenReturn(networkView1);
+ final RenderingEngine<CyNetwork> engine3 =
mock(RenderingEngine.class);
+ when(engine3.getViewModel()).thenReturn(networkView2);
final Collection<RenderingEngine<?>> engineSet =
manager.getRendringEngines(networkView1);
assertNotNull(engineSet);
@@ -60,8 +58,7 @@
final PresentationCreatedEvent createdEvent1 = new
PresentationCreatedEvent(factory, engine1);
-
expect(engine1.getViewModel()).andReturn(networkView1).anyTimes();
- replay(engine1);
+ when(engine1.getViewModel()).thenReturn(networkView1);
((PresentationCreatedListener)manager).handleEvent(createdEvent1);
assertEquals(1,
manager.getRendringEngines(networkView1).size());
@@ -90,5 +87,4 @@
assertTrue(manager.getRendringEngines(networkView2).contains(engine3));
}
-
}
--
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.
