Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace EasyMock with Mockito

Browse Source 
Issue: SPR-10126
This commit is contained in:
Phillip Webb
2013-03-04 19:46:15 -08:00
parent a399b13354
commit 05765d7520
180 changed files with 2329 additions and 4272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-webmvc-tiles3/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewResolverTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,24 +15,18 @@
*/
package org.springframework.web.servlet.view.tiles3;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.util.Locale;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.render.Renderer;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
import org.springframework.mock.web.test.MockServletContext;
import org.springframework.web.context.support.StaticWebApplicationContext;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
/**
* Test fixture for {@link TilesViewResolver}.
*
@@ -51,7 +45,7 @@ public class TilesViewResolverTests {
wac.setServletContext(new MockServletContext());
wac.refresh();
this.renderer = EasyMock.createMock(Renderer.class);
this.renderer = mock(Renderer.class);
this.viewResolver = new TilesViewResolver();
this.viewResolver.setRenderer(this.renderer);
@@ -60,13 +54,13 @@ public class TilesViewResolverTests {
@Test
public void testResolve() throws Exception {
expect(this.renderer.isRenderable(eq("/template.test"), isA(Request.class))).andReturn(true);
expect(this.renderer.isRenderable(eq("/nonexistent.test"), isA(Request.class))).andReturn(false);
replay(this.renderer);
given(this.renderer.isRenderable(eq("/template.test"), isA(Request.class))).willReturn(true);
given(this.renderer.isRenderable(eq("/nonexistent.test"), isA(Request.class))).willReturn(false);
assertTrue(this.viewResolver.resolveViewName("/template.test", Locale.ITALY) instanceof TilesView);
assertNull(this.viewResolver.resolveViewName("/nonexistent.test", Locale.ITALY));
verify(this.renderer);
verify(this.renderer).isRenderable(eq("/template.test"), isA(Request.class));
verify(this.renderer).isRenderable(eq("/nonexistent.test"), isA(Request.class));
}
}

26
spring-webmvc-tiles3/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,18 +15,9 @@
*/
package org.springframework.web.servlet.view.tiles3;
import static org.easymock.EasyMock.and;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.isA;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertEquals;
import java.util.HashMap;
import java.util.Map;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.Request;
import org.apache.tiles.request.render.Renderer;
import org.junit.Before;
@@ -37,6 +28,10 @@ import org.springframework.mock.web.test.MockServletContext;
import org.springframework.web.context.support.StaticWebApplicationContext;
import org.springframework.web.servlet.DispatcherServlet;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.BDDMockito.*;
/**
* Test fixture for {@link TilesView}.
*
@@ -67,7 +62,7 @@ public class TilesViewTests {
response = new MockHttpServletResponse();
renderer = createMock(Renderer.class);
renderer = mock(Renderer.class);
view = new TilesView();
view.setServletContext(servletContext);
@@ -80,16 +75,9 @@ public class TilesViewTests {
public void testRender() throws Exception {
Map<String, Object> model = new HashMap<String, Object>();
model.put("modelAttribute", "modelValue");
ApplicationContext tilesContext = createMock(ApplicationContext.class);
renderer.render(eq(VIEW_PATH), and(isA(Request.class), isA(Request.class)));
replay(tilesContext, renderer);
view.render(model, request, response);
assertEquals("modelValue", request.getAttribute("modelAttribute"));
verify(tilesContext, renderer);
verify(renderer).render(eq(VIEW_PATH), isA(Request.class));
}
}