Improved: Move ‘ComponentContainerTest’ data to src/test/resources/ (…

…OFBIZ-11275) Remove unnecessary webapp declaration inside the test component configurations.
apache · Dec 1, 2019 · 87d7465 · 87d7465
1 parent d0f522a
commit 87d7465
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/framework/base/src/test/java/org/apache/ofbiz/base/container/ComponentContainerTest.java b/framework/base/src/test/java/org/apache/ofbiz/base/container/ComponentContainerTest.java
@@ -43,7 +43,8 @@ public class ComponentContainerTest {
     private static final Path ACCOUNTING_CONFIG = Paths.get("applications", "accounting", "config");
     private static final Path[] CONFIGS = {ORDER_CONFIG, ACCOUNTING_CONFIG};
 
-    private Path ofbizHome = Paths.get("testsdata", "ComponentContainerTest").toAbsolutePath().normalize();
+    private Path ofbizHome = Paths.get(ComponentContainerTest.class.getResource("testsdata").getFile())
+            .toAbsolutePath().normalize();
 
     @Before
     public void setUp() throws IOException {

diff --git a/...plications/accounting/ofbiz-component.xml → ...plications/accounting/ofbiz-component.xml b/...plications/accounting/ofbiz-component.xml → ...plications/accounting/ofbiz-component.xml
@@ -24,10 +24,4 @@ under the License.
     <depends-on component-name="order" />
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
-    <webapp name="accounting"
-        title="Accounting"
-        server="default-server"
-        location="webapp/accounting"
-        base-permission="OFBTOOLS,ACCOUNTING"
-        mount-point="/accounting"/>
 </ofbiz-component>
diff --git a/...st/applications/order/ofbiz-component.xml → ...ta/applications/order/ofbiz-component.xml b/...st/applications/order/ofbiz-component.xml → ...ta/applications/order/ofbiz-component.xml
@@ -17,18 +17,10 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
 <ofbiz-component name="order"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd">
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
-    <webapp name="order"
-        title="Order"
-        description="OrderComponentDescription"
-        server="default-server"
-        location="webapp/ordermgr"
-        base-permission="OFBTOOLS,ORDERMGR"
-        mount-point="/ordermgr"/>
 </ofbiz-component>