Renamed the injection point metadata web bean implementation and some…

… fixes for the tests. git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@787 1c488680-804c-0410-94cd-c6b725194a0e
weld · Jan 6, 2009 · 4c59df2 · 4c59df2
1 parent b1576f5
commit 4c59df2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...oss/webbeans/bean/InjectionPointBean.java → ...ebbeans/injection/InjectionPointImpl.java b/...oss/webbeans/bean/InjectionPointBean.java → ...ebbeans/injection/InjectionPointImpl.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.jboss.webbeans.bean;
+package org.jboss.webbeans.injection;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
@@ -36,7 +36,7 @@
  */
 @Standard
 @Dependent
-public class InjectionPointBean implements InjectionPoint
+public class InjectionPointImpl implements InjectionPoint
 {
    private final AbstractAnnotatedMember<?, ? extends Member> memberInjectionPoint;
    private final Bean<?> bean;
@@ -49,7 +49,7 @@ public class InjectionPointBean implements InjectionPoint
     * @param bean The bean being injected
     * @param beanInstance The instance of the bean being injected
     */
-   public InjectionPointBean(AbstractAnnotatedMember<?, ? extends Member> injectedMember, Bean<?> bean, Object beanInstance)
+   public InjectionPointImpl(AbstractAnnotatedMember<?, ? extends Member> injectedMember, Bean<?> bean, Object beanInstance)
    {
       this.memberInjectionPoint = injectedMember;
       this.bean = bean;

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionPointTest.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectionPointTest.java
@@ -131,7 +131,7 @@ public void testGetBindingTypes()
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
          Set<Annotation> bindingTypes = beanWithInjectionPoint.getInjectedMetadata().getBindingTypes();
          assert bindingTypes.size() == 1;
-         assert bindingTypes.iterator().next().equals(Current.class);
+         assert Current.class.isAssignableFrom(bindingTypes.iterator().next().annotationType());
       }
       finally
       {
@@ -251,7 +251,7 @@ public void testStandardDeployment()
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
-         assert beanWithInjectionPoint.getInjectedMetadata().getBean().getDeploymentType().equals(Standard.class);
+         assert beanWithInjectionPoint.getInjectedMetadata().getClass().isAnnotationPresent(Standard.class);
       }
       finally
       {
@@ -273,7 +273,7 @@ public void testDependentScope()
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
-         assert beanWithInjectionPoint.getInjectedMetadata().getBean().getScopeType().equals(Dependent.class);
+         assert beanWithInjectionPoint.getInjectedMetadata().getClass().isAnnotationPresent(Dependent.class);
       }
       finally
       {
@@ -317,7 +317,7 @@ public void testCurrentBinding()
          FieldInjectionPointBean beanWithInjectedBean = manager.getInstanceByType(FieldInjectionPointBean.class, new CurrentBinding());
          BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
          assert beanWithInjectionPoint.getInjectedMetadata() != null;
-         assert beanWithInjectionPoint.getInjectedMetadata().getBean().getBindingTypes().contains(Current.class);
+         assert beanWithInjectionPoint.getInjectedMetadata().getBindingTypes().contains(new CurrentBinding());
       }
       finally
       {