This is an automated email from the ASF dual-hosted git repository.
pgil pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 50daf71afb Fixed: Product Groovy tests (OFBIZ-12999)
50daf71afb is described below
commit 50daf71afb4c938b807fa3800f1c3f06e7c84272
Author: Gil Portenseigne <gil.portensei...@nereide.fr>
AuthorDate: Fri Apr 5 16:50:44 2024 +0200
Fixed: Product Groovy tests (OFBIZ-12999)
Fix error that make test unable to be loaded.
---
.../org/apache/ofbiz/product/product/test}/CategoryTests.groovy | 2 +-
.../groovy/org/apache/ofbiz/product/product/test}/CostTests.groovy | 2 +-
.../org/apache/ofbiz/product/product/test}/InventoryTests.groovy | 2 +-
.../apache/ofbiz/product/product/test}/ProductConfigTests.groovy | 2 +-
.../ofbiz/product/product/test}/ProductFeatureTypeTests.groovy | 2 +-
.../org/apache/ofbiz/product/product/test}/ProductPriceTests.groovy | 2 +-
.../ofbiz/product/product/test}/ProductPromoActionTests.groovy | 2 +-
.../apache/ofbiz/product/product/test}/ProductPromoCondTests.groovy | 2 +-
.../org/apache/ofbiz/product/product/test}/ProductTagTest.groovy | 2 +-
.../org/apache/ofbiz/product/product/test}/ProductTest.groovy | 2 +-
.../org/apache/ofbiz/product/product/test}/ProductTests.groovy | 2 +-
.../org/apache/ofbiz/product/product/test}/ShipmentTests.groovy | 2 +-
.../apache/ofbiz/shipment/product/test}/ShipmentCostTests.groovy | 2 +-
applications/product/testdef/CatalogTests.xml | 4 ++--
applications/product/testdef/CostTests.xml | 2 +-
applications/product/testdef/FacilityTest.xml | 6 +++---
applications/product/testdef/ProductConfigTests.xml | 4 ++--
applications/product/testdef/ProductPromoTests.xml | 4 ++--
applications/product/testdef/ProductTagTest.xml | 2 +-
applications/product/testdef/ProductTest.xml | 6 +++---
20 files changed, 27 insertions(+), 27 deletions(-)
diff --git
a/applications/product/src/test/groovy/org/apache/product/product/CategoryTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/CategoryTests.groovy
similarity index 98%
rename from
applications/product/src/test/groovy/org/apache/product/product/CategoryTests.groovy
rename to
applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/CategoryTests.groovy
index 81db47abc7..b562ab2012 100644
---
a/applications/product/src/test/groovy/org/apache/product/product/CategoryTests.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/CategoryTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.product.product
+package org.apache.ofbiz.product.product.test
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.GenericValue
diff --git
a/applications/product/src/test/groovy/org/apache/product/product/CostTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/CostTests.groovy
similarity index 98%
rename from
applications/product/src/test/groovy/org/apache/product/product/CostTests.groovy
rename to
applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/CostTests.groovy
index f24537b766..058d7fd9ba 100644
---
a/applications/product/src/test/groovy/org/apache/product/product/CostTests.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/CostTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.product.product
+package org.apache.ofbiz.product.product.test
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.ServiceUtil
diff --git
a/applications/product/src/test/groovy/org/apache/product/product/InventoryTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/InventoryTests.groovy
similarity index 97%
rename from
applications/product/src/test/groovy/org/apache/product/product/InventoryTests.groovy
rename to
applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/InventoryTests.groovy
index c4ab028690..34f6a1a848 100644
---
a/applications/product/src/test/groovy/org/apache/product/product/InventoryTests.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/InventoryTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.product.product
+package org.apache.ofbiz.product.product.test
import org.apache.ofbiz.service.ServiceUtil
import org.apache.ofbiz.service.testtools.OFBizTestCase
diff --git
a/applications/product/src/test/groovy/org/apache/product/product/ProductConfigTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductConfigTests.groovy
similarity index 97%
rename from
applications/product/src/test/groovy/org/apache/product/product/ProductConfigTests.groovy
rename to
applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductConfigTests.groovy
index 0cb828bd37..b3b35a6e18 100644
---
a/applications/product/src/test/groovy/org/apache/product/product/ProductConfigTests.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductConfigTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.product.product
+package org.apache.ofbiz.product.product.test
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.testtools.OFBizTestCase
diff --git
a/applications/product/src/test/groovy/org/apache/product/product/ProductFeatureTypeTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductFeatureTypeTests.groovy
similarity index 97%
rename from
applications/product/src/test/groovy/org/apache/product/product/ProductFeatureTypeTests.groovy
rename to
applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductFeatureTypeTests.groovy
index 73ee65d623..78a38d03bf 100644
---
a/applications/product/src/test/groovy/org/apache/product/product/ProductFeatureTypeTests.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductFeatureTypeTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.product.product
+package org.apache.ofbiz.product.product.test
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.ServiceUtil
diff --git
a/applications/product/src/test/groovy/org/apache/product/product/ProductPriceTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductPriceTests.groovy
similarity index 98%
rename from
applications/product/src/test/groovy/org/apache/product/product/ProductPriceTests.groovy
rename to
applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductPriceTests.groovy
index 59e496d4b6..ca9c35a81f 100644
---
a/applications/product/src/test/groovy/org/apache/product/product/ProductPriceTests.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductPriceTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.product.product
+package org.apache.ofbiz.product.product.test
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.ServiceUtil
diff --git
a/applications/product/src/test/groovy/org/apache/product/product/ProductPromoActionTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductPromoActionTests.groovy
similarity index 99%
rename from
applications/product/src/test/groovy/org/apache/product/product/ProductPromoActionTests.groovy
rename to
applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductPromoActionTests.groovy
index 0beb7158cd..65d84290af 100644
---
a/applications/product/src/test/groovy/org/apache/product/product/ProductPromoActionTests.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductPromoActionTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.product.product
+package org.apache.ofbiz.product.product.test
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.GenericValue
diff --git
a/applications/product/src/test/groovy/org/apache/product/product/ProductPromoCondTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductPromoCondTests.groovy
similarity index 99%
rename from
applications/product/src/test/groovy/org/apache/product/product/ProductPromoCondTests.groovy
rename to
applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductPromoCondTests.groovy
index 68b994e2af..d0f93610cf 100644
---
a/applications/product/src/test/groovy/org/apache/product/product/ProductPromoCondTests.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductPromoCondTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.product.product
+package org.apache.ofbiz.product.product.test
import java.sql.Timestamp
import org.apache.ofbiz.base.util.UtilDateTime
diff --git
a/applications/product/src/test/groovy/org/apache/product/product/ProductTagTest.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductTagTest.groovy
similarity index 99%
rename from
applications/product/src/test/groovy/org/apache/product/product/ProductTagTest.groovy
rename to
applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductTagTest.groovy
index 62340e2e8a..e60ae367be 100644
---
a/applications/product/src/test/groovy/org/apache/product/product/ProductTagTest.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductTagTest.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.product.product
+package org.apache.ofbiz.product.product.test
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.ServiceUtil
diff --git
a/applications/product/src/test/groovy/org/apache/product/product/ProductTest.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductTest.groovy
similarity index 99%
rename from
applications/product/src/test/groovy/org/apache/product/product/ProductTest.groovy
rename to
applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductTest.groovy
index 01bf592705..1ee84c954a 100644
---
a/applications/product/src/test/groovy/org/apache/product/product/ProductTest.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductTest.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.product.product
+package org.apache.ofbiz.product.product.test
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.GenericValue
diff --git
a/applications/product/src/test/groovy/org/apache/product/product/ProductTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductTests.groovy
similarity index 97%
rename from
applications/product/src/test/groovy/org/apache/product/product/ProductTests.groovy
rename to
applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductTests.groovy
index 5fe90d40ff..037288bfe4 100644
---
a/applications/product/src/test/groovy/org/apache/product/product/ProductTests.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ProductTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.product.product
+package org.apache.ofbiz.product.product.test
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.service.ServiceUtil
diff --git
a/applications/product/src/test/groovy/org/apache/product/product/ShipmentTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ShipmentTests.groovy
similarity index 99%
rename from
applications/product/src/test/groovy/org/apache/product/product/ShipmentTests.groovy
rename to
applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ShipmentTests.groovy
index d0721adc16..7bc600978e 100644
---
a/applications/product/src/test/groovy/org/apache/product/product/ShipmentTests.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/test/ShipmentTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.product.product
+package org.apache.ofbiz.product.product.test
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.GenericValue
diff --git
a/applications/product/src/test/groovy/org/apache/product/shipment/ShipmentCostTests.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/shipment/product/test/ShipmentCostTests.groovy
similarity index 99%
rename from
applications/product/src/test/groovy/org/apache/product/shipment/ShipmentCostTests.groovy
rename to
applications/product/src/main/groovy/org/apache/ofbiz/shipment/product/test/ShipmentCostTests.groovy
index 16f994650b..35e08bf51f 100644
---
a/applications/product/src/test/groovy/org/apache/product/shipment/ShipmentCostTests.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/shipment/product/test/ShipmentCostTests.groovy
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*******************************************************************************/
-package org.apache.product.shipment
+package org.apache.ofbiz.product.shipment.test
import org.apache.ofbiz.service.ServiceUtil
import org.apache.ofbiz.service.testtools.OFBizTestCase
diff --git a/applications/product/testdef/CatalogTests.xml
b/applications/product/testdef/CatalogTests.xml
index 50651b6cce..16214213bc 100644
--- a/applications/product/testdef/CatalogTests.xml
+++ b/applications/product/testdef/CatalogTests.xml
@@ -27,7 +27,7 @@ under the License.
</test-case>
<test-case case-name="productPrice-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.product.ProductPriceTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.product.product.test.ProductPriceTests"/>
</test-case>
<test-case case-name="loadCategoryTestData">
@@ -35,6 +35,6 @@ under the License.
</test-case>
<test-case case-name="category-tests">
- <junit-test-suite class-name="org.apache.ofbiz.product.CategoryTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.product.product.test.CategoryTests"/>
</test-case>
</test-suite>
diff --git a/applications/product/testdef/CostTests.xml
b/applications/product/testdef/CostTests.xml
index 37410039b0..fc4ee6dee9 100644
--- a/applications/product/testdef/CostTests.xml
+++ b/applications/product/testdef/CostTests.xml
@@ -23,6 +23,6 @@ under the License.
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd";>
<test-case case-name="cost-tests">
- <junit-test-suite class-name="org.apache.ofbiz.product.CostTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.product.product.test.CostTests"/>
</test-case>
</test-suite>
diff --git a/applications/product/testdef/FacilityTest.xml
b/applications/product/testdef/FacilityTest.xml
index d2c36a9d2c..961e7911b0 100644
--- a/applications/product/testdef/FacilityTest.xml
+++ b/applications/product/testdef/FacilityTest.xml
@@ -28,16 +28,16 @@ under the License.
<junit-test-suite
class-name="org.apache.ofbiz.product.test.InventoryItemTransferTest"/>
</test-case>
<test-case case-name="inventory-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.product.InventoryTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.product.product.test.InventoryTests"/>
</test-case>
<test-case case-name="shipment-tests">
- <junit-test-suite class-name="org.apache.ofbiz.product.ShipmentTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.product.product.test.ShipmentTests"/>
</test-case>
<test-group case-name="shipmentcost-tests">
<entity-xml action="load"
entity-xml-url="component://product/testdef/data/ShipmentCostTestData.xml"/>
- <junit-test-suite
class-name="org.apache.ofbiz.shipment.ShipmentCostTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.product.shipment.test.ShipmentCostTests"/>
</test-group>
<test-case case-name="loadIssuanceTestData">
diff --git a/applications/product/testdef/ProductConfigTests.xml
b/applications/product/testdef/ProductConfigTests.xml
index 566929c4c2..575fb5af77 100644
--- a/applications/product/testdef/ProductConfigTests.xml
+++ b/applications/product/testdef/ProductConfigTests.xml
@@ -27,6 +27,6 @@
<entity-xml action="load"
entity-xml-url="component://product/testdef/data/ProductConfigTestData.xml"/>
</test-case>
<test-case case-name="productConfigtests">
- <junit-test-suite
class-name="org.apache.ofbiz.product.ProductConfigTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.product.product.test.ProductConfigTests"/>
</test-case>
-</test-suite>
\ No newline at end of file
+</test-suite>
diff --git a/applications/product/testdef/ProductPromoTests.xml
b/applications/product/testdef/ProductPromoTests.xml
index c03861343f..b337163b24 100644
--- a/applications/product/testdef/ProductPromoTests.xml
+++ b/applications/product/testdef/ProductPromoTests.xml
@@ -23,9 +23,9 @@
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd";>
<test-group case-name="product-Conditions-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.product.ProductPromoCondTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.product.product.test.ProductPromoCondTests"/>
</test-group>
<test-group case-name="product-Action-tests">
- <junit-test-suite
class-name="org.apache.ofbiz.product.ProductPromoActionTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.product.product.test.ProductPromoActionTests"/>
</test-group>
</test-suite>
diff --git a/applications/product/testdef/ProductTagTest.xml
b/applications/product/testdef/ProductTagTest.xml
index e47668772f..1b5d507e7f 100644
--- a/applications/product/testdef/ProductTagTest.xml
+++ b/applications/product/testdef/ProductTagTest.xml
@@ -23,7 +23,7 @@ under the License.
xsi:noNamespaceSchemaLocation="https://ofbiz.apache.org/dtds/test-suite.xsd";>
<test-case case-name="producttag-test">
- <junit-test-suite
class-name="org.apache.ofbiz.product.ProductTagTest"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.product.product.test.ProductTagTest"/>
</test-case>
</test-suite>
diff --git a/applications/product/testdef/ProductTest.xml
b/applications/product/testdef/ProductTest.xml
index 1bd8524ca2..88d6d57ce7 100644
--- a/applications/product/testdef/ProductTest.xml
+++ b/applications/product/testdef/ProductTest.xml
@@ -27,13 +27,13 @@ under the License.
</test-case>
<test-case case-name="producttest">
- <junit-test-suite class-name="org.apache.ofbiz.product.ProductTest"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.product.product.test.ProductTest"/>
</test-case>
<test-case case-name="product-tests">
- <junit-test-suite class-name="org.apache.ofbiz.product.ProductTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.product.product.test.ProductTests"/>
</test-case>
<test-case case-name="testCreateProductFeatureType">
- <junit-test-suite
class-name="org.apache.ofbiz.product.ProductFeatureTypeTests"/>
+ <junit-test-suite
class-name="org.apache.ofbiz.product.product.test.ProductFeatureTypeTests"/>
</test-case>
</test-suite>
