This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit d559ea8ca1ce4d93fe38ac0099137f9c238252e7
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Thu Apr 4 18:51:02 2024 +0200
Fixed: Fix Accounting Groovy tests (OFBIZ-12995)
This fixes the inability to find the files where they are expected.
Remains few issues related unrelated to folder migration.
I guess they are due to the migration from Minilang to Groovy.
---
.../accounting/AutoAcctgAdminTests.groovy | 2 +-
.../accounting/AutoAcctgAgreementTests.groovy | 2 +-
.../accounting/AutoAcctgBudgetTests.groovy | 2 +-
.../accounting/AutoAcctgCostTests.groovy | 2 +-
.../accounting/AutoAcctgFinAccountTests.groovy | 2 +-
.../accounting/AutoAcctgFixedAssetTests.groovy | 2 +-
.../accounting/AutoAcctgInvoiceTests.groovy | 2 +-
.../accounting/AutoAcctgLedgerTests.groovy | 2 +-
.../accounting/AutoAcctgPaymentGatewayTests.groovy | 2 +-
.../accounting/AutoAcctgPaymentTests.groovy | 2 +-
.../accounting/AutoAcctgTransTestsPurchase.groovy | 2 +-
.../accounting/AutoAcctgTransTestsSales.groovy | 2 +-
.../accounting/accounting/AutoInvoiceTests.groovy | 2 +-
.../accounting/accounting/AutoPaymentTests.groovy | 2 +-
.../accounting/accounting/FixedAssetTests.groovy | 2 +-
.../accounting/InvoicePerShipmentTests.groovy | 6 ++---
.../accounting/PaymentApplicationTests.groovy | 2 +-
.../ofbiz}/accounting/accounting/RateTests.groovy | 2 +-
.../accounting/testdef/accountingtests.xml | 26 +++++++++++-----------
.../accounting/testdef/fixedassettests.xml | 2 +-
applications/accounting/testdef/invoicetests.xml | 4 ++--
.../accounting/testdef/paymentappltests.xml | 2 +-
applications/accounting/testdef/paymenttests.xml | 4 ++--
applications/accounting/testdef/ratetests.xml | 2 +-
applications/content/testdef/ContentTests.xml | 8 +++----
build.gradle | 2 +-
26 files changed, 45 insertions(+), 45 deletions(-)
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgAdminTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgAdminTests.groovy
similarity index 99%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgAdminTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgAdminTests.groovy
index 58289e06a5..18f88819dc 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgAdminTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgAdminTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.ServiceUtil
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgAgreementTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgAgreementTests.groovy
similarity index 98%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgAgreementTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgAgreementTests.groovy
index 9b17b48985..84e648d31b 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgAgreementTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgAgreementTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.ServiceUtil
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgBudgetTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgBudgetTests.groovy
similarity index 97%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgBudgetTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgBudgetTests.groovy
index c086dd8fba..2264342af1 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgBudgetTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgBudgetTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.ServiceUtil
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgCostTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgCostTests.groovy
similarity index 98%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgCostTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgCostTests.groovy
index 3a39c2ce80..6ab0e12daf 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgCostTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgCostTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.ServiceUtil
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgFinAccountTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgFinAccountTests.groovy
similarity index 99%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgFinAccountTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgFinAccountTests.groovy
index 6400019425..109278df14 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgFinAccountTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgFinAccountTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.GenericValue
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgFixedAssetTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgFixedAssetTests.groovy
similarity index 98%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgFixedAssetTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgFixedAssetTests.groovy
index 761e8c11e5..d41fa3702c 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgFixedAssetTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgFixedAssetTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.GenericValue
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgInvoiceTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgInvoiceTests.groovy
similarity index 99%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgInvoiceTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgInvoiceTests.groovy
index 83de5af6bc..ca9af5fcf6 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgInvoiceTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgInvoiceTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.GenericValue
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgLedgerTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgLedgerTests.groovy
similarity index 98%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgLedgerTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgLedgerTests.groovy
index 3bedd58961..0cb5289051 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgLedgerTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgLedgerTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.GenericValue
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgPaymentGatewayTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgPaymentGatewayTests.groovy
similarity index 97%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgPaymentGatewayTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgPaymentGatewayTests.groovy
index 52d62c580e..2652163100 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgPaymentGatewayTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgPaymentGatewayTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.ServiceUtil
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgPaymentTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgPaymentTests.groovy
similarity index 98%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgPaymentTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgPaymentTests.groovy
index 18e02ac83f..960acf38f4 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgPaymentTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgPaymentTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.GenericValue
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgTransTestsPurchase.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgTransTestsPurchase.groovy
similarity index 99%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgTransTestsPurchase.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgTransTestsPurchase.groovy
index 4123c6a435..593c4cc1d4 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgTransTestsPurchase.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgTransTestsPurchase.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.ServiceUtil
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgTransTestsSales.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgTransTestsSales.groovy
similarity index 99%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgTransTestsSales.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgTransTestsSales.groovy
index ce98bce481..7e14b614bc 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoAcctgTransTestsSales.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoAcctgTransTestsSales.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.util.EntityUtil
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoInvoiceTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoInvoiceTests.groovy
similarity index 99%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoInvoiceTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoInvoiceTests.groovy
index 38072bcfb2..6069f79fa8 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoInvoiceTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoInvoiceTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.accounting.invoice.InvoiceWorker
import org.apache.ofbiz.base.util.UtilDateTime
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoPaymentTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoPaymentTests.groovy
similarity index 99%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoPaymentTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoPaymentTests.groovy
index 3ac0db4768..9977b83f54 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/AutoPaymentTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/AutoPaymentTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import static org.apache.ofbiz.entity.condition.EntityComparisonOperator.IN
import static org.apache.ofbiz.entity.condition.EntityCondition.makeCondition
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/FixedAssetTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/FixedAssetTests.groovy
similarity index 99%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/FixedAssetTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/FixedAssetTests.groovy
index f7c7a61b3a..501b93d2d2 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/FixedAssetTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/FixedAssetTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.GenericValue
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/InvoicePerShipmentTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/InvoicePerShipmentTests.groovy
similarity index 99%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/InvoicePerShipmentTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/InvoicePerShipmentTests.groovy
index 0630ea0d85..fc0821e649 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/InvoicePerShipmentTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/InvoicePerShipmentTests.groovy
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
+
+import javax.servlet.http.HttpSession
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.order.shoppingcart.CheckOutEvents
@@ -30,8 +32,6 @@ import org.apache.ofbiz.shipment.packing.PackingSession
import org.springframework.mock.web.MockHttpServletRequest
import org.springframework.mock.web.MockHttpServletResponse
-import javax.servlet.http.HttpSession
-
class InvoicePerShipmentTests extends OFBizTestCase {
InvoicePerShipmentTests(String name) {
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/PaymentApplicationTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/PaymentApplicationTests.groovy
similarity index 99%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/PaymentApplicationTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/PaymentApplicationTests.groovy
index 9786db73c5..d006fa81cc 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/PaymentApplicationTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/PaymentApplicationTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.ServiceUtil
diff --git
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/RateTests.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/RateTests.groovy
similarity index 99%
rename from
applications/accounting/src/test/groovy/org/apache/accounting/accounting/RateTests.groovy
rename to
applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/RateTests.groovy
index 2ae7eaa5c5..31d4c0eb45 100644
---
a/applications/accounting/src/test/groovy/org/apache/accounting/accounting/RateTests.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/accounting/RateTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.accounting.accounting
+package org.apache.ofbiz.accounting.accounting
import org.apache.ofbiz.service.testtools.OFBizTestCase
import org.apache.ofbiz.service.ServiceUtil
diff --git a/applications/accounting/testdef/accountingtests.xml
b/applications/accounting/testdef/accountingtests.xml
index 7be206862f..cf803862ad 100644
--- a/applications/accounting/testdef/accountingtests.xml
+++ b/applications/accounting/testdef/accountingtests.xml
@@ -27,43 +27,43 @@
</test-case>
<test-case case-name="accounting-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.test.FinAccountTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.order.test.FinAccountTest"/>
</test-case>
<test-case case-name="auto-accounting-transaction-tests-sales">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoAcctgTransTestsSales"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoAcctgTransTestsSales"/>
</test-case>
<test-case case-name="auto-accounting-transaction-tests-purchase">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoAcctgTransTestsPurchase"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoAcctgTransTestsPurchase"/>
</test-case>
<test-case case-name="auto-accounting-admin-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoAcctgAdminTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoAcctgAdminTests"/>
</test-case>
<test-case case-name="auto-accounting-agreement-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoAcctgAgreementTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoAcctgAgreementTests"/>
</test-case>
<test-case case-name="auto-accounting-budget-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoAcctgBudgetTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoAcctgBudgetTests"/>
</test-case>
<test-case case-name="auto-accounting-cost-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoAcctgCostTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoAcctgCostTests"/>
</test-case>
<test-case case-name="auto-accounting-finaccount-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoAcctgFinAccountTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoAcctgFinAccountTests"/>
</test-case>
<test-case case-name="auto-accounting-fixedasset-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoAcctgFixedAssetTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoAcctgFixedAssetTests"/>
</test-case>
<test-case case-name="auto-accounting-invoice-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoAcctgInvoiceTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoAcctgInvoiceTests"/>
</test-case>
<test-case case-name="auto-accounting-payment-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoAcctgPaymentTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoAcctgPaymentTests"/>
</test-case>
<test-case case-name="auto-accounting-paymentgateway-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoAcctgPaymentGatewayTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoAcctgPaymentGatewayTests"/>
</test-case>
<test-case case-name="auto-accounting-ledger-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoAcctgLedgerTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoAcctgLedgerTests"/>
</test-case>
</test-suite>
diff --git a/applications/accounting/testdef/fixedassettests.xml
b/applications/accounting/testdef/fixedassettests.xml
index d1a70e0f8c..1ffa70e8eb 100644
--- a/applications/accounting/testdef/fixedassettests.xml
+++ b/applications/accounting/testdef/fixedassettests.xml
@@ -27,7 +27,7 @@
</test-case>
<test-case case-name="fixedasset-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.FixedAssetTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.FixedAssetTests"/>
</test-case>
</test-suite>
diff --git a/applications/accounting/testdef/invoicetests.xml
b/applications/accounting/testdef/invoicetests.xml
index 392bfdc892..e621037fd0 100644
--- a/applications/accounting/testdef/invoicetests.xml
+++ b/applications/accounting/testdef/invoicetests.xml
@@ -23,9 +23,9 @@
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd";>
<test-group case-name="auto-invoice-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoInvoiceTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoInvoiceTests"/>
</test-group>
<test-case case-name="invoice-per-shipment-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.InvoicePerShipmentTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.InvoicePerShipmentTests"/>
</test-case>
</test-suite>
diff --git a/applications/accounting/testdef/paymentappltests.xml
b/applications/accounting/testdef/paymentappltests.xml
index 72b4b8e001..a3c745a8d2 100644
--- a/applications/accounting/testdef/paymentappltests.xml
+++ b/applications/accounting/testdef/paymentappltests.xml
@@ -26,7 +26,7 @@
<entity-xml action="load"
entity-xml-url="component://accounting/testdef/data/PaymentApplicationTestsData.xml"/>
</test-case>
<test-case case-name="application-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.PaymentApplicationTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.PaymentApplicationTests"/>
</test-case>
</test-suite>
diff --git a/applications/accounting/testdef/paymenttests.xml
b/applications/accounting/testdef/paymenttests.xml
index 7cad8eb142..b64f9458e9 100644
--- a/applications/accounting/testdef/paymenttests.xml
+++ b/applications/accounting/testdef/paymenttests.xml
@@ -23,11 +23,11 @@
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd";>
<test-case case-name="auto-payment-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.AutoPaymentTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.AutoPaymentTests"/>
</test-case>
<!-- enable when sandbox is available and configured -->
<!-- test-case case-name="cc-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.accounting.thirdparty.securepay.SecurePayServiceTest"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.thirdparty.securepay.SecurePayServiceTest"/>
</test-case-->
</test-suite>
diff --git a/applications/accounting/testdef/ratetests.xml
b/applications/accounting/testdef/ratetests.xml
index 851aadf956..2d1fa72dea 100644
--- a/applications/accounting/testdef/ratetests.xml
+++ b/applications/accounting/testdef/ratetests.xml
@@ -26,6 +26,6 @@
</test-case>
<test-case case-name="rate-tests">
- <junit-test-suite class-name="org.apache.ofbiz.accounting.RateTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.accounting.accounting.RateTests"/>
</test-case>
</test-suite>
diff --git a/applications/content/testdef/ContentTests.xml
b/applications/content/testdef/ContentTests.xml
index 9695a11d06..6fd4eb5ad2 100644
--- a/applications/content/testdef/ContentTests.xml
+++ b/applications/content/testdef/ContentTests.xml
@@ -20,13 +20,13 @@
<test-suite suite-name="contenttests"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd";>
-
+
<test-case case-name="content-tests-data-load">
<entity-xml action="load"
entity-xml-url="component://content/testdef/data/ContentTestsData.xml"/>
</test-case>
-
+
<test-case case-name="content-tests">
- <junit-test-suite class-name="org.apache.ofbiz.content.ContentTests"/>
- </test-case>
+ <groovy-test-suite class-name="org.apache.ofbiz.content.ContentTests"/>
+ </test-case>
</test-suite>
diff --git a/build.gradle b/build.gradle
index 54081d7d1f..055dc9348e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -254,7 +254,7 @@ sourceSets {
srcDirs += getDirectoryInActiveComponentsIfExists('dtd')
}
}
-
+ // This is unit tests. Integration tests must be above because of
compilation issues.
test {
java {
srcDirs = getDirectoryInActiveComponentsIfExists('src/test/java')
