Oops, forgot to adjust the JACC tests for the change from WebArchive to

arjantijms · arjantijms · commit 660751511647 · 2015-04-20T01:41:05.000+02:00
Archive.
diff --git a/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/RequestFromPolicyContextTest.java b/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/RequestFromPolicyContextTest.java
@@ -9,6 +9,7 @@
 import org.javaee7.jaspic.common.ArquillianBase;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,8 +26,9 @@
 public class RequestFromPolicyContextTest extends ArquillianBase{
 
 @Deployment(testable = false)
- public static WebArchive createDeployment(){
- return defaultArchive().addPackages(true, "org.javaee7.jacc");
+ public static Archive<?> createDeployment(){
+ // TODO: Fix for Liberty which requires EARs :(
+ return ((WebArchive)defaultArchive()).addPackages(true, "org.javaee7.jacc");
 }
 
 /**
diff --git a/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/SubjectFromPolicyContextTest.java b/jacc/contexts/src/test/java/org/javaee7/jacc/contexts/SubjectFromPolicyContextTest.java
@@ -11,6 +11,7 @@
 import org.javaee7.jaspic.common.ArquillianBase;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -44,8 +45,9 @@
 public class SubjectFromPolicyContextTest extends ArquillianBase{
 
 @Deployment(testable = false)
- public static WebArchive createDeployment(){
- return defaultArchive().addPackages(true, "org.javaee7.jacc");
+ public static Archive<?> createDeployment(){
+ // TODO: Fix for Liberty which requires EARs :(
+ return ((WebArchive)defaultArchive()).addPackages(true, "org.javaee7.jacc");
 }
 
 /**

-Original file line number
+Diff line change
 importorg.javaee7.jaspic.common.ArquillianBase;
 importorg.jboss.arquillian.container.test.api.Deployment;
 importorg.jboss.arquillian.junit.Arquillian;
 +importorg.jboss.shrinkwrap.api.Archive;
 importorg.jboss.shrinkwrap.api.spec.WebArchive;
 importorg.junit.Test;
 importorg.junit.runner.RunWith;
 publicclassRequestFromPolicyContextTestextendsArquillianBase{
 @Deployment(testable = false)
 -publicstaticWebArchivecreateDeployment(){
 -returndefaultArchive().addPackages(true, "org.javaee7.jacc");
 +publicstaticArchive<?> createDeployment(){
 +// TODO: Fix for Liberty which requires EARs :(
 +return ((WebArchive)defaultArchive()).addPackages(true, "org.javaee7.jacc");
+ }
 /**