svn commit: r1868591 - in /ofbiz: ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/ ofbiz-framework/trunk/applications/order/testdef/ ofbiz-plugins/trunk/ecommerce/ ofbiz-plugins/trunk/ecommerce/src/main/groovy/ ofbiz-plu...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1868591 - in /ofbiz: ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/ ofbiz-framework/trunk/applications/order/testdef/ ofbiz-plugins/trunk/ecommerce/ ofbiz-plugins/trunk/ecommerce/src/main/groovy/ ofbiz-plu...

jleroux@apache.org
Author: jleroux
Date: Fri Oct 18 13:16:39 2019
New Revision: 1868591

URL: http://svn.apache.org/viewvc?rev=1868591&view=rev
Log:
Fixed: Move OrderNotificationTests.groovy from order to ecommerce
(OFBIZ-11255)

Fixes the errors in framework only tests, order and ecommerce suites tests pass

Added:
    ofbiz/ofbiz-plugins/trunk/ecommerce/src/main/groovy/
    ofbiz/ofbiz-plugins/trunk/ecommerce/src/main/groovy/org/
    ofbiz/ofbiz-plugins/trunk/ecommerce/src/main/groovy/org/apache/
    ofbiz/ofbiz-plugins/trunk/ecommerce/src/main/groovy/org/apache/ofbiz/
    ofbiz/ofbiz-plugins/trunk/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/
    ofbiz/ofbiz-plugins/trunk/ecommerce/src/main/groovy/org/apache/ofbiz/ecommerce/OrderNotificationTests.groovy
      - copied unchanged from r1868584, ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderNotificationTests.groovy
    ofbiz/ofbiz-plugins/trunk/ecommerce/testdef/
    ofbiz/ofbiz-plugins/trunk/ecommerce/testdef/EcommerceTest.xml   (with props)
Removed:
    ofbiz/ofbiz-framework/trunk/applications/order/src/main/groovy/org/apache/ofbiz/order/OrderNotificationTests.groovy
Modified:
    ofbiz/ofbiz-framework/trunk/applications/order/testdef/OrderTest.xml
    ofbiz/ofbiz-plugins/trunk/ecommerce/ofbiz-component.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/order/testdef/OrderTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/testdef/OrderTest.xml?rev=1868591&r1=1868590&r2=1868591&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/testdef/OrderTest.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/testdef/OrderTest.xml Fri Oct 18 13:16:39 2019
@@ -33,9 +33,6 @@ under the License.
     <test-case case-name="order-tests-xml">
         <simple-method-test location="component://order/minilang/test/OrderTests.xml"/>
     </test-case>
-    <test-case case-name="order-notification-tests">
-        <junit-test-suite class-name="org.apache.ofbiz.order.OrderNotificationTests"/>
-    </test-case>
     <test-case case-name="order-return-tests">
         <junit-test-suite class-name="org.apache.ofbiz.order.OrderReturnTests"/>
     </test-case>

Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/ofbiz-component.xml?rev=1868591&r1=1868590&r2=1868591&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/ofbiz-component.xml (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/ofbiz-component.xml Fri Oct 18 13:16:39 2019
@@ -51,6 +51,8 @@ under the License.
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoPopularCategoriesData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoContentAltUrl.xml"/>
     
+    <test-suite loader="main" location="testdef/EcommerceTest.xml"/>
+    
     <webapp name="ecommerce"
         title="eCommerce"
         server="default-server"

Added: ofbiz/ofbiz-plugins/trunk/ecommerce/testdef/EcommerceTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/testdef/EcommerceTest.xml?rev=1868591&view=auto
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ecommerce/testdef/EcommerceTest.xml (added)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/testdef/EcommerceTest.xml Fri Oct 18 13:16:39 2019
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<test-suite suite-name="ecommercetests"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
+    <test-case case-name="order-tests-data-load">
+        <entity-xml action="load" entity-xml-url="component://order/testdef/data/OrderTestData.xml"/>
+    </test-case>
+    <test-case case-name="ecommerce-notification-tests">
+        <junit-test-suite class-name="org.apache.ofbiz.order.OrderNotificationTests"/>
+    </test-case>
+</test-suite>

Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/testdef/EcommerceTest.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/testdef/EcommerceTest.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-plugins/trunk/ecommerce/testdef/EcommerceTest.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml