From 4ad4aad271db54cdb9263321ccc116709e14df26 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Thu, 30 Oct 2008 21:49:52 +0000 Subject: [PATCH] Moved tests from testsuite to context.support --- .../ui/jasperreports/JasperReportsUtilsTests.java | 0 .../ui/jasperreports/PersonBean.java | 0 .../ui/jasperreports/ProductBean.java | 0 .../ui/jasperreports/DataSourceReport.jasper | Bin .../ui/jasperreports/DataSourceReport.jrxml | 0 .../ui/jasperreports/messages_de.properties | 0 .../ui/jasperreports/subReportChild.jasper | Bin .../ui/jasperreports/subReportChild.jrxml | 0 .../ui/jasperreports/subReportParent.jasper | Bin .../ui/jasperreports/subReportParent.jrxml | 0 .../jasperreports/AbstractJasperReportsTests.java | 9 +++------ .../AbstractJasperReportsViewTests.java | 2 +- .../view/jasperreports/ExporterParameterTests.java | 2 +- 13 files changed, 5 insertions(+), 8 deletions(-) rename {org.springframework.testsuite => org.springframework.context.support}/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java (100%) rename {org.springframework.testsuite => org.springframework.context.support}/src/test/java/org/springframework/ui/jasperreports/PersonBean.java (100%) rename {org.springframework.testsuite => org.springframework.context.support}/src/test/java/org/springframework/ui/jasperreports/ProductBean.java (100%) rename {org.springframework.testsuite/src/test/java => org.springframework.context.support/src/test/resources}/org/springframework/ui/jasperreports/DataSourceReport.jasper (100%) rename {org.springframework.testsuite/src/test/java => org.springframework.context.support/src/test/resources}/org/springframework/ui/jasperreports/DataSourceReport.jrxml (100%) rename {org.springframework.testsuite/src/test/java => org.springframework.context.support/src/test/resources}/org/springframework/ui/jasperreports/messages_de.properties (100%) rename {org.springframework.testsuite/src/test/java => org.springframework.context.support/src/test/resources}/org/springframework/ui/jasperreports/subReportChild.jasper (100%) rename {org.springframework.testsuite/src/test/java => org.springframework.context.support/src/test/resources}/org/springframework/ui/jasperreports/subReportChild.jrxml (100%) rename {org.springframework.testsuite/src/test/java => org.springframework.context.support/src/test/resources}/org/springframework/ui/jasperreports/subReportParent.jasper (100%) rename {org.springframework.testsuite/src/test/java => org.springframework.context.support/src/test/resources}/org/springframework/ui/jasperreports/subReportParent.jrxml (100%) diff --git a/org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java b/org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java rename to org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/PersonBean.java b/org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/PersonBean.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/PersonBean.java rename to org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/PersonBean.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/ProductBean.java b/org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/ProductBean.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/ProductBean.java rename to org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/ProductBean.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/DataSourceReport.jasper b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jasper similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/DataSourceReport.jasper rename to org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jasper diff --git a/org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/DataSourceReport.jrxml b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jrxml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/DataSourceReport.jrxml rename to org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jrxml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/messages_de.properties b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/messages_de.properties similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/messages_de.properties rename to org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/messages_de.properties diff --git a/org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/subReportChild.jasper b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jasper similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/subReportChild.jasper rename to org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jasper diff --git a/org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/subReportChild.jrxml b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jrxml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/subReportChild.jrxml rename to org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jrxml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/subReportParent.jasper b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jasper similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/subReportParent.jasper rename to org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jasper diff --git a/org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/subReportParent.jrxml b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jrxml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/ui/jasperreports/subReportParent.jrxml rename to org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jrxml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java b/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java index 98ac83af8a5..0cb1857d485 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java @@ -38,14 +38,11 @@ import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver; */ public abstract class AbstractJasperReportsTests extends TestCase { - protected static final String COMPILED_REPORT = - "org/springframework/ui/jasperreports/DataSourceReport.jasper"; + protected static final String COMPILED_REPORT = "/org/springframework/ui/jasperreports/DataSourceReport.jasper"; - protected static final String UNCOMPILED_REPORT = - "org/springframework/ui/jasperreports/DataSourceReport.jrxml"; + protected static final String UNCOMPILED_REPORT = "/org/springframework/ui/jasperreports/DataSourceReport.jrxml"; - protected static final String SUB_REPORT_PARENT = - "org/springframework/ui/jasperreports/subReportParent.jrxml"; + protected static final String SUB_REPORT_PARENT = "/org/springframework/ui/jasperreports/subReportParent.jrxml"; protected static boolean canCompileReport; diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java b/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java index 9b3721b8564..2cb3f89b724 100755 --- a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java @@ -194,7 +194,7 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor model.put("SubReportData", getProductData()); Properties subReports = new Properties(); - subReports.put("ProductsSubReport", "org/springframework/ui/jasperreports/subReportChild.jrxml"); + subReports.put("ProductsSubReport", "/org/springframework/ui/jasperreports/subReportChild.jrxml"); AbstractJasperReportsView view = getView(SUB_REPORT_PARENT); view.setReportDataKey("dataSource"); diff --git a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java b/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java index ddaa6c827ad..39167bb4ad7 100755 --- a/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java @@ -149,7 +149,7 @@ public class ExporterParameterTests extends AbstractJasperReportsTests { } private void setViewProperties(AbstractJasperReportsView view) { - view.setUrl("org/springframework/ui/jasperreports/DataSourceReport.jasper"); + view.setUrl("/org/springframework/ui/jasperreports/DataSourceReport.jasper"); StaticWebApplicationContext ac = new StaticWebApplicationContext(); ac.setServletContext(new MockServletContext()); ac.addMessage("page", Locale.GERMAN, "MeineSeite");