GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Execute as many Jasper Reports tests in IDE as possible 

Previously, the use of Assume.group(CUSTOM_COMPILATION) in
AbstractJasperReportsTests excluded all JR tests when executing in the
IDE (e.g., Eclipse). This commit executes the assumption only where
necessary.
pull/501/merge
Sam Brannen 12 years ago
parent
db66ef0f6f
commit
6aaae7e258
3 changed files with 56 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java
  2. 74
      spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java
  3. 12
      spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java

18
spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -26,10 +26,10 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.springframework.mock.web.test.MockHttpServletRequest; import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.mock.web.test.MockHttpServletResponse; import org.springframework.mock.web.test.MockHttpServletResponse;
import org.springframework.tests.Assume; import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
import org.springframework.ui.jasperreports.PersonBean; import org.springframework.ui.jasperreports.PersonBean;
import org.springframework.ui.jasperreports.ProductBean; import org.springframework.ui.jasperreports.ProductBean;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
@ -39,6 +39,7 @@ import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
/** /**
* @author Rob Harrop * @author Rob Harrop
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Sam Brannen
*/ */
public abstract class AbstractJasperReportsTests { public abstract class AbstractJasperReportsTests {
@ -60,7 +61,6 @@ public abstract class AbstractJasperReportsTests {
@BeforeClass @BeforeClass
public static void assumptions() { public static void assumptions() {
Assume.canLoadNativeDirFonts(); Assume.canLoadNativeDirFonts();
Assume.group(TestGroup.CUSTOM_COMPILATION);
} }
@Before @Before
@ -72,9 +72,8 @@ public abstract class AbstractJasperReportsTests {
request.addPreferredLocale(Locale.GERMAN); request.addPreferredLocale(Locale.GERMAN);
} }
protected Map<String, Object> getModel() { protected Map<String, Object> getModel() {
Map model = new HashMap(); Map<String, Object> model = new HashMap<String, Object>();
model.put("ReportTitle", "Dear Lord!"); model.put("ReportTitle", "Dear Lord!");
model.put("dataSource", new JRBeanCollectionDataSource(getData())); model.put("dataSource", new JRBeanCollectionDataSource(getData()));
extendModel(model); extendModel(model);
@ -87,8 +86,8 @@ public abstract class AbstractJasperReportsTests {
protected void extendModel(Map<String, Object> model) { protected void extendModel(Map<String, Object> model) {
} }
protected List getData() { protected List<Object> getData() {
List list = new ArrayList(); List<Object> list = new ArrayList<Object>();
for (int x = 0; x < 10; x++) { for (int x = 0; x < 10; x++) {
PersonBean bean = new PersonBean(); PersonBean bean = new PersonBean();
bean.setId(x); bean.setId(x);
@ -99,15 +98,14 @@ public abstract class AbstractJasperReportsTests {
return list; return list;
} }
protected List getProductData() { protected List<Object> getProductData() {
List list = new ArrayList(); List<Object> list = new ArrayList<Object>();
for (int x = 0; x < 10; x++) { for (int x = 0; x < 10; x++) {
ProductBean bean = new ProductBean(); ProductBean bean = new ProductBean();
bean.setId(x); bean.setId(x);
bean.setName("Foo Bar"); bean.setName("Foo Bar");
bean.setPrice(1.9f); bean.setPrice(1.9f);
bean.setQuantity(1.0f); bean.setQuantity(1.0f);
list.add(bean); list.add(bean);
} }
return list; return list;

74
spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -35,8 +35,11 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.springframework.context.ApplicationContextException; import org.springframework.context.ApplicationContextException;
import org.springframework.mock.web.test.MockServletContext; import org.springframework.mock.web.test.MockServletContext;
import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
import org.springframework.ui.jasperreports.PersonBean; import org.springframework.ui.jasperreports.PersonBean;
import org.springframework.web.context.support.StaticWebApplicationContext; import org.springframework.web.context.support.StaticWebApplicationContext;
import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.DispatcherServlet;
@ -47,6 +50,7 @@ import static org.mockito.BDDMockito.*;
/** /**
* @author Rob Harrop * @author Rob Harrop
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Sam Brannen
*/ */
public abstract class AbstractJasperReportsViewTests extends AbstractJasperReportsTests { public abstract class AbstractJasperReportsViewTests extends AbstractJasperReportsTests {
@ -79,6 +83,8 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
@Test @Test
public void testUncompiledReport() throws Exception { public void testUncompiledReport() throws Exception {
Assume.group(TestGroup.CUSTOM_COMPILATION);
if (!canCompileReport) { if (!canCompileReport) {
return; return;
} }
@ -88,26 +94,14 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
assertTrue(response.getContentAsByteArray().length > 0); assertTrue(response.getContentAsByteArray().length > 0);
} }
@Test @Test(expected = ApplicationContextException.class)
public void testWithInvalidPath() throws Exception { public void testWithInvalidPath() throws Exception {
try { getView("foo.jasper");
getView("foo.jasper");
fail("Invalid path should throw ApplicationContextException");
}
catch (ApplicationContextException ex) {
// good!
}
} }
@Test @Test(expected = IllegalArgumentException.class)
public void testInvalidExtension() throws Exception { public void testInvalidExtension() throws Exception {
try { getView("foo.bar");
getView("foo.bar");
fail("Invalid extension should throw IllegalArgumentException");
}
catch (IllegalArgumentException ex) {
// expected
}
} }
@Test @Test
@ -119,7 +113,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
@Test @Test
public void testWithoutDatasource() throws Exception { public void testWithoutDatasource() throws Exception {
Map model = getModel(); Map<String, Object> model = getModel();
model.remove("dataSource"); model.remove("dataSource");
AbstractJasperReportsView view = getView(COMPILED_REPORT); AbstractJasperReportsView view = getView(COMPILED_REPORT);
view.render(model, request, response); view.render(model, request, response);
@ -128,7 +122,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
@Test @Test
public void testWithCollection() throws Exception { public void testWithCollection() throws Exception {
Map model = getModel(); Map<String, Object> model = getModel();
model.remove("dataSource"); model.remove("dataSource");
model.put("reportData", getData()); model.put("reportData", getData());
AbstractJasperReportsView view = getView(COMPILED_REPORT); AbstractJasperReportsView view = getView(COMPILED_REPORT);
@ -137,8 +131,9 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
} }
@Test @Test
@SuppressWarnings("rawtypes")
public void testWithMultipleCollections() throws Exception { public void testWithMultipleCollections() throws Exception {
Map model = getModel(); Map<String, Object> model = getModel();
model.remove("dataSource"); model.remove("dataSource");
model.put("reportData", getData()); model.put("reportData", getData());
model.put("otherData", new LinkedList()); model.put("otherData", new LinkedList());
@ -149,7 +144,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
@Test @Test
public void testWithJRDataSourceProvider() throws Exception { public void testWithJRDataSourceProvider() throws Exception {
Map model = getModel(); Map<String, Object> model = getModel();
model.remove("dataSource"); model.remove("dataSource");
model.put("dataSource", new MockDataSourceProvider(PersonBean.class)); model.put("dataSource", new MockDataSourceProvider(PersonBean.class));
AbstractJasperReportsView view = getView(COMPILED_REPORT); AbstractJasperReportsView view = getView(COMPILED_REPORT);
@ -158,8 +153,9 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
} }
@Test @Test
@SuppressWarnings("rawtypes")
public void testWithSpecificCollection() throws Exception { public void testWithSpecificCollection() throws Exception {
Map model = getModel(); Map<String, Object> model = getModel();
model.remove("dataSource"); model.remove("dataSource");
model.put("reportData", getData()); model.put("reportData", getData());
model.put("otherData", new LinkedList()); model.put("otherData", new LinkedList());
@ -171,7 +167,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
@Test @Test
public void testWithArray() throws Exception { public void testWithArray() throws Exception {
Map model = getModel(); Map<String, Object> model = getModel();
model.remove("dataSource"); model.remove("dataSource");
model.put("reportData", getData().toArray()); model.put("reportData", getData().toArray());
AbstractJasperReportsView view = getView(COMPILED_REPORT); AbstractJasperReportsView view = getView(COMPILED_REPORT);
@ -181,7 +177,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
@Test @Test
public void testWithMultipleArrays() throws Exception { public void testWithMultipleArrays() throws Exception {
Map model = getModel(); Map<String, Object> model = getModel();
model.remove("dataSource"); model.remove("dataSource");
model.put("reportData", getData().toArray()); model.put("reportData", getData().toArray());
model.put("otherData", new String[0]); model.put("otherData", new String[0]);
@ -192,7 +188,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
@Test @Test
public void testWithSpecificArray() throws Exception { public void testWithSpecificArray() throws Exception {
Map model = getModel(); Map<String, Object> model = getModel();
model.remove("dataSource"); model.remove("dataSource");
model.put("reportData", getData().toArray()); model.put("reportData", getData().toArray());
model.put("otherData", new String[0]); model.put("otherData", new String[0]);
@ -208,7 +204,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
return; return;
} }
Map model = getModel(); Map<String, Object> model = getModel();
model.put("SubReportData", getProductData()); model.put("SubReportData", getProductData());
Properties subReports = new Properties(); Properties subReports = new Properties();
@ -230,7 +226,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
return; return;
} }
Map model = getModel(); Map<String, Object> model = getModel();
model.put("SubReportData", getProductData()); model.put("SubReportData", getProductData());
Properties subReports = new Properties(); Properties subReports = new Properties();
@ -243,7 +239,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
try { try {
view.initApplicationContext(); view.initApplicationContext();
fail("Invalid report URL should throw ApplicationContext Exception"); fail("Invalid report URL should throw ApplicationContextException");
} }
catch (ApplicationContextException ex) { catch (ApplicationContextException ex) {
// success // success
@ -261,14 +257,14 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
String characterEncoding = "UTF-8"; String characterEncoding = "UTF-8";
String overiddenCharacterEncoding = "ASCII"; String overiddenCharacterEncoding = "ASCII";
Map parameters = new HashMap(); Map<Object, Object> parameters = new HashMap<Object, Object>();
parameters.put(JRExporterParameter.CHARACTER_ENCODING, characterEncoding); parameters.put(JRExporterParameter.CHARACTER_ENCODING, characterEncoding);
view.setExporterParameters(parameters); view.setExporterParameters(parameters);
view.convertExporterParameters(); view.convertExporterParameters();
Map model = getModel(); Map<String, Object> model = getModel();
model.put(JRExporterParameter.CHARACTER_ENCODING, overiddenCharacterEncoding); model.put(JRExporterParameter.CHARACTER_ENCODING.toString(), overiddenCharacterEncoding);
view.render(model, this.request, this.response); view.render(model, this.request, this.response);
@ -281,7 +277,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
return; return;
} }
Map model = getModel(); Map<String, Object> model = getModel();
model.put("SubReportData", getProductData()); model.put("SubReportData", getProductData());
Properties subReports = new Properties(); Properties subReports = new Properties();
@ -339,6 +335,8 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
@Test @Test
public void testWithJdbcDataSource() throws Exception { public void testWithJdbcDataSource() throws Exception {
Assume.group(TestGroup.CUSTOM_COMPILATION);
if (!canCompileReport) { if (!canCompileReport) {
return; return;
} }
@ -346,7 +344,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
AbstractJasperReportsView view = getView(UNCOMPILED_REPORT); AbstractJasperReportsView view = getView(UNCOMPILED_REPORT);
view.setJdbcDataSource(getMockJdbcDataSource()); view.setJdbcDataSource(getMockJdbcDataSource());
Map model = getModel(); Map<String, Object> model = getModel();
model.remove("dataSource"); model.remove("dataSource");
try { try {
@ -360,13 +358,15 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
@Test @Test
public void testWithJdbcDataSourceInModel() throws Exception { public void testWithJdbcDataSourceInModel() throws Exception {
Assume.group(TestGroup.CUSTOM_COMPILATION);
if (!canCompileReport) { if (!canCompileReport) {
return; return;
} }
AbstractJasperReportsView view = getView(UNCOMPILED_REPORT); AbstractJasperReportsView view = getView(UNCOMPILED_REPORT);
Map model = getModel(); Map<String, Object> model = getModel();
model.remove("dataSource"); model.remove("dataSource");
model.put("someKey", getMockJdbcDataSource()); model.put("someKey", getMockJdbcDataSource());
@ -381,6 +381,8 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
@Test @Test
public void testJRDataSourceOverridesJdbcDataSource() throws Exception { public void testJRDataSourceOverridesJdbcDataSource() throws Exception {
Assume.group(TestGroup.CUSTOM_COMPILATION);
if (!canCompileReport) { if (!canCompileReport) {
return; return;
} }
@ -412,7 +414,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
String characterEncoding = "UTF-8"; String characterEncoding = "UTF-8";
Map parameters = new HashMap(); Map<Object, Object> parameters = new HashMap<Object, Object>();
parameters.put(JRExporterParameter.CHARACTER_ENCODING, characterEncoding); parameters.put(JRExporterParameter.CHARACTER_ENCODING, characterEncoding);
view.setExporterParameters(parameters); view.setExporterParameters(parameters);
@ -430,7 +432,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor
private class MockDataSourceProvider extends JRAbstractBeanDataSourceProvider { private class MockDataSourceProvider extends JRAbstractBeanDataSourceProvider {
public MockDataSourceProvider(Class clazz) { public MockDataSourceProvider(Class<?> clazz) {
super(clazz); super(clazz);
} }

12
spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -25,6 +25,8 @@ import javax.servlet.http.HttpServletResponse;
import net.sf.jasperreports.engine.JasperPrint; import net.sf.jasperreports.engine.JasperPrint;
import org.junit.Test; import org.junit.Test;
import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -41,6 +43,8 @@ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsView
@Test @Test
public void testSimpleHtmlRender() throws Exception { public void testSimpleHtmlRender() throws Exception {
Assume.group(TestGroup.CUSTOM_COMPILATION);
if (!canCompileReport) { if (!canCompileReport) {
return; return;
} }
@ -58,6 +62,8 @@ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsView
@Override @Override
@Test @Test
public void testOverrideContentDisposition() throws Exception { public void testOverrideContentDisposition() throws Exception {
Assume.group(TestGroup.CUSTOM_COMPILATION);
if (!canCompileReport) { if (!canCompileReport) {
return; return;
} }
@ -82,6 +88,8 @@ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsView
@Test @Test
public void testExporterParametersAreCarriedAcross() throws Exception { public void testExporterParametersAreCarriedAcross() throws Exception {
Assume.group(TestGroup.CUSTOM_COMPILATION);
if (!canCompileReport) { if (!canCompileReport) {
return; return;
} }
@ -134,7 +142,7 @@ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsView
public static final String TEST_PARAM = "net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI"; public static final String TEST_PARAM = "net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI";
@Override @Override
protected void renderReport(JasperPrint filledReport, Map parameters, HttpServletResponse response) { protected void renderReport(JasperPrint filledReport, Map<String, Object> parameters, HttpServletResponse response) {
assertNotNull("Exporter parameters are null", getExporterParameters()); assertNotNull("Exporter parameters are null", getExporterParameters());
assertEquals("Incorrect number of exporter parameters", 1, getExporterParameters().size()); assertEquals("Incorrect number of exporter parameters", 1, getExporterParameters().size());
} }

Write Preview
Loading…
Cancel
Save