Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Sep 8, 2020
2 parents 6ee9c32 + 8cc486f commit fb8964f
Show file tree
Hide file tree
Showing 13 changed files with 364 additions and 130 deletions.
36 changes: 36 additions & 0 deletions model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicNewReportTest.java
View file
Expand Up @@ -53,43 +53,52 @@ public abstract class BasicNewReportTest extends AbstractReportIntegrationTest {
public static final File COLLECTION_TASK_WITH_VIEW_FILE = new File(COMMON_DIR, "object-collection-all-task-with-view.xml");
public static final File COLLECTION_USER_WITH_VIEW_FILE = new File(COMMON_DIR, "object-collection-all-user-with-view.xml");
public static final File COLLECTION_AUDIT_WITH_VIEW_FILE = new File(COMMON_DIR, "object-collection-all-audit-records-with-view.xml");
public static final File COLLECTION_AUDIT_EMPTY_FILE = new File(COMMON_DIR, "object-collection-audit-empty.xml");
public static final File COLLECTION_EMPTY_FILE = new File(COMMON_DIR, "object-collection-empty.xml");
public static final File COLLECTION_ASSIGNMENT_HOLDER_WITH_VIEW_FILE = new File(COMMON_DIR, "object-collection-all-assignment-holder-with-view.xml");
public static final File COLLECTION_SHADOW_WITH_VIEW_FILE = new File(COMMON_DIR, "object-collection-shadow-of-resource-with-view.xml");
public static final File DASHBOARD_TRIPLE_VIEW_FILE = new File(COMMON_DIR, "dashboard-with-triple-view.xml");
public static final File DASHBOARD_EMPTY_FILE = new File(COMMON_DIR, "dashboard-empty.xml");
public static final File COLLECTION_BASIC = new File(COMMON_DIR, "object-collection-basic-filter.xml");

public static final File REPORT_DASHBOARD_WITH_DEFAULT_COLUMN_FILE = new File(TEST_REPORTS_DIR, "report-dashboard-with-default-column.xml");
public static final File REPORT_DASHBOARD_WITH_VIEW_FILE = new File(TEST_REPORTS_DIR, "report-dashboard-with-view.xml");
public static final File REPORT_DASHBOARD_WITH_TRIPLE_VIEW_FILE = new File(TEST_REPORTS_DIR, "report-dashboard-with-triple-view.xml");
public static final File REPORT_DASHBOARD_EMPTY_FILE = new File(TEST_REPORTS_DIR, "report-dashboard-empty.xml");

public static final File REPORT_AUDIT_COLLECTION_WITH_DEFAULT_COLUMN_FILE = new File(TEST_REPORTS_DIR, "report-audit-collection-with-default-column.xml");
public static final File REPORT_AUDIT_COLLECTION_WITH_VIEW_FILE = new File(TEST_REPORTS_DIR, "report-audit-collection-with-view.xml");
public static final File REPORT_AUDIT_COLLECTION_WITH_DOUBLE_VIEW_FILE = new File(TEST_REPORTS_DIR, "report-audit-collection-with-double-view.xml");
public static final File REPORT_AUDIT_COLLECTION_WITH_CONDITION_FILE = new File(TEST_REPORTS_DIR, "report-audit-collection-with-condition.xml");
public static final File REPORT_AUDIT_COLLECTION_EMPTY_FILE = new File(TEST_REPORTS_DIR, "report-audit-collection-empty.xml");

public static final File REPORT_OBJECT_COLLECTION_WITH_DEFAULT_COLUMN_FILE = new File(TEST_REPORTS_DIR, "report-object-collection-with-default-column.xml");
public static final File REPORT_OBJECT_COLLECTION_WITH_VIEW_FILE = new File(TEST_REPORTS_DIR, "report-object-collection-with-view.xml");
public static final File REPORT_OBJECT_COLLECTION_WITH_DOUBLE_VIEW_FILE = new File(TEST_REPORTS_DIR, "report-object-collection-with-double-view.xml");
public static final File REPORT_OBJECT_COLLECTION_WITH_FILTER_FILE = new File(TEST_REPORTS_DIR, "report-object-collection-with-filter.xml");
public static final File REPORT_OBJECT_COLLECTION_WITH_FILTER_AND_BASIC_COLLECTION_FILE = new File(TEST_REPORTS_DIR, "report-object-collection-with-filter-and-basic-collection.xml");
public static final File REPORT_OBJECT_COLLECTION_WITH_CONDITION_FILE = new File(TEST_REPORTS_DIR, "report-object-collection-with-condition.xml");
public static final File REPORT_OBJECT_COLLECTION_EMPTY_FILE = new File(TEST_REPORTS_DIR, "report-object-collection-empty.xml");
public static final File REPORT_WITH_IMPORT_SCRIPT = new File(TEST_REPORTS_DIR, "report-with-import-script.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_DASHBOARD_EMPTY_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a8eq2";

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_AUDIT_COLLECTION_WITH_CONDITION_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a85rr";
public static final String REPORT_AUDIT_COLLECTION_EMPTY_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a85qf";

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_OBJECT_COLLECTION_WITH_FILTER_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a85gh";
public static final String REPORT_OBJECT_COLLECTION_WITH_FILTER_AND_BASIC_COLLECTION_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a85hi";
public static final String REPORT_OBJECT_COLLECTION_WITH_CONDITION_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a851a";
public static final String REPORT_OBJECT_COLLECTION_EMPTY_LIST_OID = "2b44aa2e-dd86-4842-bcf5-762c8a9a85sq";
public static final String REPORT_WITH_IMPORT_SCRIPT_OID = "2b44aa2e-dd86-4842-bcf5-762c8c4a851a";

public static final String RESOURCE_DUMMY_OID = "10000000-0000-0000-0000-000000000004";
Expand Down Expand Up @@ -123,23 +132,29 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
importObjectFromFile(COLLECTION_RESOURCE_WITH_VIEW_FILE, initResult);
importObjectFromFile(COLLECTION_TASK_WITH_VIEW_FILE, initResult);
importObjectFromFile(COLLECTION_AUDIT_WITH_VIEW_FILE, initResult);
importObjectFromFile(COLLECTION_AUDIT_EMPTY_FILE, initResult);
importObjectFromFile(COLLECTION_ASSIGNMENT_HOLDER_WITH_VIEW_FILE, initResult);
importObjectFromFile(COLLECTION_SHADOW_WITH_VIEW_FILE, initResult);
importObjectFromFile(COLLECTION_EMPTY_FILE, initResult);
importObjectFromFile(DASHBOARD_TRIPLE_VIEW_FILE, initResult);
importObjectFromFile(DASHBOARD_EMPTY_FILE, initResult);

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_DASHBOARD_EMPTY_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_AUDIT_COLLECTION_WITH_CONDITION_FILE, initResult);
importObjectFromFile(REPORT_AUDIT_COLLECTION_EMPTY_FILE, initResult);
importObjectFromFile(REPORT_OBJECT_COLLECTION_WITH_FILTER_FILE, initResult);
importObjectFromFile(REPORT_OBJECT_COLLECTION_WITH_FILTER_AND_BASIC_COLLECTION_FILE, initResult);
importObjectFromFile(REPORT_OBJECT_COLLECTION_WITH_CONDITION_FILE, initResult);
importObjectFromFile(REPORT_OBJECT_COLLECTION_EMPTY_FILE, initResult);
importObjectFromFile(REPORT_WITH_IMPORT_SCRIPT, initResult);
}

Expand All @@ -164,6 +179,13 @@ public void test003CreateDashboardReportWithTripleView() throws Exception {
basicCheckOutputFile(report);
}

@Test
public void test004CreateDashboardReportEmpty() throws Exception {
PrismObject<ReportType> report = getObject(ReportType.class, REPORT_DASHBOARD_EMPTY_OID);
runReport(report, false);
basicCheckOutputFile(report);
}

@Test
public void test101CreateAuditCollectionReportWithDefaultColumn() throws Exception {
PrismObject<ReportType> report = getObject(ReportType.class, REPORT_AUDIT_COLLECTION_WITH_DEFAULT_COLUMN_OID);
Expand Down Expand Up @@ -192,6 +214,13 @@ public void test104CreateAuditCollectionReportWithCondition() throws Exception {
basicCheckOutputFile(report);
}

@Test
public void test105CreateAuditCollectionReportEmpty() throws Exception {
PrismObject<ReportType> report = getObject(ReportType.class, REPORT_AUDIT_COLLECTION_EMPTY_OID);
runReport(report, false);
basicCheckOutputFile(report);
}

@Test
public void test110CreateObjectCollectionReportWithDefaultColumn() throws Exception {
PrismObject<ReportType> report = getObject(ReportType.class, REPORT_OBJECT_COLLECTION_WITH_DEFAULT_COLUMN_OID);
Expand Down Expand Up @@ -234,6 +263,13 @@ public void test115CreateObjectCollectionReportWithCondition() throws Exception
basicCheckOutputFile(report);
}

@Test
public void test116CreateObjectCollectionEmptyReport() throws Exception {
PrismObject<ReportType> report = getObject(ReportType.class, REPORT_OBJECT_COLLECTION_EMPTY_LIST_OID);
runReport(report, false);
basicCheckOutputFile(report);
}

protected PrismObject<TaskType> runReport(PrismObject<ReportType> report, boolean errorOk) throws Exception {
Task task = createTask(OP_CREATE_REPORT);
OperationResult result = task.getResult();
Expand Down
23 changes: 22 additions & 1 deletion model/report-impl/src/test/java/com/evolveum/midpoint/report/TestCsvReport.java
View file
Expand Up @@ -70,6 +70,13 @@ public void test003CreateDashboardReportWithTripleView() throws Exception {
super.test003CreateDashboardReportWithTripleView();
}

@Override
public void test004CreateDashboardReportEmpty() throws Exception {
expectedColumns = 3;
expectedRow = 3;
super.test004CreateDashboardReportEmpty();
}

@Override
public void test101CreateAuditCollectionReportWithDefaultColumn() throws Exception {
expectedColumns = 8;
Expand Down Expand Up @@ -98,6 +105,13 @@ public void test104CreateAuditCollectionReportWithCondition() throws Exception {
super.test104CreateAuditCollectionReportWithCondition();
}

@Override
public void test105CreateAuditCollectionReportEmpty() throws Exception {
expectedColumns = 8;
expectedRow = 1;
super.test105CreateAuditCollectionReportEmpty();
}

@Override
public void test110CreateObjectCollectionReportWithDefaultColumn() throws Exception {
expectedColumns = 6;
Expand Down Expand Up @@ -140,6 +154,13 @@ public void test115CreateObjectCollectionReportWithCondition() throws Exception
super.test115CreateObjectCollectionReportWithCondition();
}

@Test
public void test116CreateObjectCollectionEmptyReport() throws Exception {
expectedColumns = 6;
expectedRow = 1;
super.test116CreateObjectCollectionEmptyReport();
}

@Test
public void test200ImportReportForUser() throws Exception {
PrismObject<ReportType> report = getObject(ReportType.class, REPORT_IMPORT_OBJECT_COLLECTION_WITH_CONDITION_OID);
Expand Down Expand Up @@ -242,7 +263,7 @@ public void test202ImportReportWithImportScript() throws Exception {

private void setExpectedValueForDashboardReport() {
expectedColumns = 3;
expectedRow = 7;
expectedRow = 8;
}

@Override
Expand Down
64 changes: 32 additions & 32 deletions model/report-impl/src/test/resources/common/dashboard-default-columns.xml
View file
Expand Up @@ -170,38 +170,38 @@
</dataField>
</presentation>
</widget>
<!--<widget>-->
<!-- <identifier>shadow-of-resource</identifier>-->
<!-- <display>-->
<!-- <label>Shadow of resource</label>-->
<!-- <color>#00a65a</color>-->
<!-- <icon>-->
<!-- <cssClass>fa fa-database</cssClass>-->
<!-- </icon>-->
<!-- </display>-->
<!-- <data>-->
<!-- <sourceType>objectCollection</sourceType>-->
<!-- <collection>-->
<!-- <collectionRef oid="72b1f98e-f587-4b9f-b92b-72e251dbb244" relation="default" type="ObjectCollectionType"/>-->
<!-- </collection>-->
<!-- </data>-->
<!-- <presentation>-->
<!-- <dataField>-->
<!-- <fieldType>value</fieldType>-->
<!-- <expression>-->
<!-- <proportional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xsi:type="c:ProportionalExpressionEvaluatorType">-->
<!-- <style>value-only</style>-->
<!-- </proportional>-->
<!-- </expression>-->
<!-- </dataField>-->
<!-- <dataField>-->
<!-- <fieldType>unit</fieldType>-->
<!-- <expression>-->
<!-- <value>shadows</value>-->
<!-- </expression>-->
<!-- </dataField>-->
<!-- </presentation>-->
<!--</widget>-->
<widget>
<identifier>shadow-of-resource</identifier>
<display>
<label>Shadow of resource</label>
<color>#00a65a</color>
<icon>
<cssClass>fa fa-database</cssClass>
</icon>
</display>
<data>
<sourceType>objectCollection</sourceType>
<collection>
<collectionRef oid="72b1f98e-f587-4b9f-b92b-72e251dbb244" relation="default" type="ObjectCollectionType"/>
</collection>
</data>
<presentation>
<dataField>
<fieldType>value</fieldType>
<expression>
<proportional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xsi:type="c:ProportionalExpressionEvaluatorType">
<style>value-only</style>
</proportional>
</expression>
</dataField>
<dataField>
<fieldType>unit</fieldType>
<expression>
<value>shadows</value>
</expression>
</dataField>
</presentation>
</widget>
<widget>
<identifier>all audit</identifier>
<display>
Expand Down
77 changes: 77 additions & 0 deletions model/report-impl/src/test/resources/common/dashboard-empty.xml
View file
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2010-2020 Evolveum and contributors
~
~ This work is dual-licensed under the Apache License 2.0
~ and European Union Public License. See LICENSE file for details.
-->
<dashboard oid="00000000-0000-0000-0001-000000kj1231">
<name>test-dashboard-empty</name>
<display>
<label>Test dashboard</label>
</display>
<widget>
<identifier>user-all</identifier>
<display>
<label>User all</label>
<color>#00a65a</color>
<icon>
<cssClass>fa fa-user</cssClass>
</icon>
</display>
<data>
<sourceType>objectCollection</sourceType>
<collection>
<collectionRef oid="72b1f98e-f587-4b9f-b92b-72e251dbb201" relation="default" type="ObjectCollectionType"/>
</collection>
</data>
<presentation>
<dataField>
<fieldType>value</fieldType>
<expression>
<proportional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xsi:type="c:ProportionalExpressionEvaluatorType">
<style>value-only</style>
</proportional>
</expression>
</dataField>
<dataField>
<fieldType>unit</fieldType>
<expression>
<value>users</value>
</expression>
</dataField>
</presentation>
</widget>
<widget>
<identifier>all audit</identifier>
<display>
<label>Audit records</label>
<color>#00a65a</color>
<icon>
<cssClass>fa fa-cog</cssClass>
</icon>
</display>
<data>
<sourceType>auditSearch</sourceType>
<collection>
<collectionRef oid="00000000-0000-0000-0001-000000gh1234" relation="default" type="ObjectCollectionType"/>
</collection>
</data>
<presentation>
<dataField>
<fieldType>value</fieldType>
<expression>
<proportional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xsi:type="c:ProportionalExpressionEvaluatorType">
<style>value-only</style>
</proportional>
</expression>
</dataField>
<dataField>
<fieldType>unit</fieldType>
<expression>
<value>records</value>
</expression>
</dataField>
</presentation>
</widget>
</dashboard>

0 comments on commit fb8964f

Please sign in to comment.