From fee3d734261c53991277d76f51a7d2178d778ba7 Mon Sep 17 00:00:00 2001 From: Petri Tuomola Date: Fri, 5 Nov 2021 16:14:05 +0800 Subject: [PATCH] Fix test broken by PR1917 --- .github/workflows/build.yml | 4 ++++ ...ng_expenseliablity_to_paymentorfeetype.sql | 4 ++-- .../AccountingScenarioIntegrationTest.java | 3 ++- .../integrationtests/SchedulerJobsTest.java | 2 ++ .../SchedulerJobsTestResults.java | 2 ++ .../loan/LoanImportHandlerTest.java | 2 ++ .../test/resources/junit-platform.properties | 20 +++++++++++++++++++ 7 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 integration-tests/src/test/resources/junit-platform.properties diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c45d5869..cfcc71c7b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,5 +34,9 @@ jobs: run: | ./gradlew --no-daemon -q createDB -PdbName=fineract_tenants ./gradlew --no-daemon -q createDB -PdbName=fineract_default + - name: Install additional software + run: | + sudo apt-get update + sudo apt-get install ghostscript -y - name: Build & Test run: ./gradlew --no-daemon -q --console=plain licenseMain licenseTest check build test --fail-fast doc diff --git a/fineract-provider/src/main/resources/sql/migrations/core_db/V374__adding_expenseliablity_to_paymentorfeetype.sql b/fineract-provider/src/main/resources/sql/migrations/core_db/V374__adding_expenseliablity_to_paymentorfeetype.sql index fa090bee2..075976a9d 100644 --- a/fineract-provider/src/main/resources/sql/migrations/core_db/V374__adding_expenseliablity_to_paymentorfeetype.sql +++ b/fineract-provider/src/main/resources/sql/migrations/core_db/V374__adding_expenseliablity_to_paymentorfeetype.sql @@ -20,6 +20,6 @@ ALTER TABLE `c_configuration` ADD COLUMN `string_value` VARCHAR(100) NULL DEFAULT NULL AFTER `date_value`; -insert into c_configuration(name, string_value, enabled, description) values('account-mapping-for-payment-type', 'Asset', '1', 'Asset: default for asset, Use comma seperated values for Liability, Asset and Expense accounts'); +insert into c_configuration(name, string_value, enabled, description) values('account-mapping-for-payment-type', 'Asset', 0, 'Asset: default for asset, Use comma seperated values for Liability, Asset and Expense accounts'); -insert into c_configuration(name, string_value, enabled, description) values('account-mapping-for-charge', 'Income', '1', 'Income: default for Income, Use comma seperated values for Income, Liability and Expense accounts'); +insert into c_configuration(name, string_value, enabled, description) values('account-mapping-for-charge', 'Income', 0, 'Income: default for Income, Use comma seperated values for Income, Liability and Expense accounts'); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java index 76d1e2bdf..6e0c2498e 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java @@ -66,12 +66,13 @@ import org.apache.fineract.integrationtests.common.savings.SavingsProductHelper; import org.apache.fineract.integrationtests.common.savings.SavingsStatusChecker; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({ "unchecked" }) - +@Order(2) public class AccountingScenarioIntegrationTest { private static final Logger LOG = LoggerFactory.getLogger(AccountingScenarioIntegrationTest.class); diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTest.java index 0d38591f2..5f093d72d 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTest.java @@ -34,8 +34,10 @@ import org.apache.fineract.integrationtests.common.Utils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; +@Order(1) public class SchedulerJobsTest { private RequestSpecification requestSpec; diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java index c78c87c6d..44f41622e 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/SchedulerJobsTestResults.java @@ -69,9 +69,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.MethodOrderer.MethodName; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; +@Order(1) @TestMethodOrder(MethodName.class) @SuppressWarnings({ "unchecked", "rawtypes" }) public class SchedulerJobsTestResults { diff --git a/integration-tests/src/test/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java b/integration-tests/src/test/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java index b8a93c159..746e40ec6 100644 --- a/integration-tests/src/test/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java +++ b/integration-tests/src/test/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java @@ -59,10 +59,12 @@ import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Order(3) public class LoanImportHandlerTest { private static final Logger LOG = LoggerFactory.getLogger(LoanImportHandlerTest.class); diff --git a/integration-tests/src/test/resources/junit-platform.properties b/integration-tests/src/test/resources/junit-platform.properties new file mode 100644 index 000000000..781baf184 --- /dev/null +++ b/integration-tests/src/test/resources/junit-platform.properties @@ -0,0 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +junit.jupiter.testclass.order.default = org.junit.jupiter.api.ClassOrderer$OrderAnnotation