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

32
spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.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.
@@ -19,6 +19,7 @@ package org.springframework.web.struts;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -26,16 +27,16 @@ import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionServlet;
import org.apache.struts.config.ModuleConfig;
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.StaticWebApplicationContext;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.*;
/**
* @author Juergen Hoeller
* @since 09.04.2004
@@ -228,9 +229,8 @@ public class StrutsSupportTests {
}
};
ModuleConfig moduleConfig = createMock(ModuleConfig.class);
expect(moduleConfig.getPrefix()).andReturn("").anyTimes();
replay(moduleConfig);
ModuleConfig moduleConfig = mock(ModuleConfig.class);
given(moduleConfig.getPrefix()).willReturn("");
plugin.init(actionServlet, moduleConfig);
assertTrue(servletContext.getAttribute(ContextLoaderPlugIn.SERVLET_CONTEXT_PREFIX) != null);
@@ -249,8 +249,6 @@ public class StrutsSupportTests {
proxy.setServlet(null);
plugin.destroy();
assertTrue(testAction.getServlet() == null);
verify(moduleConfig);
}
@Test
@@ -270,9 +268,8 @@ public class StrutsSupportTests {
}
};
ModuleConfig moduleConfig = createMock(ModuleConfig.class);
expect(moduleConfig.getPrefix()).andReturn("/module").anyTimes();
replay(moduleConfig);
ModuleConfig moduleConfig = mock(ModuleConfig.class);
given(moduleConfig.getPrefix()).willReturn("/module");
plugin.init(actionServlet, moduleConfig);
assertTrue(servletContext.getAttribute(ContextLoaderPlugIn.SERVLET_CONTEXT_PREFIX) == null);
@@ -313,13 +310,12 @@ public class StrutsSupportTests {
}
};
ModuleConfig defaultModuleConfig = createMock(ModuleConfig.class);
expect(defaultModuleConfig.getPrefix()).andReturn("").anyTimes();
ModuleConfig defaultModuleConfig = mock(ModuleConfig.class);
given(defaultModuleConfig.getPrefix()).willReturn("");
ModuleConfig moduleConfig = createMock(ModuleConfig.class);
expect(moduleConfig.getPrefix()).andReturn("/module").anyTimes();
ModuleConfig moduleConfig = mock(ModuleConfig.class);
given(moduleConfig.getPrefix()).willReturn("/module");
replay(defaultModuleConfig, moduleConfig);
plugin.init(actionServlet, defaultModuleConfig);
assertTrue(servletContext.getAttribute(ContextLoaderPlugIn.SERVLET_CONTEXT_PREFIX) != null);
@@ -339,8 +335,6 @@ public class StrutsSupportTests {
proxy.setServlet(null);
plugin.destroy();
assertTrue(testAction.getServlet() == null);
verify(defaultModuleConfig, moduleConfig);
}
}