diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
index 2b58405a6..0294b2a76 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/changelog-tenant.xml
@@ -37,4 +37,5 @@
+
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/parts/0018_pentaho_reports_to_table.xml b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0018_pentaho_reports_to_table.xml
new file mode 100644
index 000000000..8c5b1c802
--- /dev/null
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/parts/0018_pentaho_reports_to_table.xml
@@ -0,0 +1,247 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ReportsTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ReportsTest.java
index 98378b14a..9430ac556 100644
--- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ReportsTest.java
+++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ReportsTest.java
@@ -23,6 +23,8 @@ import java.util.Map;
import okhttp3.MediaType;
import okhttp3.Request;
import okhttp3.ResponseBody;
+import org.apache.fineract.integrationtests.common.Utils;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -33,9 +35,14 @@ import org.junit.jupiter.api.Test;
*/
public class ReportsTest extends IntegrationTest {
+ @BeforeEach
+ public void setup() {
+ Utils.initializeRESTAssured();
+ }
+
@Test
void listReports() {
- assertThat(ok(fineract().reports.retrieveReportList())).hasSize(120);
+ assertThat(ok(fineract().reports.retrieveReportList())).hasSize(124);
}
@Test
@@ -69,4 +76,30 @@ public class ReportsTest extends IntegrationTest {
"2013-04-30", "R_loanOfficerId", "-1", "R_officeId", "1", "R_startDate", "2013-04-16", "output-type", "PDF"), false));
assertThat(r.contentType()).isEqualTo(MediaType.get("application/pdf"));
}
+
+ @Test
+ void testTrialBalanceTableReportRunsSuccessfully() {
+ assertThat(fineract().reportsRun.runReportGetData("Trial Balance Table",
+ Map.of("R_endDate", "2013-04-30", "R_officeId", "1", "R_startDate", "2013-04-16"), false)).hasHttpStatus(200);
+ }
+
+ @Test
+ void testIncomeStatementTableReportRunsSuccessfully() {
+ assertThat(fineract().reportsRun.runReportGetData("Income Statement Table",
+ Map.of("R_endDate", "2013-04-30", "R_officeId", "1", "R_startDate", "2013-04-16"), false)).hasHttpStatus(200);
+ }
+
+ @Test
+ void testGeneralLedgerReportTableReportRunsSuccessfully() {
+ assertThat(fineract().reportsRun.runReportGetData("GeneralLedgerReport Table",
+ Map.of("R_endDate", "2013-04-30", "R_officeId", "1", "R_startDate", "2013-04-16", "R_GLAccountNO", "1"), false))
+ .hasHttpStatus(200);
+ }
+
+ @Test
+ void testBalanceSheetTableReportRunsSuccessfully() {
+ assertThat(
+ fineract().reportsRun.runReportGetData("Balance Sheet Table", Map.of("R_endDate", "2013-04-30", "R_officeId", "1"), false))
+ .hasHttpStatus(200);
+ }
}