diff --git a/model/report-impl/src/test/java/com/evolveum/midpoint/report/AbstractReportIntegrationTest.java b/model/report-impl/src/test/java/com/evolveum/midpoint/report/AbstractReportIntegrationTest.java index 48b87757467..913818bdcbe 100644 --- a/model/report-impl/src/test/java/com/evolveum/midpoint/report/AbstractReportIntegrationTest.java +++ b/model/report-impl/src/test/java/com/evolveum/midpoint/report/AbstractReportIntegrationTest.java @@ -31,27 +31,27 @@ public class AbstractReportIntegrationTest extends AbstractModelIntegrationTest protected final static File TEST_DIR_COMMON = new File("src/test/resources/common"); protected final static File EXPORT_DIR = new File("target/midpoint-home/export"); - protected final static File TEST_REPOSTS_DIR = new File("src/test/resources/reports"); + protected final static File TEST_REPORTS_DIR = new File("src/test/resources/reports"); - protected final static File REPORT_USER_LIST_FILE = new File(TEST_REPOSTS_DIR, "report-user-list.xml"); + protected final static File REPORT_USER_LIST_FILE = new File(TEST_REPORTS_DIR, "report-user-list.xml"); protected final static String REPORT_USER_LIST_OID = "00000000-0000-0000-0000-000000000110"; - protected final static File REPORT_USER_LIST_EXPRESSIONS_CSV_FILE = new File(TEST_REPOSTS_DIR, "report-user-list-expressions-csv.xml"); + protected final static File REPORT_USER_LIST_EXPRESSIONS_CSV_FILE = new File(TEST_REPORTS_DIR, "report-user-list-expressions-csv.xml"); protected final static String REPORT_USER_LIST_EXPRESSIONS_CSV_OID = "8fa48180-4f17-11e9-9eed-3fb4721a135e"; - protected final static File REPORT_USER_LIST_EXPRESSIONS_POISONOUS_QUERY_CSV_FILE = new File(TEST_REPOSTS_DIR, "report-user-list-expressions-poisonous-query-csv.xml"); + protected final static File REPORT_USER_LIST_EXPRESSIONS_POISONOUS_QUERY_CSV_FILE = new File(TEST_REPORTS_DIR, "report-user-list-expressions-poisonous-query-csv.xml"); protected final static String REPORT_USER_LIST_EXPRESSIONS_POISONOUS_QUERY_CSV_OID = "5c5af02a-4fe9-11e9-bb07-7b4e52fe05cd"; - protected final static File REPORT_USER_LIST_EXPRESSIONS_POISONOUS_FIELD_CSV_FILE = new File(TEST_REPOSTS_DIR, "report-user-list-expressions-poisonous-field-csv.xml"); + protected final static File REPORT_USER_LIST_EXPRESSIONS_POISONOUS_FIELD_CSV_FILE = new File(TEST_REPORTS_DIR, "report-user-list-expressions-poisonous-field-csv.xml"); protected final static String REPORT_USER_LIST_EXPRESSIONS_POISONOUS_FIELD_CSV_OID = "76c58132-4fe9-11e9-86fe-ff36d221f673"; - protected final static File REPORT_USER_LIST_SCRIPT_FILE = new File(TEST_REPOSTS_DIR, "report-user-list-script.xml"); + protected final static File REPORT_USER_LIST_SCRIPT_FILE = new File(TEST_REPORTS_DIR, "report-user-list-script.xml"); protected final static String REPORT_USER_LIST_SCRIPT_OID = "222bf2b8-c89b-11e7-bf36-ebd4e4d45a80"; - protected final static File REPORT_AUDIT_CSV_FILE = new File(TEST_REPOSTS_DIR, "report-audit-csv.xml"); + protected final static File REPORT_AUDIT_CSV_FILE = new File(TEST_REPORTS_DIR, "report-audit-csv.xml"); protected final static String REPORT_AUDIT_CSV_OID = "66dbbecc-a9fc-11e9-b75c-03927bebc9f7"; - protected final static File REPORT_AUDIT_CSV_LEGACY_FILE = new File(TEST_REPOSTS_DIR, "report-audit-csv-legacy.xml"); + protected final static File REPORT_AUDIT_CSV_LEGACY_FILE = new File(TEST_REPORTS_DIR, "report-audit-csv-legacy.xml"); protected final static String REPORT_AUDIT_CSV_LEGACY_OID = "78faa28c-a9ff-11e9-8c60-e7843d75831e"; protected final static File USER_JACK_FILE = new File(TEST_DIR_COMMON, "user-jack.xml"); diff --git a/model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicNewReportTest.java b/model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicNewReportTest.java index 1144edea2b7..0ce4281fad2 100644 --- a/model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicNewReportTest.java +++ b/model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicNewReportTest.java @@ -6,20 +6,15 @@ */ package com.evolveum.midpoint.report; -import com.evolveum.icf.dummy.resource.DummyResource; import com.evolveum.midpoint.prism.PrismObject; -import com.evolveum.midpoint.schema.SearchResultList; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.test.DummyResourceContoller; -import com.evolveum.midpoint.test.util.TestUtil; import com.evolveum.midpoint.util.exception.*; import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType; import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; -import org.jetbrains.annotations.NotNull; import org.testng.annotations.Test; import java.io.File; @@ -30,7 +25,6 @@ import java.util.Arrays; import java.util.List; -import static org.testng.AssertJUnit.*; import static org.testng.AssertJUnit.assertNotNull; /** @@ -91,26 +85,90 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti public void test001CreateDashboardReportWithDefaultColumn() throws Exception { PrismObject report = getObject(ReportType.class, getDashboardReportWithDefaultColumnOid()); runReport(report, false); - checkHtmlOutputFile(report); + basicCheckOutputFile(report); } @Test public void test002CreateDashboardReportWithView() throws Exception { PrismObject report = getObject(ReportType.class, getDashboardReportWithViewOid()); runReport(report, false); - checkHtmlOutputFile(report); + basicCheckOutputFile(report); } @Test public void test003CreateDashboardReportWithTripleView() throws Exception { PrismObject report = getObject(ReportType.class, getDashboardReportWithTripleViewOid()); runReport(report, false); - checkHtmlOutputFile(report); + basicCheckOutputFile(report); + } + + @Test + public void test010CreateObjectCollectionReportWithDefaultColumn() throws Exception { + PrismObject report = getObject(ReportType.class, getObjectCollectionReportWithDefaultColumnOid()); + runReport(report, false); + basicCheckOutputFile(report); + } + + @Test + public void test011CreateObjectCollectionReportWithView() throws Exception { + PrismObject report = getObject(ReportType.class, getObjectCollectionReportWithViewOid()); + runReport(report, false); + basicCheckOutputFile(report); + } + + @Test + public void test012CreateObjectCollectionReportWithDoubleView() throws Exception { + PrismObject report = getObject(ReportType.class, getObjectCollectionReportWithDoubleViewOid()); + runReport(report, false); + basicCheckOutputFile(report); + } + + @Test + public void test013CreateAuditCollectionReportWithDefaultColumn() throws Exception { + PrismObject report = getObject(ReportType.class, getAuditCollectionReportWithDefaultColumnOid()); + runReport(report, false); + basicCheckOutputFile(report); + } + + @Test + public void test014CreateAuditCollectionReportWithView() throws Exception { + PrismObject report = getObject(ReportType.class, getAuditCollectionReportWithViewOid()); + runReport(report, false); + basicCheckOutputFile(report); + } + + @Test + public void test015CreateAuditCollectionReportWithDoubleView() throws Exception { + PrismObject report = getObject(ReportType.class, getAuditCollectionReportWithDoubleViewOid()); + runReport(report, false); + basicCheckOutputFile(report); + } + + @Test + public void test016CreateObjectCollectionReportWithFilter() throws Exception { + PrismObject report = getObject(ReportType.class, getObjectCollectionReportWithFilterOid()); + runReport(report, false); + basicCheckOutputFile(report); + } + + @Test + public void test017CreateObjectCollectionReportWithFilterAndBasicCollection() throws Exception { +// PrismObject report = getObject(ReportType.class, getObjectCollectionReportWithFilterAndBasicCollectionOid()); +// runReport(report, false); +// basicCheckOutputFile(report); } protected abstract String getDashboardReportWithTripleViewOid(); protected abstract String getDashboardReportWithViewOid(); protected abstract String getDashboardReportWithDefaultColumnOid(); + protected abstract String getObjectCollectionReportWithDefaultColumnOid(); + protected abstract String getObjectCollectionReportWithViewOid(); + protected abstract String getObjectCollectionReportWithDoubleViewOid(); + protected abstract String getAuditCollectionReportWithDefaultColumnOid(); + protected abstract String getAuditCollectionReportWithViewOid(); + protected abstract String getAuditCollectionReportWithDoubleViewOid(); + protected abstract String getObjectCollectionReportWithFilterOid(); + protected abstract String getObjectCollectionReportWithFilterAndBasicCollectionOid(); protected PrismObject runReport(PrismObject report, boolean errorOk) throws Exception { Task task = getTestTask(); @@ -134,17 +192,14 @@ protected PrismObject runReport(PrismObject report, boolea return finishedTask; } - protected void checkHtmlOutputFile(PrismObject report) throws IOException, SchemaException, ObjectNotFoundException, SecurityViolationException, CommunicationException, ConfigurationException, ExpressionEvaluationException { + protected List basicCheckOutputFile(PrismObject report) throws IOException, SchemaException, ObjectNotFoundException, SecurityViolationException, CommunicationException, ConfigurationException, ExpressionEvaluationException { File outputFile = findOutputFile(report); displayValue("Found report file", outputFile); assertNotNull("No output file for "+report, outputFile); List lines = Files.readAllLines(Paths.get(outputFile.getPath())); displayValue("Report content ("+lines.size()+" lines)", String.join("\n", lines)); outputFile.renameTo(new File(outputFile.getParentFile(), "processed-"+outputFile.getName())); - - if (lines.size() < 10) { - fail("Html report CSV too short ("+lines.size()+" lines)"); - } + return lines; } protected File findOutputFile(PrismObject report) { diff --git a/model/report-impl/src/test/java/com/evolveum/midpoint/report/TestHtmlReport.java b/model/report-impl/src/test/java/com/evolveum/midpoint/report/TestHtmlReport.java index 2bfe35d4af5..65973ce36bf 100644 --- a/model/report-impl/src/test/java/com/evolveum/midpoint/report/TestHtmlReport.java +++ b/model/report-impl/src/test/java/com/evolveum/midpoint/report/TestHtmlReport.java @@ -6,10 +6,17 @@ */ package com.evolveum.midpoint.report; +import com.evolveum.midpoint.prism.PrismObject; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.task.api.Task; +import com.evolveum.midpoint.util.exception.*; +import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType; import java.io.File; +import java.io.IOException; +import java.util.List; + +import static org.testng.AssertJUnit.assertNotNull; /** * @author skublik @@ -17,13 +24,29 @@ public class TestHtmlReport extends BasicNewReportTest { - public static final File REPORT_DASHBOARD_WITH_DEFAULT_COLUMN_FILE = new File(TEST_REPOSTS_DIR, "report-dashboard-with-default-column.xml"); - public static final File REPORT_DASHBOARD_WITH_VIEW_FILE = new File(TEST_REPOSTS_DIR, "report-dashboard-with-view.xml"); - public static final File REPORT_DASHBOARD_WITH_TRIPLE_VIEW_FILE = new File(TEST_REPOSTS_DIR, "report-dashboard-with-triple-view.xml"); + private final static File TEST_REPORTS_HTML_DIR = new File(TEST_REPORTS_DIR,"html"); + + public static final File REPORT_DASHBOARD_WITH_DEFAULT_COLUMN_FILE = new File(TEST_REPORTS_HTML_DIR, "report-dashboard-with-default-column.xml"); + public static final File REPORT_DASHBOARD_WITH_VIEW_FILE = new File(TEST_REPORTS_HTML_DIR, "report-dashboard-with-view.xml"); + public static final File REPORT_DASHBOARD_WITH_TRIPLE_VIEW_FILE = new File(TEST_REPORTS_HTML_DIR, "report-dashboard-with-triple-view.xml"); + public static final File REPORT_OBJECT_COLLECTION_WITH_DEFAULT_COLUMN_FILE = new File(TEST_REPORTS_HTML_DIR, "report-object-collection-with-default-column.xml"); + public static final File REPORT_OBJECT_COLLECTION_WITH_VIEW_FILE = new File(TEST_REPORTS_HTML_DIR, "report-object-collection-with-view.xml"); + public static final File REPORT_OBJECT_COLLECTION_WITH_DOUBLE_VIEW_FILE = new File(TEST_REPORTS_HTML_DIR, "report-object-collection-with-double-view.xml"); + public static final File REPORT_AUDIT_COLLECTION_WITH_DEFAULT_COLUMN_FILE = new File(TEST_REPORTS_HTML_DIR, "report-audit-collection-with-default-column.xml"); + public static final File REPORT_AUDIT_COLLECTION_WITH_VIEW_FILE = new File(TEST_REPORTS_HTML_DIR, "report-audit-collection-with-view.xml"); + public static final File REPORT_AUDIT_COLLECTION_WITH_DOUBLE_VIEW_FILE = new File(TEST_REPORTS_HTML_DIR, "report-audit-collection-with-double-view.xml"); + public static final File REPORT_OBJECT_COLLECTION_WITH_FILTER_FILE = new File(TEST_REPORTS_HTML_DIR, "report-object-collection-with-filter.xml"); public static final String REPORT_DASHBOARD_WITH_DEFAULT_COLUMN_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a8582"; public static final String REPORT_DASHBOARD_WITH_VIEW_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a8533"; public static final String REPORT_DASHBOARD_WITH_TRIPLE_VIEW_OID = "2b87aa2e-dd86-4842-bcf5-76200a9a8533"; + public static final String REPORT_OBJECT_COLLECTION_WITH_DEFAULT_COLUMN_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a85ab"; + public static final String REPORT_OBJECT_COLLECTION_WITH_VIEW_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a85de"; + public static final String REPORT_OBJECT_COLLECTION_WITH_DOUBLE_VIEW_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a85ef"; + public static final String REPORT_AUDIT_COLLECTION_WITH_DEFAULT_COLUMN_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a85bc"; + public static final String REPORT_AUDIT_COLLECTION_WITH_VIEW_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a85cd"; + public static final String REPORT_AUDIT_COLLECTION_WITH_DOUBLE_VIEW_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a85fg"; + public static final String REPORT_OBJECT_COLLECTION_WITH_FILTER_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a85gh"; @Override public void initSystem(Task initTask, OperationResult initResult) throws Exception { @@ -31,6 +54,13 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti importObjectFromFile(REPORT_DASHBOARD_WITH_DEFAULT_COLUMN_FILE, initResult); importObjectFromFile(REPORT_DASHBOARD_WITH_VIEW_FILE, initResult); importObjectFromFile(REPORT_DASHBOARD_WITH_TRIPLE_VIEW_FILE, initResult); + importObjectFromFile(REPORT_OBJECT_COLLECTION_WITH_DEFAULT_COLUMN_FILE, initResult); + importObjectFromFile(REPORT_OBJECT_COLLECTION_WITH_VIEW_FILE, initResult); + importObjectFromFile(REPORT_OBJECT_COLLECTION_WITH_DOUBLE_VIEW_FILE, initResult); + importObjectFromFile(REPORT_AUDIT_COLLECTION_WITH_DEFAULT_COLUMN_FILE, initResult); + importObjectFromFile(REPORT_AUDIT_COLLECTION_WITH_VIEW_FILE, initResult); + importObjectFromFile(REPORT_AUDIT_COLLECTION_WITH_DOUBLE_VIEW_FILE, initResult); + importObjectFromFile(REPORT_OBJECT_COLLECTION_WITH_FILTER_FILE, initResult); } @Override @@ -43,8 +73,45 @@ protected String getDashboardReportWithViewOid() { return REPORT_DASHBOARD_WITH_VIEW_OID; } + protected String getObjectCollectionReportWithDefaultColumnOid() { + return REPORT_OBJECT_COLLECTION_WITH_DEFAULT_COLUMN_OID; + } + protected String getObjectCollectionReportWithViewOid() { + return REPORT_OBJECT_COLLECTION_WITH_VIEW_OID; + } + protected String getObjectCollectionReportWithDoubleViewOid() { + return REPORT_OBJECT_COLLECTION_WITH_DOUBLE_VIEW_OID; + } + + protected String getAuditCollectionReportWithDefaultColumnOid() { + return REPORT_AUDIT_COLLECTION_WITH_DEFAULT_COLUMN_OID; + } + protected String getAuditCollectionReportWithViewOid() { + return REPORT_AUDIT_COLLECTION_WITH_VIEW_OID; + } + protected String getAuditCollectionReportWithDoubleViewOid() { + return REPORT_AUDIT_COLLECTION_WITH_DOUBLE_VIEW_OID; + } + + protected String getObjectCollectionReportWithFilterOid() { + return REPORT_OBJECT_COLLECTION_WITH_FILTER_OID; + } + + protected String getObjectCollectionReportWithFilterAndBasicCollectionOid() { + return ""; + } + @Override protected String getDashboardReportWithDefaultColumnOid() { return REPORT_DASHBOARD_WITH_DEFAULT_COLUMN_OID; } + + protected List basicCheckOutputFile(PrismObject report) throws IOException, SchemaException, ObjectNotFoundException, SecurityViolationException, CommunicationException, ConfigurationException, ExpressionEvaluationException { + List lines = super.basicCheckOutputFile(report); + + if (lines.size() < 10) { + fail("Html report CSV too short ("+lines.size()+" lines)"); + } + return lines; + } } diff --git a/model/report-impl/src/test/resources/common/dashboard-with-view.xml b/model/report-impl/src/test/resources/common/dashboard-with-view.xml index 117e8a0cf49..3cf9b1c0cfb 100644 --- a/model/report-impl/src/test/resources/common/dashboard-with-view.xml +++ b/model/report-impl/src/test/resources/common/dashboard-with-view.xml @@ -52,7 +52,7 @@ nameColumn2 name - + nameColumn @@ -108,7 +108,7 @@ nameColumn2 name - + nameColumn @@ -164,7 +164,7 @@ nameColumn2 name - + nameColumn @@ -220,7 +220,7 @@ nameColumn2 name - + nameColumn @@ -276,7 +276,7 @@ nameColumn2 name - + nameColumn @@ -332,7 +332,7 @@ nameColumn2 name - + nameColumn @@ -388,7 +388,7 @@ timeColumn2 time - + timeColumn diff --git a/model/report-impl/src/test/resources/reports/html/report-audit-collection-with-default-column.xml b/model/report-impl/src/test/resources/reports/html/report-audit-collection-with-default-column.xml new file mode 100644 index 00000000000..ffc361656a2 --- /dev/null +++ b/model/report-impl/src/test/resources/reports/html/report-audit-collection-with-default-column.xml @@ -0,0 +1,19 @@ + + + + Audit Collection report with default columns + collection + + + + + + + html + + diff --git a/model/report-impl/src/test/resources/reports/html/report-audit-collection-with-double-view.xml b/model/report-impl/src/test/resources/reports/html/report-audit-collection-with-double-view.xml new file mode 100644 index 00000000000..ba8404334d9 --- /dev/null +++ b/model/report-impl/src/test/resources/reports/html/report-audit-collection-with-double-view.xml @@ -0,0 +1,43 @@ + + + + Audit Collection report with double view + collection + + + + + + + timeColumn + time + + + + + + timeColumn2 + time + + + + timeColumn + + + + + + + + html + + diff --git a/model/report-impl/src/test/resources/reports/html/report-audit-collection-with-view.xml b/model/report-impl/src/test/resources/reports/html/report-audit-collection-with-view.xml new file mode 100644 index 00000000000..5252e3c3c5b --- /dev/null +++ b/model/report-impl/src/test/resources/reports/html/report-audit-collection-with-view.xml @@ -0,0 +1,43 @@ + + + + Audit Collection report with view + collection + + + + + + + timeColumn + time + + + + + + timeColumn2 + time + + + + timeColumn + + + + + + + + html + + diff --git a/model/report-impl/src/test/resources/reports/report-dashboard-with-default-column.xml b/model/report-impl/src/test/resources/reports/html/report-dashboard-with-default-column.xml similarity index 91% rename from model/report-impl/src/test/resources/reports/report-dashboard-with-default-column.xml rename to model/report-impl/src/test/resources/reports/html/report-dashboard-with-default-column.xml index 52ab18db6d0..bd7796986fe 100644 --- a/model/report-impl/src/test/resources/reports/report-dashboard-with-default-column.xml +++ b/model/report-impl/src/test/resources/reports/html/report-dashboard-with-default-column.xml @@ -11,4 +11,7 @@ + + html + diff --git a/model/report-impl/src/test/resources/reports/report-dashboard-with-triple-view.xml b/model/report-impl/src/test/resources/reports/html/report-dashboard-with-triple-view.xml similarity index 98% rename from model/report-impl/src/test/resources/reports/report-dashboard-with-triple-view.xml rename to model/report-impl/src/test/resources/reports/html/report-dashboard-with-triple-view.xml index 654cc93c183..74cb1dcd0a8 100644 --- a/model/report-impl/src/test/resources/reports/report-dashboard-with-triple-view.xml +++ b/model/report-impl/src/test/resources/reports/html/report-dashboard-with-triple-view.xml @@ -88,4 +88,7 @@ + + html + diff --git a/model/report-impl/src/test/resources/reports/report-dashboard-with-view.xml b/model/report-impl/src/test/resources/reports/html/report-dashboard-with-view.xml similarity index 90% rename from model/report-impl/src/test/resources/reports/report-dashboard-with-view.xml rename to model/report-impl/src/test/resources/reports/html/report-dashboard-with-view.xml index deb8bb06af6..61ac5018a3a 100644 --- a/model/report-impl/src/test/resources/reports/report-dashboard-with-view.xml +++ b/model/report-impl/src/test/resources/reports/html/report-dashboard-with-view.xml @@ -11,4 +11,7 @@ + + html + diff --git a/model/report-impl/src/test/resources/reports/html/report-object-collection-with-default-column.xml b/model/report-impl/src/test/resources/reports/html/report-object-collection-with-default-column.xml new file mode 100644 index 00000000000..a16b2311b78 --- /dev/null +++ b/model/report-impl/src/test/resources/reports/html/report-object-collection-with-default-column.xml @@ -0,0 +1,19 @@ + + + + Object Collection report with default columns + collection + + + + + + + html + + diff --git a/model/report-impl/src/test/resources/reports/html/report-object-collection-with-double-view.xml b/model/report-impl/src/test/resources/reports/html/report-object-collection-with-double-view.xml new file mode 100644 index 00000000000..24ab2cf359f --- /dev/null +++ b/model/report-impl/src/test/resources/reports/html/report-object-collection-with-double-view.xml @@ -0,0 +1,43 @@ + + + + Object Collection report with double view + collection + + + + + + + nameColumn + name + + + + + + nameColumn2 + name + + + + nameColumn + + + + + + + + html + + diff --git a/model/report-impl/src/test/resources/reports/html/report-object-collection-with-filter.xml b/model/report-impl/src/test/resources/reports/html/report-object-collection-with-filter.xml new file mode 100644 index 00000000000..aade3100443 --- /dev/null +++ b/model/report-impl/src/test/resources/reports/html/report-object-collection-with-filter.xml @@ -0,0 +1,52 @@ + + + + Object Collection report with filter + collection + + + + + + polyStringNorm + name + a + true + + + + + + nameColumn + name + + + + + + nameColumn2 + name + + + + nameColumn + + + + + + true + + + html + + diff --git a/model/report-impl/src/test/resources/reports/html/report-object-collection-with-view.xml b/model/report-impl/src/test/resources/reports/html/report-object-collection-with-view.xml new file mode 100644 index 00000000000..0f42cd46642 --- /dev/null +++ b/model/report-impl/src/test/resources/reports/html/report-object-collection-with-view.xml @@ -0,0 +1,43 @@ + + + + Object Collection report with view + collection + + + + + + + nameColumn + name + + + + + + nameColumn2 + name + + + + nameColumn + + + + + + + + html + +