[webbeans-commits] Webbeans SVN: r900 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test: ejb and 1 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Mon Jan 12 11:55:17 EST 2009
Author: gavin.king at jboss.com
Date: 2009-01-12 11:55:17 -0500 (Mon, 12 Jan 2009)
New Revision: 900
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypesTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanSpecializationTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewEnterpriseBeanTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java
Log:
getBindingTypes() -> getBindings()
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java 2009-01-12 16:47:16 UTC (rev 899)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerFieldBeanModelTest.java 2009-01-12 16:55:17 UTC (rev 900)
@@ -83,8 +83,8 @@
manager.addBean(bean);
Field field = OtherSpiderProducer.class.getField("produceTarantula");
ProducerFieldBean<Tarantula> tarantulaModel = ProducerFieldBean.of(field, bean, manager);
- assert tarantulaModel.getBindingTypes().size() == 1;
- assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Current.class);
+ assert tarantulaModel.getBindings().size() == 1;
+ assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Current.class);
}
@Test(groups="producerField") @SpecAssertion(section="3.5.1")
@@ -146,8 +146,8 @@
manager.addBean(bean);
Field field = OtherSpiderProducer.class.getField("produceTameTarantula");
ProducerFieldBean<Tarantula> tarantulaModel = ProducerFieldBean.of(field, bean, manager);
- assert tarantulaModel.getBindingTypes().size() == 1;
- assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Tame.class);
+ assert tarantulaModel.getBindings().size() == 1;
+ assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class);
}
@Test(groups="producerField") @SpecAssertion(section="3.5.2")
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java 2009-01-12 16:47:16 UTC (rev 899)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java 2009-01-12 16:55:17 UTC (rev 900)
@@ -88,8 +88,8 @@
manager.addBean(bean);
Method method = SpiderProducer.class.getMethod("produceTarantula");
ProducerMethodBean<Tarantula> tarantulaModel = ProducerMethodBean.of(method, bean, manager);
- assert tarantulaModel.getBindingTypes().size() == 1;
- assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Current.class);
+ assert tarantulaModel.getBindings().size() == 1;
+ assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Current.class);
}
@Test(groups="producerMethod") @SpecAssertion(section="3.4.1")
@@ -151,8 +151,8 @@
manager.addBean(bean);
Method method = SpiderProducer.class.getMethod("produceTameTarantula");
ProducerMethodBean<Tarantula> tarantulaModel = ProducerMethodBean.of(method, bean, manager);
- assert tarantulaModel.getBindingTypes().size() == 1;
- assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Tame.class);
+ assert tarantulaModel.getBindings().size() == 1;
+ assert tarantulaModel.getBindings().iterator().next().annotationType().equals(Tame.class);
}
@Test(groups="producerMethod") @SpecAssertion(section="3.4.2")
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2009-01-12 16:47:16 UTC (rev 899)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2009-01-12 16:55:17 UTC (rev 900)
@@ -283,9 +283,9 @@
public void testSpecializedClassInheritsBindingTypes()
{
SimpleBean<Tractor> bean = SimpleBean.of(Tractor.class, manager);
- assert bean.getBindingTypes().size()==2;
- assert bean.getBindingTypes().contains( new AnnotationLiteral<Motorized>() {} );
- assert bean.getBindingTypes().contains( new AnnotationLiteral<HeavyDuty>() {} );
+ assert bean.getBindings().size()==2;
+ assert bean.getBindings().contains( new AnnotationLiteral<Motorized>() {} );
+ assert bean.getBindings().contains( new AnnotationLiteral<HeavyDuty>() {} );
}
@Test(groups="specializationInherit") @SpecAssertion(section="3.2.6")
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypesTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypesTest.java 2009-01-12 16:47:16 UTC (rev 899)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypesTest.java 2009-01-12 16:55:17 UTC (rev 900)
@@ -144,7 +144,7 @@
{
SimpleBean<HighlandCow> highlandCow = SimpleBean.of(HighlandCow.class, manager);
assert highlandCow.getName() == null;
- assert highlandCow.getBindingTypes().iterator().next().annotationType().equals(Tame.class);
+ assert highlandCow.getBindings().iterator().next().annotationType().equals(Tame.class);
assert highlandCow.getScopeType().equals(RequestScoped.class);
assert highlandCow.getMergedStereotypes().getRequiredTypes().size() == 1;
assert highlandCow.getMergedStereotypes().getRequiredTypes().contains(Animal.class);
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanSpecializationTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanSpecializationTest.java 2009-01-12 16:47:16 UTC (rev 899)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/EnterpriseBeanSpecializationTest.java 2009-01-12 16:55:17 UTC (rev 900)
@@ -62,15 +62,15 @@
private boolean compareBindingTypesOK(EnterpriseBean<Hound> hound, EnterpriseBean<HoundOfBaskerville> houndOfBaskerville)
{
- if (hound.getBindingTypes().size() != houndOfBaskerville.getBindingTypes().size())
+ if (hound.getBindings().size() != houndOfBaskerville.getBindings().size())
{
return false;
}
- if (!hound.getBindingTypes().containsAll(houndOfBaskerville.getBindingTypes()))
+ if (!hound.getBindings().containsAll(houndOfBaskerville.getBindings()))
{
return false;
}
- if (!houndOfBaskerville.getBindingTypes().containsAll(hound.getBindingTypes()))
+ if (!houndOfBaskerville.getBindings().containsAll(hound.getBindings()))
{
return false;
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewEnterpriseBeanTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewEnterpriseBeanTest.java 2009-01-12 16:47:16 UTC (rev 899)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewEnterpriseBeanTest.java 2009-01-12 16:55:17 UTC (rev 900)
@@ -83,8 +83,8 @@
@SpecAssertion(section = "3.9")
public void testNewBeanIsHasOnlyNewBinding()
{
- assert newEnterpriseBean.getBindingTypes().size() == 1;
- assert newEnterpriseBean.getBindingTypes().iterator().next().annotationType().equals(new NewBinding().annotationType());
+ assert newEnterpriseBean.getBindings().size() == 1;
+ assert newEnterpriseBean.getBindings().iterator().next().annotationType().equals(new NewBinding().annotationType());
}
/**
@@ -276,7 +276,7 @@
public void testNewBeanHasNoDisposalMethods()
{
Class<?> type = TypeInfo.ofTypes(newEnterpriseBean.getTypes()).getSuperClass();
- assert manager.resolveDisposalMethods(type, newEnterpriseBean.getBindingTypes().toArray(new Annotation[0])).isEmpty();
+ assert manager.resolveDisposalMethods(type, newEnterpriseBean.getBindings().toArray(new Annotation[0])).isEmpty();
}
/**
@@ -312,7 +312,7 @@
@SpecAssertion(section = "3.9")
public void testNewBeanHasNoDecorators()
{
- Annotation[] bindingTypes = newEnterpriseBean.getBindingTypes().toArray(new Annotation[0]);
+ Annotation[] bindingTypes = newEnterpriseBean.getBindings().toArray(new Annotation[0]);
assert manager.resolveDecorators(newEnterpriseBean.getTypes(), bindingTypes).isEmpty();
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java 2009-01-12 16:47:16 UTC (rev 899)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/newbean/NewSimpleBeanTest.java 2009-01-12 16:55:17 UTC (rev 900)
@@ -81,8 +81,8 @@
@SpecAssertion(section = "3.9")
public void testNewBeanIsHasOnlyNewBinding()
{
- assert newSimpleBean.getBindingTypes().size() == 1;
- assert newSimpleBean.getBindingTypes().iterator().next().annotationType().equals(new NewBinding().annotationType());
+ assert newSimpleBean.getBindings().size() == 1;
+ assert newSimpleBean.getBindings().iterator().next().annotationType().equals(new NewBinding().annotationType());
}
/**
@@ -271,7 +271,7 @@
public void testNewBeanHasNoDisposalMethods()
{
Class<?> type = TypeInfo.ofTypes(newSimpleBean.getTypes()).getSuperClass();
- assert manager.resolveDisposalMethods(type, newSimpleBean.getBindingTypes().toArray(new Annotation[0])).isEmpty();
+ assert manager.resolveDisposalMethods(type, newSimpleBean.getBindings().toArray(new Annotation[0])).isEmpty();
}
/**
@@ -307,7 +307,7 @@
@SpecAssertion(section = "3.9")
public void testNewBeanHasNoDecorators()
{
- Annotation[] bindingTypes = newSimpleBean.getBindingTypes().toArray(new Annotation[0]);
+ Annotation[] bindingTypes = newSimpleBean.getBindings().toArray(new Annotation[0]);
assert manager.resolveDecorators(newSimpleBean.getTypes(), bindingTypes).isEmpty();
}
More information about the weld-commits
mailing list