[jboss-cvs] JBossAS SVN: r58768 - in projects/microcontainer/trunk/container/src: main/org/jboss/reflect/plugins main/org/jboss/reflect/plugins/javassist tests/org/jboss/test/classinfo/test

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2006-11-30 08:57:55 -0500 (Thu, 30 Nov 2006)
New Revision: 58768

Modified:
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ArrayInfoImpl.java
   projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistArrayInfoImpl.java
   projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java
Log:
[JBMICROCONT-114] ArrayInfo etc. should not return anything

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ArrayInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ArrayInfoImpl.java	2006-11-30 13:40:28 UTC (rev 58767)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/ArrayInfoImpl.java	2006-11-30 13:57:55 UTC (rev 58768)
@@ -78,38 +78,17 @@
    
    public AnnotationValue getAnnotation(String name)
    {
-      if (componentType instanceof AnnotatedInfo)
-      {
-         return ((AnnotatedInfo)componentType).getAnnotation(name);
-      }
-      else
-      {
-         return null;
-      }
+      return null;
    }
 
    public AnnotationValue[] getAnnotations()
    {
-      if (componentType instanceof AnnotatedInfo)
-      {
-         return ((AnnotatedInfo)componentType).getAnnotations();
-      }
-      else
-      {
-         return UNKNOWN_ANNOTATIONS;
-      }
+      return UNKNOWN_ANNOTATIONS;
    }
 
    public boolean isAnnotationPresent(String name)
    {
-      if (componentType instanceof AnnotatedInfo)
-      {
-         return ((AnnotatedInfo)componentType).isAnnotationPresent(name);
-      }
-      else
-      {
-         return false;
-      }
+      return false;
    }
 
    public boolean equals(Object o)

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistArrayInfoImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistArrayInfoImpl.java	2006-11-30 13:40:28 UTC (rev 58767)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/javassist/JavassistArrayInfoImpl.java	2006-11-30 13:57:55 UTC (rev 58768)
@@ -83,38 +83,17 @@
    
    public AnnotationValue getAnnotation(String name)
    {
-      if (componentType instanceof AnnotatedInfo)
-      {
-         return ((AnnotatedInfo)componentType).getAnnotation(name);
-      }
-      else
-      {
-         return null;
-      }
+      return null;
    }
 
    public AnnotationValue[] getAnnotations()
    {
-      if (componentType instanceof AnnotatedInfo)
-      {
-         return ((AnnotatedInfo)componentType).getAnnotations();
-      }
-      else
-      {
-         return UNKNOWN_ANNOTATIONS;
-      }
+      return UNKNOWN_ANNOTATIONS;
    }
 
    public boolean isAnnotationPresent(String name)
    {
-      if (componentType instanceof AnnotatedInfo)
-      {
-         return ((AnnotatedInfo)componentType).isAnnotationPresent(name);
-      }
-      else
-      {
-         return false;
-      }
+      return false;
    }
 
    public boolean equals(Object o)

Modified: projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java
===================================================================
--- projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java	2006-11-30 13:40:28 UTC (rev 58767)
+++ projects/microcontainer/trunk/container/src/tests/org/jboss/test/classinfo/test/AnnotatedClassInfoTest.java	2006-11-30 13:57:55 UTC (rev 58768)
@@ -21,6 +21,7 @@
 */ 
 package org.jboss.test.classinfo.test;
 
+import java.util.Arrays;
 import java.util.HashSet;
 
 import org.jboss.reflect.spi.AnnotatedInfo;
@@ -195,22 +196,36 @@
       
       ClassInfo info = getClassInfo(classArray);
       assertTrue(ArrayInfo.class.isAssignableFrom(info.getClass()));
-      checkAnnotations(info, CLASS_DATA);
+      
+      assertTrue(info.getAnnotations().length == 0);
+      for (Class annotation : EXPECTED_ANNOTATIONS)
+      {
+         assertNull(info.getAnnotation(annotation.getName()));
+         assertFalse(info.isAnnotationPresent(annotation.getName()));
+      }
+      
+      ClassInfo componentInfo = (ClassInfo)((ArrayInfo)info).getComponentType();
+      checkAnnotations(componentInfo, CLASS_DATA);
    }
    
    public void testSubClassArrayAnnotations() throws Exception
    {
       Class classArray = new AnnotatedSubClass[0].getClass();
       
-      System.out.println(classArray.getAnnotations());
-      
       ClassInfo info = getClassInfo(classArray);
       assertTrue(ArrayInfo.class.isAssignableFrom(info.getClass()));
 
-      AnnotationValue[] annotations = info.getAnnotations();
+      assertTrue(info.getAnnotations().length == 0);
+      assertNull(info.getAnnotation(AnotherAnnotation.class.getName()));
+      assertFalse(info.isAnnotationPresent(AnotherAnnotation.class.getName()));
+      assertNull(info.getAnnotation(SimpleAnnotation.class.getName()));
+      assertFalse(info.isAnnotationPresent(SimpleAnnotation.class.getName()));
+      
+      ClassInfo componentInfo = (ClassInfo)((ArrayInfo)info).getComponentType();
+      AnnotationValue[] annotations = componentInfo.getAnnotations();
       assertEquals(2, annotations.length);
-      AnnotationValue anotherAnnotation = getAnnotationCheckTypeAndName(info, AnotherAnnotation.class.getName());
-      AnnotationValue simpleAnnotation = getAnnotationCheckTypeAndName(info, SimpleAnnotation.class.getName());
+      AnnotationValue anotherAnnotation = getAnnotationCheckTypeAndName(componentInfo, AnotherAnnotation.class.getName());
+      AnnotationValue simpleAnnotation = getAnnotationCheckTypeAndName(componentInfo, SimpleAnnotation.class.getName());
       
       HashSet<AnnotationValue> set = new HashSet<AnnotationValue>();
       set.add(anotherAnnotation);