Skip to content
Permalink
Browse files
Improved: Move ‘ComponentContainerTest’ data to src/test/resources/ (…
…OFBIZ-11275)

Remove unnecessary webapp declaration inside the test component
configurations.
  • Loading branch information
mthl committed Dec 1, 2019
1 parent d0f522a commit 87d7465306df2b7294587e4c0297360cf234ef92
@@ -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 {
@@ -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>
@@ -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>

0 comments on commit 87d7465

Please sign in to comment.