[jboss-cvs] JBossAS SVN: r97795 - projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 14 12:56:19 EST 2009
Author: kabir.khan at jboss.com
Date: 2009-12-14 12:56:19 -0500 (Mon, 14 Dec 2009)
New Revision: 97795
Modified:
projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/InjectionPointQualifiersTestCase.java
Log:
[JBKERNEL-63] Add the missing QualifiersMdrUtil
Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/InjectionPointQualifiersTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/InjectionPointQualifiersTestCase.java 2009-12-14 17:48:34 UTC (rev 97794)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/InjectionPointQualifiersTestCase.java 2009-12-14 17:56:19 UTC (rev 97795)
@@ -25,6 +25,7 @@
import junit.framework.Test;
+import org.jboss.beans.info.spi.BeanAccessMode;
import org.jboss.beans.metadata.api.model.QualifierPoint;
import org.jboss.beans.metadata.api.model.QualifierType;
import org.jboss.beans.metadata.spi.BeanMetaData;
@@ -35,6 +36,7 @@
import org.jboss.test.kernel.qualifiers.support.Target;
import org.jboss.test.kernel.qualifiers.support.TargetAllBean;
import org.jboss.test.kernel.qualifiers.support.TargetConstructorBean;
+import org.jboss.test.kernel.qualifiers.support.TargetFieldBean;
import org.jboss.test.kernel.qualifiers.support.TargetMethodBean;
import org.jboss.test.kernel.qualifiers.support.TargetPropertyBean;
@@ -57,20 +59,25 @@
public void testSimplePropertyQualifiers() throws Throwable
{
- testSimpleQualifiers(TargetPropertyBean.class, TargetType.PROPERTY);
+ testSimpleQualifiers(TargetPropertyBean.class);
}
+ public void testSimpleFieldQualifiers() throws Throwable
+ {
+ testSimpleQualifiers(TargetFieldBean.class);
+ }
+
public void testSimpleConstructorParameterQualifiers() throws Throwable
{
- testSimpleQualifiers(TargetConstructorBean.class, TargetType.CONSTRUCTOR);
+ testSimpleQualifiers(TargetConstructorBean.class);
}
public void testSimpleInstallMethodParameterQualifiers() throws Throwable
{
- testSimpleQualifiers(TargetMethodBean.class, TargetType.METHOD);
+ testSimpleQualifiers(TargetMethodBean.class);
}
- private <T extends Target> void testSimpleQualifiers(Class<T> targetClass, TargetType type) throws Throwable
+ private <T extends Target> void testSimpleQualifiers(Class<T> targetClass) throws Throwable
{
BeanMetaDataBuilder bean1Builder = BeanMetaDataBuilder.createBuilder("bean1", Bean.class.getName());
bean1Builder.addQualifiers(QualifierType.SUPPLIED, "test");
@@ -79,7 +86,7 @@
BeanMetaDataBuilder bean2Builder = BeanMetaDataBuilder.createBuilder("bean2", Bean.class.getName());
KernelControllerContext bean2Context = deploy(bean2Builder.getBeanMetaData());
- KernelControllerContext targetContext = deploy(createTargetMetaData(type, "test"));
+ KernelControllerContext targetContext = deploy(createTargetMetaData(targetClass, "test"));
try
{
Bean bean1 = assertBean("bean1", Bean.class);
@@ -98,20 +105,25 @@
public void testNeedsAllPropertyQualifiers() throws Throwable
{
- testNeedsAllQualifiers(TargetPropertyBean.class, TargetType.PROPERTY);
+ testNeedsAllQualifiers(TargetPropertyBean.class);
}
+ public void testNeedsAllFieldQualifiers() throws Throwable
+ {
+ testNeedsAllQualifiers(TargetFieldBean.class);
+ }
+
public void testNeedsAllConstructorQualifiers() throws Throwable
{
- testNeedsAllQualifiers(TargetConstructorBean.class, TargetType.CONSTRUCTOR);
+ testNeedsAllQualifiers(TargetConstructorBean.class);
}
public void testNeedsAllMethodParameterQualifiers() throws Throwable
{
- testNeedsAllQualifiers(TargetMethodBean.class, TargetType.METHOD);
+ testNeedsAllQualifiers(TargetMethodBean.class);
}
- private <T extends Target> void testNeedsAllQualifiers(Class<T> targetClass, TargetType type) throws Throwable
+ private <T extends Target> void testNeedsAllQualifiers(Class<T> targetClass) throws Throwable
{
BeanMetaDataBuilder bean1Builder = BeanMetaDataBuilder.createBuilder("bean1", Bean.class.getName());
bean1Builder.addQualifiers(QualifierType.SUPPLIED, "test1", "test2");
@@ -125,7 +137,7 @@
bean3Builder.addQualifiers(QualifierType.SUPPLIED, "test2", "test3");
KernelControllerContext bean3Context = deploy(bean3Builder.getBeanMetaData());
- KernelControllerContext targetContext = deploy(createTargetMetaData(type, "test1", "test2", "test3"));
+ KernelControllerContext targetContext = deploy(createTargetMetaData(targetClass, "test1", "test2", "test3"));
try
{
assertBean("bean1", Bean.class);
@@ -146,20 +158,25 @@
public void testNoContextHasAllPropertyQualifiers() throws Throwable
{
- testNoContextHasAllQualifiers(TargetPropertyBean.class, TargetType.PROPERTY);
+ testNoContextHasAllQualifiers(TargetPropertyBean.class);
}
+ public void testNoContextHasAllFieldQualifiers() throws Throwable
+ {
+ testNoContextHasAllQualifiers(TargetFieldBean.class);
+ }
+
public void testNoContextHasAllConstructorQualifiers() throws Throwable
{
- testNoContextHasAllQualifiers(TargetConstructorBean.class, TargetType.CONSTRUCTOR);
+ testNoContextHasAllQualifiers(TargetConstructorBean.class);
}
public void testNoContextHasAllMethodParameterQualifiers() throws Throwable
{
- testNoContextHasAllQualifiers(TargetMethodBean.class, TargetType.METHOD);
+ testNoContextHasAllQualifiers(TargetMethodBean.class);
}
- private <T extends Target> void testNoContextHasAllQualifiers(Class<T> targetClass, TargetType type) throws Throwable
+ private <T extends Target> void testNoContextHasAllQualifiers(Class<T> targetClass) throws Throwable
{
BeanMetaDataBuilder bean1Builder = BeanMetaDataBuilder.createBuilder("bean1", Bean.class.getName());
bean1Builder.addQualifiers(QualifierType.SUPPLIED, "test");
@@ -169,7 +186,7 @@
bean2Builder.addQualifiers(QualifierType.SUPPLIED, "other");
KernelControllerContext bean2Context = deploy(bean2Builder.getBeanMetaData());
- KernelControllerContext targetContext = deploy(createTargetMetaData(type, "test", "other"));
+ KernelControllerContext targetContext = deploy(createTargetMetaData(targetClass, "test", "other"));
try
{
assertBean("bean1", Bean.class);
@@ -189,6 +206,11 @@
testTwoContextsHaveAllRequiredQualifiers(TargetPropertyBean.class, TargetType.PROPERTY);
}
+ public void testTwoContextsHaveAllRequiredFieldQualifiers() throws Throwable
+ {
+ testTwoContextsHaveAllRequiredQualifiers(TargetFieldBean.class, TargetType.PROPERTY);
+ }
+
public void testTwoContextsHaveAllRequiredConstructorQualifiers() throws Throwable
{
testTwoContextsHaveAllRequiredQualifiers(TargetConstructorBean.class, TargetType.CONSTRUCTOR);
@@ -209,7 +231,7 @@
bean2Builder.addQualifiers(QualifierType.SUPPLIED, "test1", "test2");
KernelControllerContext bean2Context = deploy(bean2Builder.getBeanMetaData());
- KernelControllerContext targetContext = deploy(createTargetMetaData(type, "test1", "test2"));
+ KernelControllerContext targetContext = deploy(createTargetMetaData(targetClass, "test1", "test2"));
try
{
assertBean("bean1", Bean.class);
@@ -226,20 +248,25 @@
public void testTwoContextsHaveMoreThanRequiredPropertyQualifiers() throws Throwable
{
- testTwoContextsHaveMoreThanRequiredQualifiers(TargetPropertyBean.class, TargetType.PROPERTY);
+ testTwoContextsHaveMoreThanRequiredQualifiers(TargetPropertyBean.class);
}
+ public void testTwoContextsHaveMoreThanRequiredFieldQualifiers() throws Throwable
+ {
+ testTwoContextsHaveMoreThanRequiredQualifiers(TargetFieldBean.class);
+ }
+
public void testTwoContextsHaveMoreThanRequiredConstructorQualifiers() throws Throwable
{
- testTwoContextsHaveMoreThanRequiredQualifiers(TargetConstructorBean.class, TargetType.CONSTRUCTOR);
+ testTwoContextsHaveMoreThanRequiredQualifiers(TargetConstructorBean.class);
}
public void testTwoContextsHaveMoreThanRequiredMethodParameterQualifiers() throws Throwable
{
- testTwoContextsHaveMoreThanRequiredQualifiers(TargetMethodBean.class, TargetType.METHOD);
+ testTwoContextsHaveMoreThanRequiredQualifiers(TargetMethodBean.class);
}
- private <T extends Target> void testTwoContextsHaveMoreThanRequiredQualifiers(Class<T> targetClass, TargetType type) throws Throwable
+ private <T extends Target> void testTwoContextsHaveMoreThanRequiredQualifiers(Class<T> targetClass) throws Throwable
{
BeanMetaDataBuilder bean1Builder = BeanMetaDataBuilder.createBuilder("bean1", Bean.class.getName());
bean1Builder.addQualifiers(QualifierType.SUPPLIED, "test1", "test2", "extra1");
@@ -249,7 +276,7 @@
bean2Builder.addQualifiers(QualifierType.SUPPLIED, "test1", "test2", "extra2");
KernelControllerContext bean2Context = deploy(bean2Builder.getBeanMetaData());
- KernelControllerContext targetContext = deploy(createTargetMetaData(type, "test1", "test2"));
+ KernelControllerContext targetContext = deploy(createTargetMetaData(targetClass, "test1", "test2"));
try
{
assertBean("bean1", Bean.class);
@@ -266,20 +293,25 @@
public void testBeanRequiredQualifiersNotIgnoredByDefaultForProperty() throws Throwable
{
- testBeanRequiredQualifiersNotIgnoredByDefault(TargetPropertyBean.class, TargetType.PROPERTY);
+ testBeanRequiredQualifiersNotIgnoredByDefault(TargetPropertyBean.class);
}
+ public void testBeanRequiredQualifiersNotIgnoredByDefaultForField() throws Throwable
+ {
+ testBeanRequiredQualifiersNotIgnoredByDefault(TargetFieldBean.class);
+ }
+
public void testBeanRequiredQualifiersNotIgnoredByDefaultForConstructor() throws Throwable
{
- testBeanRequiredQualifiersNotIgnoredByDefault(TargetConstructorBean.class, TargetType.CONSTRUCTOR);
+ testBeanRequiredQualifiersNotIgnoredByDefault(TargetConstructorBean.class);
}
public void testBeanRequiredQualifiersNotIgnoredByDefaultForMethod() throws Throwable
{
- testBeanRequiredQualifiersNotIgnoredByDefault(TargetMethodBean.class, TargetType.METHOD);
+ testBeanRequiredQualifiersNotIgnoredByDefault(TargetMethodBean.class);
}
- private <T extends Target> void testBeanRequiredQualifiersNotIgnoredByDefault(Class<T> targetClass, TargetType type) throws Throwable
+ private <T extends Target> void testBeanRequiredQualifiersNotIgnoredByDefault(Class<T> targetClass) throws Throwable
{
BeanMetaDataBuilder bean1Builder = BeanMetaDataBuilder.createBuilder("bean1", Bean.class.getName());
bean1Builder.addQualifiers(QualifierType.SUPPLIED, "test", "notignored");
@@ -289,7 +321,7 @@
bean2Builder.addQualifiers(QualifierType.SUPPLIED, "test");
KernelControllerContext bean2Context = deploy(bean2Builder.getBeanMetaData());
- KernelControllerContext targetContext = deploy(addRequiredQualifiers(createTargetMetaData(type, "test"), "notignored"));
+ KernelControllerContext targetContext = deploy(addRequiredQualifiers(createTargetMetaData(targetClass, "test"), "notignored"));
try
{
Bean bean1 = assertBean("bean1", Bean.class);
@@ -308,20 +340,25 @@
public void testBeanOptionalQualifiersNotIgnoredByDefaultForProperty() throws Throwable
{
- testBeanOptionalQualifiersNotIgnoredByDefault(TargetPropertyBean.class, TargetType.PROPERTY);
+ testBeanOptionalQualifiersNotIgnoredByDefault(TargetPropertyBean.class);
}
+ public void testBeanOptionalQualifiersNotIgnoredByDefaultForField() throws Throwable
+ {
+ testBeanOptionalQualifiersNotIgnoredByDefault(TargetFieldBean.class);
+ }
+
public void testBeanOptionalQualifiersNotIgnoredByDefaultForConstructor() throws Throwable
{
- testBeanOptionalQualifiersNotIgnoredByDefault(TargetConstructorBean.class, TargetType.CONSTRUCTOR);
+ testBeanOptionalQualifiersNotIgnoredByDefault(TargetConstructorBean.class);
}
public void testBeanOptionalQualifiersNotIgnoredByDefaultForMethod() throws Throwable
{
- testBeanOptionalQualifiersNotIgnoredByDefault(TargetMethodBean.class, TargetType.METHOD);
+ testBeanOptionalQualifiersNotIgnoredByDefault(TargetMethodBean.class);
}
- private <T extends Target> void testBeanOptionalQualifiersNotIgnoredByDefault(Class<T> targetClass, TargetType type) throws Throwable
+ private <T extends Target> void testBeanOptionalQualifiersNotIgnoredByDefault(Class<T> targetClass) throws Throwable
{
BeanMetaDataBuilder bean1Builder = BeanMetaDataBuilder.createBuilder("bean1", Bean.class.getName());
bean1Builder.addQualifiers(QualifierType.SUPPLIED, "test", "notignored");
@@ -331,7 +368,7 @@
bean2Builder.addQualifiers(QualifierType.SUPPLIED, "test");
KernelControllerContext bean2Context = deploy(bean2Builder.getBeanMetaData());
- KernelControllerContext targetContext = deploy(addOptionalQualifiers(createTargetMetaData(type, "test"), "notignored"));
+ KernelControllerContext targetContext = deploy(addOptionalQualifiers(createTargetMetaData(targetClass, "test"), "notignored"));
try
{
Bean bean1 = assertBean("bean1", Bean.class);
@@ -350,20 +387,25 @@
public void testBeanRequiredQualifiersIgnoredForProperty() throws Throwable
{
- testBeanRequiredQualifiersIgnored(TargetPropertyBean.class, TargetType.PROPERTY);
+ testBeanRequiredQualifiersIgnored(TargetPropertyBean.class);
}
+ public void testBeanRequiredQualifiersIgnoredForField() throws Throwable
+ {
+ testBeanRequiredQualifiersIgnored(TargetFieldBean.class);
+ }
+
public void testBeanRequiredQualifiersIgnoredForConstructor() throws Throwable
{
- testBeanRequiredQualifiersIgnored(TargetConstructorBean.class, TargetType.CONSTRUCTOR);
+ testBeanRequiredQualifiersIgnored(TargetConstructorBean.class);
}
public void testBeanRequiredQualifiersIgnoredForMethod() throws Throwable
{
- testBeanRequiredQualifiersIgnored(TargetMethodBean.class, TargetType.METHOD);
+ testBeanRequiredQualifiersIgnored(TargetMethodBean.class);
}
- private <T extends Target> void testBeanRequiredQualifiersIgnored(Class<T> targetClass, TargetType type) throws Throwable
+ private <T extends Target> void testBeanRequiredQualifiersIgnored(Class<T> targetClass) throws Throwable
{
BeanMetaDataBuilder bean1Builder = BeanMetaDataBuilder.createBuilder("bean1", Bean.class.getName());
bean1Builder.addQualifiers(QualifierType.SUPPLIED, "test");
@@ -373,7 +415,7 @@
bean2Builder.addQualifiers(QualifierType.SUPPLIED, "other");
KernelControllerContext bean2Context = deploy(bean2Builder.getBeanMetaData());
- KernelControllerContext targetContext = deploy(addRequiredQualifiers(createTargetMetaData(type, true, "test"), "ignored"));
+ KernelControllerContext targetContext = deploy(addRequiredQualifiers(createTargetMetaData(targetClass, true, "test"), "ignored"));
try
{
Bean bean1 = assertBean("bean1", Bean.class);
@@ -390,22 +432,27 @@
}
}
+ public void testBeanOptionalQualifiersIgnoredForField() throws Throwable
+ {
+ testBeanOptionalQualifiersIgnored(TargetFieldBean.class);
+ }
+
public void testBeanOptionalQualifiersIgnoredForProperty() throws Throwable
{
- testBeanOptionalQualifiersIgnored(TargetPropertyBean.class, TargetType.PROPERTY);
+ testBeanOptionalQualifiersIgnored(TargetPropertyBean.class);
}
public void testBeanOptionalQualifiersIgnoredForConstructor() throws Throwable
{
- testBeanOptionalQualifiersIgnored(TargetConstructorBean.class, TargetType.CONSTRUCTOR);
+ testBeanOptionalQualifiersIgnored(TargetConstructorBean.class);
}
public void testBeanOptionalQualifiersIgnoredForMethod() throws Throwable
{
- testBeanOptionalQualifiersIgnored(TargetMethodBean.class, TargetType.METHOD);
+ testBeanOptionalQualifiersIgnored(TargetMethodBean.class);
}
- private <T extends Target> void testBeanOptionalQualifiersIgnored(Class<T> targetClass, TargetType type) throws Throwable
+ private <T extends Target> void testBeanOptionalQualifiersIgnored(Class<T> targetClass) throws Throwable
{
BeanMetaDataBuilder bean1Builder = BeanMetaDataBuilder.createBuilder("bean1", Bean.class.getName());
bean1Builder.addQualifiers(QualifierType.SUPPLIED, "test", "ignored");
@@ -415,7 +462,7 @@
bean2Builder.addQualifiers(QualifierType.SUPPLIED, "test");
KernelControllerContext bean2Context = deploy(bean2Builder.getBeanMetaData());
- KernelControllerContext targetContext = deploy(addOptionalQualifiers(createTargetMetaData(type, true, "test"), "ignored"));
+ KernelControllerContext targetContext = deploy(addOptionalQualifiers(createTargetMetaData(targetClass, true, "test"), "ignored"));
try
{
assertBean("bean1", Bean.class);
@@ -544,29 +591,31 @@
return builder.getBeanMetaData();
}
- private BeanMetaData createTargetMetaData(TargetType type, Object...qualifiers)
+ private BeanMetaData createTargetMetaData(Class<?> targetClass, Object...qualifiers)
{
- return createTargetMetaData(type, false, qualifiers);
+ return createTargetMetaData(targetClass, false, qualifiers);
}
- private BeanMetaData createTargetMetaData(TargetType type, boolean ignoreBeanQualifiers, Object...qualifiers)
+ private BeanMetaData createTargetMetaData(Class<?> targetClass, boolean ignoreBeanQualifiers, Object...qualifiers)
{
BeanMetaDataBuilder targetBuilder = null;
- if (type == TargetType.PROPERTY)
+ if (targetClass == TargetPropertyBean.class || targetClass == TargetFieldBean.class)
{
- targetBuilder = BeanMetaDataBuilder.createBuilder("target", TargetPropertyBean.class.getName());
+ targetBuilder = BeanMetaDataBuilder.createBuilder("target", targetClass.getName());
+ if (targetClass == TargetFieldBean.class)
+ targetBuilder.setAccessMode(BeanAccessMode.ALL);
targetBuilder.addPropertyMetaData("bean", targetBuilder.createContextualInject(ignoreBeanQualifiers, qualifiers));
}
- else if (type == TargetType.CONSTRUCTOR)
+ else if (targetClass == TargetConstructorBean.class)
{
- targetBuilder = BeanMetaDataBuilder.createBuilder("target", TargetConstructorBean.class.getName());
+ targetBuilder = BeanMetaDataBuilder.createBuilder("target", targetClass.getName());
targetBuilder.addConstructorParameter(Bean.class.getName(), targetBuilder.createContextualInject(ignoreBeanQualifiers, qualifiers));
}
else
{
- targetBuilder = BeanMetaDataBuilder.createBuilder("target", TargetMethodBean.class.getName());
+ targetBuilder = BeanMetaDataBuilder.createBuilder("target", targetClass.getName());
targetBuilder.addInstall("installBean", Bean.class.getName(), targetBuilder.createContextualInject(ignoreBeanQualifiers, qualifiers));
}
More information about the jboss-cvs-commits
mailing list