Moved tests from testsuite to context.support

17 years ago · 4ad4aad271
13 changed files with 5 additions and 8 deletions
--- a/org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java
+++ b/org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java
--- a/org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/PersonBean.java
+++ b/org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/PersonBean.java
--- a/org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/ProductBean.java
+++ b/org.springframework.context.support/src/test/java/org/springframework/ui/jasperreports/ProductBean.java
--- a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jasper
+++ b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jasper
--- a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jrxml
+++ b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/DataSourceReport.jrxml
--- a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/messages_de.properties
+++ b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/messages_de.properties
--- a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jasper
+++ b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jasper
--- a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jrxml
+++ b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportChild.jrxml
--- a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jasper
+++ b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jasper
--- a/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jrxml
+++ b/org.springframework.context.support/src/test/resources/org/springframework/ui/jasperreports/subReportParent.jrxml
--- 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;
				@@ -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;

--- 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
				@@ -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");
--- 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 {
				@@ -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");