You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by li...@apache.org on 2012/07/12 09:28:34 UTC
[3/3] git commit: Enabling tests for Security.
Enabling tests for Security.
Tested on OWB, WELD, TomEE, JBoss AS 7.1.1 using both JDK 1.6 (Sun /
Oracle 1.6.0_33) and 1.7 (IcedTea 1.7.0_03)
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/b1623a76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/b1623a76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/b1623a76
Branch: refs/heads/master
Commit: b1623a764ffcb9686ca90b6128ee9379002b175b
Parents: 0a7f079
Author: Jason Porter <li...@apache.org>
Authored: Thu Jul 12 01:25:01 2012 -0600
Committer: Jason Porter <li...@apache.org>
Committed: Thu Jul 12 01:27:46 2012 -0600
----------------------------------------------------------------------
.../impl/authentication/LoginLogoutTest.java | 4 +-
.../secured/SecuredAnnotationTest.java | 32 ++--
.../securitybinding/SecurityBindingTest.java | 33 ++--
.../SecurityParameterBindingTest.java | 135 +++++++++------
.../apache/deltaspike/test/util/ArchiveUtils.java | 19 +-
.../impl/src/test/resources/arquillian.xml | 2 -
6 files changed, 128 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b1623a76/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authentication/LoginLogoutTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authentication/LoginLogoutTest.java b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authentication/LoginLogoutTest.java
index 707def6..6b8729d 100644
--- a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authentication/LoginLogoutTest.java
+++ b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authentication/LoginLogoutTest.java
@@ -66,7 +66,7 @@ public class LoginLogoutTest
.addPackage("org.apache.deltaspike.test.security.impl.authentication")
.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
- return ShrinkWrap.create(WebArchive.class)
+ return ShrinkWrap.create(WebArchive.class, "login-logout-test.war")
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndSecurityArchive())
.addAsLibraries(testJar)
.addAsServiceProvider(Extension.class, ExcludeExtension.class)
@@ -78,7 +78,7 @@ public class LoginLogoutTest
{
final String userName = "spike";
final String password = "apache";
-
+
//init
authenticator.register(userName, password);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b1623a76/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/secured/SecuredAnnotationTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/secured/SecuredAnnotationTest.java b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/secured/SecuredAnnotationTest.java
index 363549c..32caa1b 100644
--- a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/secured/SecuredAnnotationTest.java
+++ b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/secured/SecuredAnnotationTest.java
@@ -19,21 +19,16 @@
package org.apache.deltaspike.test.security.impl.authorization.secured;
import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.core.impl.exclude.extension.ExcludeExtension;
import org.apache.deltaspike.security.api.authorization.AccessDeniedException;
import org.apache.deltaspike.test.util.ArchiveUtils;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.Extension;
-
/**
* Test for {@link org.apache.deltaspike.security.api.authorization.annotation.Secured}
@@ -44,14 +39,9 @@ public class SecuredAnnotationTest
@Deployment
public static WebArchive deploy()
{
- JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "securedAnnotationTest.jar")
- .addPackage("org.apache.deltaspike.test.security.impl.authorization.secured")
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-
- return ShrinkWrap.create(WebArchive.class)
+ return ShrinkWrap.create(WebArchive.class, "secured-annotation-test.war")
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndSecurityArchive())
- .addAsLibraries(testJar)
- .addAsServiceProvider(Extension.class, ExcludeExtension.class)
+ .addPackage("org.apache.deltaspike.test.security.impl.authorization.secured")
.addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
}
@@ -65,12 +55,16 @@ public class SecuredAnnotationTest
try
{
testBean.getBlockedResult();
- Assert.fail();
+ Assert.fail("AccessDeniedException expect, but was not thrown");
}
catch (AccessDeniedException e)
{
//expected exception
}
+ catch (Exception e)
+ {
+ Assert.fail("Unexpected Exception: " + e);
+ }
}
@Test
@@ -83,12 +77,16 @@ public class SecuredAnnotationTest
try
{
testBean.getBlockedResult();
- Assert.fail();
+ Assert.fail("AccessDeniedException expect, but was not thrown");
}
catch (AccessDeniedException e)
{
//expected exception
}
+ catch (Exception e)
+ {
+ Assert.fail("Unexpected Exception: " + e);
+ }
}
@Test
@@ -101,11 +99,15 @@ public class SecuredAnnotationTest
try
{
testBean.getBlockedResult();
- Assert.fail();
+ Assert.fail("AccessDeniedException expect, but was not thrown");
}
catch (AccessDeniedException e)
{
//expected exception
}
+ catch (Exception e)
+ {
+ Assert.fail("Unexpected Exception: " + e);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b1623a76/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/securitybinding/SecurityBindingTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/securitybinding/SecurityBindingTest.java b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/securitybinding/SecurityBindingTest.java
index 34b9593..94751cf 100644
--- a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/securitybinding/SecurityBindingTest.java
+++ b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/securitybinding/SecurityBindingTest.java
@@ -19,21 +19,16 @@
package org.apache.deltaspike.test.security.impl.authorization.securitybinding;
import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.core.impl.exclude.extension.ExcludeExtension;
import org.apache.deltaspike.security.api.authorization.AccessDeniedException;
import org.apache.deltaspike.test.util.ArchiveUtils;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.Extension;
-
/**
* Test for {@link org.apache.deltaspike.security.api.authorization.annotation.Secured}
@@ -44,14 +39,18 @@ public class SecurityBindingTest
@Deployment
public static WebArchive deploy()
{
- JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, SecurityBindingTest.class.getSimpleName() + ".jar")
- .addPackage(SecurityBindingTest.class.getPackage().getName())
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+// JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, SecurityBindingTest.class.getSimpleName() + ".jar")
+// .addPackage(SecurityBindingTest.class.getPackage())
+// .addAsManifestResource(ArchiveUtils.getBeansXml(), "beans.xml");
+//
+// return ShrinkWrap.create(WebArchive.class, "security-binding-test.war")
+// .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndSecurityArchive())
+// .addAsLibraries(testJar)
+// .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
- return ShrinkWrap.create(WebArchive.class)
+ return ShrinkWrap.create(WebArchive.class, "security-binding-test.war")
.addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndSecurityArchive())
- .addAsLibraries(testJar)
- .addAsServiceProvider(Extension.class, ExcludeExtension.class)
+ .addPackage(SecurityBindingTest.class.getPackage())
.addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
}
@@ -65,12 +64,16 @@ public class SecurityBindingTest
try
{
testBean.getBlockedResult();
- Assert.fail();
+ Assert.fail("AccessDeniedException expect, but was not thrown");
}
catch (AccessDeniedException e)
{
//expected exception
}
+ catch (Exception e)
+ {
+ Assert.fail("Unexpected Exception: " + e);
+ }
}
@Test
@@ -83,11 +86,15 @@ public class SecurityBindingTest
try
{
testBean.getBlockedResult();
- Assert.fail();
+ Assert.fail("AccessDeniedException expect, but was not thrown");
}
catch (AccessDeniedException e)
{
//expected exception
}
+ catch (Exception e)
+ {
+ Assert.fail("Unexpected Exception: " + e);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b1623a76/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/securityparameterbinding/SecurityParameterBindingTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/securityparameterbinding/SecurityParameterBindingTest.java b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/securityparameterbinding/SecurityParameterBindingTest.java
index 47679b5..bb6cb82 100644
--- a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/securityparameterbinding/SecurityParameterBindingTest.java
+++ b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/security/impl/authorization/securityparameterbinding/SecurityParameterBindingTest.java
@@ -19,81 +19,106 @@
package org.apache.deltaspike.test.security.impl.authorization.securityparameterbinding;
import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.core.impl.exclude.extension.ExcludeExtension;
import org.apache.deltaspike.security.api.authorization.AccessDeniedException;
import org.apache.deltaspike.test.util.ArchiveUtils;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.inject.spi.Extension;
-
/**
* Test for {@link org.apache.deltaspike.security.api.authorization.annotation.Secured}
*/
@RunWith(Arquillian.class)
public class SecurityParameterBindingTest
{
- @Deployment
- public static WebArchive deploy()
- {
- JavaArchive testJar = ShrinkWrap
- .create(JavaArchive.class, SecurityParameterBindingTest.class.getSimpleName() + ".jar")
- .addPackage(SecurityParameterBindingTest.class.getPackage().getName())
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-
- return ShrinkWrap.create(WebArchive.class)
- .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndSecurityArchive())
- .addAsLibraries(testJar)
- .addAsServiceProvider(Extension.class, ExcludeExtension.class)
- .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
- }
+ @Deployment
+ public static WebArchive deploy()
+ {
+ return ShrinkWrap.create(WebArchive.class, "security-parameter-binding-test.war")
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndSecurityArchive())
+ .addPackage(SecurityParameterBindingTest.class.getPackage())
+ .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
+ }
- @Test(expected = IllegalStateException.class)
- public void simpleInterceptorThrowsExceptionWhenImproperlyAnnotated()
- {
- SecuredBean1 testBean = BeanProvider.getContextualReference(SecuredBean1.class, false);
- testBean.getResult(new MockObject(true));
- }
+ @Test
+ public void simpleInterceptorThrowsExceptionWhenImproperlyAnnotated()
+ {
+ try
+ {
+ SecuredBean1 testBean = BeanProvider.getContextualReference(SecuredBean1.class, false);
+ testBean.getResult(new MockObject(true));
+ Assert.fail("Expected exception, IllegalStateException was not thrown");
+ }
+ catch (IllegalStateException e)
+ {
+ // expected exception
+ }
+ catch (Exception e)
+ {
+ Assert.fail("Unexpected Exception: " + e);
+ }
+ }
- @Test(expected = AccessDeniedException.class)
- public void simpleInterceptorDeniesTest()
- {
- SecuredBean1 testBean = BeanProvider.getContextualReference(SecuredBean1.class, false);
- testBean.getBlockedResult(new MockObject(false));
- }
+ @Test
+ public void simpleInterceptorDeniesTest()
+ {
+ try
+ {
+ SecuredBean1 testBean = BeanProvider.getContextualReference(SecuredBean1.class, false);
+ testBean.getBlockedResult(new MockObject(false));
+ Assert.fail("AccessDeniedException expect, but was not thrown");
+ }
+ catch (AccessDeniedException e)
+ {
+ // expected
+ }
+ catch (Exception e)
+ {
+ Assert.fail("Unexpected Exception: " + e);
+ }
+ }
- @Test
- public void simpleInterceptorAllowsTest()
- {
- SecuredBean1 testBean = BeanProvider.getContextualReference(SecuredBean1.class, false);
- Assert.assertTrue(testBean.getBlockedResult(new MockObject(true)));
- }
+ @Test
+ public void simpleInterceptorAllowsTest()
+ {
+ SecuredBean1 testBean = BeanProvider.getContextualReference(SecuredBean1.class, false);
+ Assert.assertTrue(testBean.getBlockedResult(new MockObject(true)));
+ }
- @Test
- public void simpleInterceptorIgnoresUnsecuredMethods()
- {
- SecuredBean2 testBean = BeanProvider.getContextualReference(SecuredBean2.class, false);
- Assert.assertTrue(testBean.getResult(new MockObject(true)));
- }
+ @Test
+ public void simpleInterceptorIgnoresUnsecuredMethods()
+ {
+ SecuredBean2 testBean = BeanProvider.getContextualReference(SecuredBean2.class, false);
+ Assert.assertTrue(testBean.getResult(new MockObject(true)));
+ }
- @Test(expected = AccessDeniedException.class)
- public void simpleInterceptorTestOnMethodsDenies()
- {
- SecuredBean2 testBean = BeanProvider.getContextualReference(SecuredBean2.class, false);
- testBean.getBlockedResult(new MockObject(false));
- }
+ @Test
+ public void simpleInterceptorTestOnMethodsDenies()
+ {
+ try
+ {
+ SecuredBean2 testBean = BeanProvider.getContextualReference(SecuredBean2.class, false);
+ testBean.getBlockedResult(new MockObject(false));
+ Assert.fail("AccessDeniedException expect, but was not thrown");
+ }
+ catch (AccessDeniedException e)
+ {
+ // expected
+ }
+ catch (Exception e)
+ {
+ Assert.fail("Unexpected Exception: " + e);
+ }
+ }
- @Test
- public void simpleInterceptorTestOnMethodsAllows()
- {
- SecuredBean2 testBean = BeanProvider.getContextualReference(SecuredBean2.class, false);
- Assert.assertTrue(testBean.getBlockedResult(new MockObject(true)));
- }
+ @Test
+ public void simpleInterceptorTestOnMethodsAllows()
+ {
+ SecuredBean2 testBean = BeanProvider.getContextualReference(SecuredBean2.class, false);
+ Assert.assertTrue(testBean.getBlockedResult(new MockObject(true)));
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b1623a76/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
index 29732b9..dfe16bf 100644
--- a/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
+++ b/deltaspike/modules/security/impl/src/test/java/org/apache/deltaspike/test/util/ArchiveUtils.java
@@ -18,7 +18,6 @@
*/
package org.apache.deltaspike.test.util;
-import org.apache.deltaspike.core.util.ClassUtils;
import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -30,19 +29,19 @@ public class ArchiveUtils
{
public static JavaArchive[] getDeltaSpikeCoreAndSecurityArchive()
{
- //X TODO remove this workaround
- boolean isOwbAvailable = ClassUtils.tryToLoadClassForName("org.apache.webbeans.spi.ContainerLifecycle") != null;
+ //X TODO remove this workaround - lightguard.jp We don't need the work around, we have to have the META-INF/beans.xml for all containers
+ //boolean isOwbAvailable = ClassUtils.tryToLoadClassForName("org.apache.webbeans.spi.ContainerLifecycle") != null;
String[] excludedFiles;
- if (isOwbAvailable)
- {
+ //if (isOwbAvailable)
+ //{
excludedFiles = new String[]{"META-INF.apache-deltaspike.properties"};
- }
- else
- {
- excludedFiles = new String[]{"META-INF.apache-deltaspike.properties", "META-INF.beans.xml"};
- }
+ //}
+ //else
+ //{
+ // excludedFiles = new String[]{"META-INF.apache-deltaspike.properties", "META-INF.beans.xml"};
+ //}
return ShrinkWrapArchiveUtil.getArchives(null,
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b1623a76/deltaspike/modules/security/impl/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/security/impl/src/test/resources/arquillian.xml b/deltaspike/modules/security/impl/src/test/resources/arquillian.xml
index 973dbb4..d6165ac 100644
--- a/deltaspike/modules/security/impl/src/test/resources/arquillian.xml
+++ b/deltaspike/modules/security/impl/src/test/resources/arquillian.xml
@@ -21,11 +21,9 @@
xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
<!--Uncomment to have test archives exported to the file system for inspection -->
- <!--
<engine>
<property name="deploymentExportPath">target/</property>
</engine>
- -->
<container qualifier="jbossas-managed-7">
<configuration>