Skip to content

Commit a28ad83

Browse files
committed
Use Servlet 3.0 Protocol for Concurrent tests
* Package web.xml
1 parent 710744d commit a28ad83

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

concurrency/managedexecutor/src/test/java/org/javaee7/concurrency/managedexecutor/ExecutorInjectTest.java

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
package org.javaee7.concurrency.managedexecutor;
22

3+
import static org.junit.Assert.assertEquals;
4+
import static org.junit.Assert.assertTrue;
5+
6+
import java.io.File;
37
import java.util.ArrayList;
48
import java.util.Collection;
59
import java.util.List;
610
import java.util.concurrent.Callable;
711
import java.util.concurrent.Future;
12+
813
import javax.annotation.Resource;
914
import javax.ejb.EJB;
1015
import javax.enterprise.concurrent.ManagedExecutorService;
16+
1117
import org.jboss.arquillian.container.test.api.Deployment;
1218
import org.jboss.arquillian.junit.Arquillian;
1319
import org.jboss.shrinkwrap.api.ShrinkWrap;
20+
import org.jboss.shrinkwrap.api.asset.FileAsset;
1421
import org.jboss.shrinkwrap.api.spec.WebArchive;
15-
import org.junit.Test;
16-
import static org.junit.Assert.*;
1722
import org.junit.Before;
23+
import org.junit.Test;
1824
import org.junit.runner.RunWith;
1925

2026
/**
@@ -50,7 +56,8 @@ public static WebArchive createDeployment() {
5056
TestStatus.class,
5157
MyTaskWithListener.class,
5258
MyTaskWithTransaction.class,
53-
TestBean.class);
59+
TestBean.class).
60+
setWebXML(new FileAsset(new File("src/main/webapp/WEB-INF/web.xml")));
5461
}
5562

5663
@Before
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jboss.org/schema/arquillian" xsi:schemaLocation="http://jboss.org/schema/arquillian
3+
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
4+
5+
<defaultProtocol type="Servlet 3.0"/>
6+
7+
<container qualifier="test" default="true">
8+
<configuration>
9+
<property name="jbossHome">${serverRoot:target/wildfly-8.0.0.Beta1}</property>
10+
<property name="serverConfig">${serverProfile:standalone-full.xml}</property>
11+
</configuration>
12+
</container>
13+
14+
</arquillian>

0 commit comments

Comments
 (0)