|
9 | 9 | import java.io.File; |
10 | 10 | import java.io.IOException; |
11 | 11 | import java.net.URL; |
| 12 | +import java.util.Map; |
12 | 13 | import java.util.logging.Logger; |
13 | 14 |
|
14 | 15 | import org.jboss.arquillian.test.api.ArquillianResource; |
15 | 16 | import org.jboss.shrinkwrap.api.Archive; |
| 17 | +import org.jboss.shrinkwrap.api.ArchivePath; |
| 18 | +import org.jboss.shrinkwrap.api.Node; |
16 | 19 | import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; |
17 | 20 | import org.jboss.shrinkwrap.api.spec.WebArchive; |
18 | 21 | import org.junit.After; |
@@ -69,13 +72,24 @@ public static Archive<?> defaultArchive() { |
69 | 72 | } |
70 | 73 |
|
71 | 74 | public static WebArchive defaultWebArchive() { |
72 | | - return |
73 | | - create(WebArchive.class, "test.war") |
74 | | - .addPackages(true, "org.javaee7.jaspic") |
75 | | - .deleteClass(ArquillianBase.class) |
76 | | - .addAsWebInfResource(resource("web.xml")) |
77 | | - .addAsWebInfResource(resource("jboss-web.xml")) |
78 | | - .addAsWebInfResource(resource("glassfish-web.xml")); |
| 75 | + return |
| 76 | + removeTestClasses( |
| 77 | + create(WebArchive.class, "test.war") |
| 78 | + .addPackages(true, "org.javaee7.jaspic") |
| 79 | + .addAsWebInfResource(resource("web.xml")) |
| 80 | + .addAsWebInfResource(resource("jboss-web.xml")) |
| 81 | + .addAsWebInfResource(resource("glassfish-web.xml"))); |
| 82 | + } |
| 83 | + |
| 84 | + private static WebArchive removeTestClasses(WebArchive archive) { |
| 85 | + for (Map.Entry<ArchivePath, Node> content : archive.getContent().entrySet()) { |
| 86 | + if (content.getKey().get().endsWith("Test.class")) { |
| 87 | + archive.delete(content.getKey().get()); |
| 88 | + } |
| 89 | + } |
| 90 | + archive.deleteClass(ArquillianBase.class); |
| 91 | + |
| 92 | + return archive; |
79 | 93 | } |
80 | 94 |
|
81 | 95 | public static Archive<?> tryWrapEAR(WebArchive webArchive) { |
|
0 commit comments