Skip to content

Commit 346ec06

Browse files
committed
Don't deploy test classes
Signed-off-by: arjantijms <arjan.tijms@gmail.com>
1 parent dc48fdd commit 346ec06

File tree

1 file changed

+21
-7
lines changed

1 file changed

+21
-7
lines changed

jaspic/common/src/main/java/org/javaee7/jaspic/common/ArquillianBase.java

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@
99
import java.io.File;
1010
import java.io.IOException;
1111
import java.net.URL;
12+
import java.util.Map;
1213
import java.util.logging.Logger;
1314

1415
import org.jboss.arquillian.test.api.ArquillianResource;
1516
import org.jboss.shrinkwrap.api.Archive;
17+
import org.jboss.shrinkwrap.api.ArchivePath;
18+
import org.jboss.shrinkwrap.api.Node;
1619
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
1720
import org.jboss.shrinkwrap.api.spec.WebArchive;
1821
import org.junit.After;
@@ -69,13 +72,24 @@ public static Archive<?> defaultArchive() {
6972
}
7073

7174
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;
7993
}
8094

8195
public static Archive<?> tryWrapEAR(WebArchive webArchive) {

0 commit comments

Comments
 (0)