[parancoe] push by lucio.be...@gmail.com - Fixed initialization of web spring context in tests. on 2012-09-26 13:28 GMT

[para...@googlecode.com]

Revision: e08a230178dc
Branch: default
Author: lucio.benfante <lucio.b...@gmail.com>
Date: Wed Sep 26 06:28:00 2012
Log: Fixed initialization of web spring context in tests.
http://code.google.com/p/parancoe/source/detail?r=e08a230178dc

Modified:
/parancoe-web/src/main/java/org/parancoe/web/test/BaseTest.java
/parancoe-web/src/main/java/org/parancoe/web/test/TagTest.java

=======================================
--- /parancoe-web/src/main/java/org/parancoe/web/test/BaseTest.java Sat
Sep 4 02:41:52 2010
+++ /parancoe-web/src/main/java/org/parancoe/web/test/BaseTest.java Wed Sep
26 06:28:00 2012
@@ -19,13 +19,13 @@

import java.io.File;
import java.io.IOException;
-import javax.servlet.ServletContext;
import org.apache.log4j.Logger;
import org.lambico.test.spring.hibernate.DBTest;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.io.FileSystemResourceLoader;
import org.springframework.mock.web.MockServletContext;
-import org.springframework.web.context.support.XmlWebApplicationContext;
+import org.springframework.web.context.ContextLoader;
+import org.springframework.web.context.WebApplicationContext;

/**
* E' la classe base per tutti i test.
@@ -65,11 +65,26 @@
protected ConfigurableApplicationContext createApplicationContext(
String[] locations) {
FileSystemResourceLoader rl = new FileSystemResourceLoader();
- ServletContext servletContext = new MockServletContext(rl);
- XmlWebApplicationContext context = new XmlWebApplicationContext();
- context.setServletContext(servletContext);
- context.setConfigLocations(locations);
- context.refresh();
- return context;
+ MockServletContext servletContext = new MockServletContext(rl);
+ servletContext.setMinorVersion(4);
+ servletContext.registerContext("/test", servletContext);
+ servletContext.setServletContextName("/test");
+
servletContext.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
+ arrayToString(locations));
+ ContextLoader loader = new ContextLoader();
+ WebApplicationContext context =
loader.initWebApplicationContext(servletContext);
+ return (ConfigurableApplicationContext) context;
}
+
+ private String arrayToString(String[] locations) {
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < locations.length - 1; i++) {
+ sb.append(locations[i]).append(',');
+ }
+ if (locations.length > 0) {
+ sb.append(locations[locations.length - 1]);
+ }
+ return sb.toString();
+ }
+
}
=======================================
--- /parancoe-web/src/main/java/org/parancoe/web/test/TagTest.java Fri Sep
21 05:29:45 2012
+++ /parancoe-web/src/main/java/org/parancoe/web/test/TagTest.java Wed Sep
26 06:28:00 2012
@@ -17,18 +17,12 @@
*/
package org.parancoe.web.test;

-import javax.servlet.ServletContext;
import javax.servlet.http.HttpSession;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.io.FileSystemResourceLoader;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockMultipartHttpServletRequest;
import org.springframework.mock.web.MockPageContext;
-import org.springframework.mock.web.MockServletContext;
-import org.springframework.web.context.ContextLoader;
import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.XmlWebApplicationContext;
import org.springframework.web.servlet.support.JspAwareRequestContext;
import org.springframework.web.servlet.support.RequestContext;
import org.springframework.web.servlet.tags.RequestContextAwareTag;
@@ -88,29 +82,4 @@

pc.setAttribute(RequestContextAwareTag.REQUEST_CONTEXT_PAGE_ATTRIBUTE, rc);
}

- @Override
- protected ConfigurableApplicationContext createApplicationContext(
- String[] locations) {
- FileSystemResourceLoader rl = new FileSystemResourceLoader();
- MockServletContext servletContext = new MockServletContext(rl);
- servletContext.setMinorVersion(4);
- servletContext.registerContext("/test", servletContext);
- servletContext.setServletContextName("/test");
-
servletContext.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM,
- arrayToString(locations));
- ContextLoader loader = new ContextLoader();
- WebApplicationContext context =
loader.initWebApplicationContext(servletContext);
- return (ConfigurableApplicationContext) context;
- }
-
- private String arrayToString(String[] locations) {
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < locations.length - 1; i++) {
- sb.append(locations[i]).append(',');
- }
- if (locations.length > 0) {
- sb.append(locations[locations.length - 1]);
- }
- return sb.toString();
- }
}