Improved: Compile groovy integration tests

(OFBIZ-11165) Since there is no need for dynamic reload for integration tests, it is better to compile Groovy tests. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1865786 13f79535-47bb-0310-9956-ffa450edef68
apache · Aug 23, 2019 · 9b68a55 · 9b68a55
1 parent b8e9d04
commit 9b68a55
Show file tree

Hide file tree

Showing 24 changed files with 55 additions and 35 deletions.
diff --git a/...yScripts/test/AutoAcctgBudgetTests.groovy → ...iz/accounting/AutoAcctgBudgetTests.groovy b/...yScripts/test/AutoAcctgBudgetTests.groovy → ...iz/accounting/AutoAcctgBudgetTests.groovy
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
-
+package org.apache.ofbiz.accounting
 
 import org.apache.ofbiz.entity.GenericValue
 import org.apache.ofbiz.entity.util.EntityQuery
@@ -49,4 +49,4 @@ class AutoAcctgBudgetTests extends GroovyScriptTestCase {
         assert ! budgetStatuses?.isEmpty()
         assert budgetStatuses[0].statusId == 'BG_APPROVED'
     }
-}
+}
diff --git a/...Scripts/test/AutoAcctgInvoiceTests.groovy → ...z/accounting/AutoAcctgInvoiceTests.groovy b/...Scripts/test/AutoAcctgInvoiceTests.groovy → ...z/accounting/AutoAcctgInvoiceTests.groovy
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.ofbiz.accounting
 
 import org.apache.ofbiz.base.util.UtilDateTime
 import org.apache.ofbiz.entity.GenericValue
@@ -24,15 +25,27 @@ import org.apache.ofbiz.service.ServiceUtil
 import org.apache.ofbiz.testtools.GroovyScriptTestCase
 class AutoAcctgInvoiceTests extends GroovyScriptTestCase {
     void testCreateInvoiceContent() {
-        Map serviceCtx = [:]
-        serviceCtx.invoiceId = '1008'
-        serviceCtx.contentId = '1000'
-        serviceCtx.invoiceContentTypeId = 'COMMENTS'
-        serviceCtx.fromDate = UtilDateTime.nowTimestamp()
-        serviceCtx.userLogin = EntityQuery.use(delegator).from('UserLogin').where('userLoginId', 'system').cache().queryOne()
+        def userLogin = EntityQuery.use(delegator).from('UserLogin')
+            .where('userLoginId', 'system')
+            .cache()
+            .queryOne()
+
+        Map serviceCtx = [
+            invoiceId: '1008',
+            contentId: '1000',
+            invoiceContentTypeId: 'COMMENTS',
+            fromDate: UtilDateTime.nowTimestamp(),
+            userLogin: userLogin
+        ]
         Map serviceResult = dispatcher.runSync('createInvoiceContent', serviceCtx)
         assert ServiceUtil.isSuccess(serviceResult)
-        GenericValue InvoiceContent = EntityQuery.use(delegator).from('InvoiceContent').where('invoiceId', serviceResult.invoiceId, 'contentId', serviceResult.contentId, 'invoiceContentTypeId', serviceResult.invoiceContentTypeId, 'fromDate',UtilDateTime.nowTimestamp()).queryList()
+
+        GenericValue invoiceContent = EntityQuery.use(delegator).from('InvoiceContent')
+            .where('invoiceId', serviceResult.invoiceId,
+                   'contentId', serviceResult.contentId,
+                   'invoiceContentTypeId', serviceResult.invoiceContentTypeId)
+            .queryFirst()
+
         assert invoiceContent.contentId == serviceResult.contentId
     }
 }
diff --git a/...yScripts/test/AutoAcctgLedgerTests.groovy → ...iz/accounting/AutoAcctgLedgerTests.groovy b/...yScripts/test/AutoAcctgLedgerTests.groovy → ...iz/accounting/AutoAcctgLedgerTests.groovy
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
-
+package org.apache.ofbiz.accounting
 
 import org.apache.ofbiz.base.util.UtilDateTime
 import org.apache.ofbiz.entity.GenericValue

diff --git a/.../test/AutoAcctgPaymentGatewayTests.groovy → ...nting/AutoAcctgPaymentGatewayTests.groovy b/.../test/AutoAcctgPaymentGatewayTests.groovy → ...nting/AutoAcctgPaymentGatewayTests.groovy
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
-
+package org.apache.ofbiz.accounting
 
 import org.apache.ofbiz.entity.GenericValue
 import org.apache.ofbiz.entity.util.EntityQuery

diff --git a/...Scripts/test/AutoAcctgPaymentTests.groovy → ...z/accounting/AutoAcctgPaymentTests.groovy b/...Scripts/test/AutoAcctgPaymentTests.groovy → ...z/accounting/AutoAcctgPaymentTests.groovy
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
-
+package org.apache.ofbiz.accounting
 
 import org.apache.ofbiz.entity.GenericValue
 import org.apache.ofbiz.entity.util.EntityQuery

diff --git a/applications/accounting/testdef/accountingtests.xml b/applications/accounting/testdef/accountingtests.xml
@@ -43,7 +43,7 @@
         <simple-method-test location="component://accounting/minilang/test/AutoAcctgAgreementTests.xml"/>
     </test-case>
     <test-case case-name="auto-accounting-budget-tests">
-        <groovy-test-suite location="component://accounting/groovyScripts/test/AutoAcctgBudgetTests.groovy"/>
+        <junit-test-suite class-name="org.apache.ofbiz.accounting.AutoAcctgBudgetTests"/>
     </test-case>
     <test-case case-name="auto-accounting-cost-tests">
         <simple-method-test location="component://accounting/minilang/test/AutoAcctgCostTests.xml"/>
@@ -58,15 +58,15 @@
         <simple-method-test location="component://accounting/minilang/test/AutoAcctgInvoiceTests.xml"/>
     </test-case>
     <test-case case-name="auto-accounting-invoice-tests">
-        <simple-method-test location="component://accounting/groovyScripts/test/AutoAcctgInvoiceTests.groovy"/>
+        <junit-test-suite class-name="org.apache.ofbiz.accounting.AutoAcctgInvoiceTests"/>
     </test-case>
     <test-case case-name="auto-accounting-payment-tests">
-        <groovy-test-suite location="component://accounting/groovyScripts/test/AutoAcctgPaymentTests.groovy"/>
+        <junit-test-suite class-name="org.apache.ofbiz.accounting.AutoAcctgPaymentTests"/>
     </test-case>
     <test-case case-name="auto-accounting-paymentgateway-tests">
-        <groovy-test-suite location="component://accounting/groovyScripts/test/AutoAcctgPaymentGatewayTests.groovy"/>
+        <junit-test-suite class-name="org.apache.ofbiz.accounting.AutoAcctgPaymentGatewayTests"/>
     </test-case>
     <test-case case-name="auto-accounting-ledger-tests">
-        <groovy-test-suite location="component://accounting/groovyScripts/test/AutoAcctgLedgerTests.groovy"/>
+        <junit-test-suite class-name="org.apache.ofbiz.accounting.AutoAcctgLedgerTests"/>
     </test-case>
 </test-suite>
diff --git a/...nt/groovyScripts/test/ContentTests.groovy → .../apache/ofbiz/content/ContentTests.groovy b/...nt/groovyScripts/test/ContentTests.groovy → .../apache/ofbiz/content/ContentTests.groovy
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
-
+package org.apache.ofbiz.content
 
 import org.apache.ofbiz.base.util.UtilDateTime
 import org.apache.ofbiz.entity.GenericValue
 import org.apache.ofbiz.entity.util.EntityQuery
 import org.apache.ofbiz.service.ServiceUtil
 import org.apache.ofbiz.testtools.GroovyScriptTestCase
 
-class ProductTests extends GroovyScriptTestCase {
+class ContentTests extends GroovyScriptTestCase {
     void testGetDataResource() {
         Map serviceCtx = [:]
         serviceCtx.dataResourceId = 'TEST_RESOURCE'

diff --git a/applications/content/testdef/ContentTests.xml b/applications/content/testdef/ContentTests.xml
@@ -26,7 +26,7 @@
     </test-case>
 
     <test-case case-name="content-tests">
-        <groovy-test-suite location="component://content/groovyScripts/test/ContentTests.groovy"/>
+        <junit-test-suite class-name="org.apache.ofbiz.content.ContentTests"/>
     </test-case> 
 </test-suite>
 
diff --git a/...rder/groovyScripts/test/OrderTests.groovy → .../org/apache/ofbiz/order/OrderTests.groovy b/...rder/groovyScripts/test/OrderTests.groovy → .../org/apache/ofbiz/order/OrderTests.groovy
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.ofbiz.order
 
 import org.apache.ofbiz.entity.util.EntityQuery
 import org.apache.ofbiz.service.ServiceUtil
@@ -136,4 +137,4 @@ class OrderTests extends GroovyScriptTestCase {
         Map serviceResult = dispatcher.runSync('checkCreateStockRequirementQoh', serviceCtx)
         assert ServiceUtil.isSuccess(serviceResult)
     }
-}
+}
diff --git a/...rder/groovyScripts/test/QuoteTests.groovy → .../org/apache/ofbiz/order/QuoteTests.groovy b/...rder/groovyScripts/test/QuoteTests.groovy → .../org/apache/ofbiz/order/QuoteTests.groovy
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.ofbiz.order
 
 import org.apache.ofbiz.testtools.GroovyScriptTestCase
 import org.apache.ofbiz.order.shoppingcart.ShoppingCart

diff --git a/...est/TestCustRequestPermissionCheck.groovy → ...der/TestCustRequestPermissionCheck.groovy b/...est/TestCustRequestPermissionCheck.groovy → ...der/TestCustRequestPermissionCheck.groovy
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
-
+package org.apache.ofbiz.order
 
 import org.apache.ofbiz.entity.GenericValue
 import org.apache.ofbiz.entity.util.EntityQuery

diff --git a/applications/order/testdef/CustRequestTests.xml b/applications/order/testdef/CustRequestTests.xml
@@ -27,6 +27,6 @@ under the License.
     </test-case>
 
     <test-case case-name="test-cust-request-permission-check">
-        <groovy-test-suite location="component://order/groovyScripts/order/test/TestCustRequestPermissionCheck.groovy"/>
+        <junit-test-suite class-name="org.apache.ofbiz.order.TestCustRequestPermissionCheck"/>
     </test-case>
 </test-suite>
diff --git a/applications/order/testdef/OrderTest.xml b/applications/order/testdef/OrderTest.xml
@@ -34,6 +34,6 @@ under the License.
         <simple-method-test location="component://order/minilang/test/OrderTests.xml"/>
     </test-case>
     <test-case case-name="order-tests">
-        <groovy-test-suite location="component://order/groovyScripts/test/OrderTests.groovy"/>
+        <junit-test-suite class-name="org.apache.ofbiz.order.OrderTests"/>
     </test-case>
 </test-suite>
diff --git a/applications/order/testdef/QuoteTests.xml b/applications/order/testdef/QuoteTests.xml
@@ -28,6 +28,6 @@ under the License.
     <!-- <test-case case-name="quote-tests"> <simple-method-test location="component://order/minilang/test/QuoteTests.xml"/> 
         </test-case> -->
      <test-case case-name="quoteTests">
-        <groovy-test-suite name="quoteTests" location="component://order/groovyScripts/test/QuoteTests.groovy"/>
+        <junit-test-suite class-name="org.apache.ofbiz.order.QuoteTests"/>
     </test-case>
 </test-suite>
diff --git a/...cripts/test/ContactMechWorkerTests.groovy → ...ofbiz/party/ContactMechWorkerTests.groovy b/...cripts/test/ContactMechWorkerTests.groovy → ...ofbiz/party/ContactMechWorkerTests.groovy
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
+package org.apache.ofbiz.party
 
 import org.apache.ofbiz.base.util.UtilDateTime
 import org.apache.ofbiz.party.contact.ContactMechWorker

diff --git a/applications/party/testdef/PartyContactMechTests.xml b/applications/party/testdef/PartyContactMechTests.xml
@@ -25,7 +25,7 @@
         <entity-xml action="load" entity-xml-url="component://party/testdef/data/PartyContactMechTestData.xml"/>
     </test-case>
     <test-case case-name="ContactMechWorker-tests">
-        <groovy-test-suite name="contactMechWorker" location="component://party/groovyScripts/test/ContactMechWorkerTests.groovy"/>
+        <junit-test-suite className="org.apache.ofbiz.party.ContactMechWorkerTests"/>
     </test-case>
     <test-case case-name="partyContactMech-tests">
         <simple-method-test location="component://party/minilang/test/PartyContactMechTests.xml"/>

diff --git a/...oduct/test/ProductFeatureTypeTests.groovy → ...iz/product/ProductFeatureTypeTests.groovy b/...oduct/test/ProductFeatureTypeTests.groovy → ...iz/product/ProductFeatureTypeTests.groovy
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
-
+package org.apache.ofbiz.product
 
 import org.apache.ofbiz.entity.GenericValue
 import org.apache.ofbiz.entity.util.EntityQuery

diff --git a/...oduct/test/ProductPromoActionTests.groovy → ...iz/product/ProductPromoActionTests.groovy b/...oduct/test/ProductPromoActionTests.groovy → ...iz/product/ProductPromoActionTests.groovy
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.ofbiz.product
 
 import org.apache.ofbiz.base.util.Debug
 import org.apache.ofbiz.base.util.UtilDateTime

diff --git a/...product/test/ProductPromoCondTests.groovy → ...fbiz/product/ProductPromoCondTests.groovy b/...product/test/ProductPromoCondTests.groovy → ...fbiz/product/ProductPromoCondTests.groovy
@@ -16,6 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.ofbiz.product
+
 import java.sql.Timestamp
 import org.apache.ofbiz.base.util.UtilDateTime
 import org.apache.ofbiz.base.util.UtilMisc

diff --git a/...ct/groovyScripts/test/ProductTests.groovy → .../apache/ofbiz/product/ProductTests.groovy b/...ct/groovyScripts/test/ProductTests.groovy → .../apache/ofbiz/product/ProductTests.groovy
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
-
+package org.apache.ofbiz.product
 
 import org.apache.ofbiz.base.util.UtilDateTime
 import org.apache.ofbiz.entity.GenericValue

diff --git a/applications/product/testdef/ProductPromoTests.xml b/applications/product/testdef/ProductPromoTests.xml
@@ -23,10 +23,9 @@
             xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
 
     <test-group case-name="product-Conditions-tests">
-        <groovy-test-suite name="prodCond" location="component://product/groovyScripts/product/test/ProductPromoCondTests.groovy"/>
-        <!--groovy-test-suite name="productPromoCondTests" location="component://product/groovyScripts/product/test/ProductPromoCondTests.groovy"/-->
+        <junit-test-suite class-name="org.apache.ofbiz.product.ProductPromoCondTests"/>
     </test-group>
     <test-group case-name="product-Action-tests">
-        <groovy-test-suite name="productPromoActionTests" location="component://product/groovyScripts/product/test/ProductPromoActionTests.groovy"/>
+        <junit-test-suite class-name="org.apache.ofbiz.product.ProductPromoActionTests"/>
     </test-group>
 </test-suite>
diff --git a/applications/product/testdef/ProductTest.xml b/applications/product/testdef/ProductTest.xml
@@ -31,9 +31,9 @@ under the License.
     </test-case>
 
     <test-case case-name="product-tests">
-        <groovy-test-suite location="component://product/groovyScripts/test/ProductTests.groovy"/>
+        <junit-test-suite class-name="org.apache.ofbiz.product.ProductTests"/>
     </test-case>
-</test-suite>    <test-case case-name="testCreateProductFeatureType">
-        <groovy-test-suite location="component://product/groovyScripts/product/test/ProductFeatureTypeTests.groovy"/>
+    <test-case case-name="testCreateProductFeatureType">
+        <junit-test-suite class-name="org.apache.ofbiz.product.ProductFeatureTypeTests"/>
     </test-case>
 </test-suite>
diff --git a/...ase/groovyScripts/test/SimpleTests.groovy → .../org/apache/ofbiz/base/SimpleTests.groovy b/...ase/groovyScripts/test/SimpleTests.groovy → .../org/apache/ofbiz/base/SimpleTests.groovy
@@ -16,6 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  *******************************************************************************/
+package org.apache.ofbiz.base
+
 import org.apache.ofbiz.testtools.GroovyScriptTestCase
 
 class BaseTest extends GroovyScriptTestCase {

diff --git a/framework/base/testdef/basetests.xml b/framework/base/testdef/basetests.xml
@@ -25,6 +25,6 @@
         <junit-test-suite class-name="org.apache.ofbiz.base.util.test.UtilObjectTests"/>
         <junit-test-suite class-name="org.apache.ofbiz.base.util.string.test.FlexibleStringExpanderTests"/>
         <junit-test-suite class-name="org.apache.ofbiz.base.util.collections.test.FlexibleMapAccessorTests"/>
-        <groovy-test-suite name="simple" location="component://base/groovyScripts/test/SimpleTests.groovy"/>
+        <junit-test-suite class-name="org.apache.ofbiz.base.SimpleTests"/>
     </test-group>
 </test-suite>