Added additional tests.

raphw · Jan 13, 2016 · 698d31b · 698d31b
1 parent b3ee51e
commit 698d31b
Show file tree

Hide file tree

Showing 10 changed files with 701 additions and 31 deletions.
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/attribute/AnnotationAppender.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/attribute/AnnotationAppender.java
@@ -489,7 +489,7 @@ public static AnnotationAppender ofTypeVariable(AnnotationAppender annotationApp
                 for (AnnotationDescription annotationDescription : typeVariable.getDeclaredAnnotations()) {
                     annotationAppender = annotationAppender.append(annotationDescription, annotationValueFilter, typeReference, EMPTY_TYPE_PATH);
                 }
-                int boundIndex = typeVariable.getUpperBounds().get(0).getSort().isTypeVariable() || typeVariable.getUpperBounds().get(0).asErasure().isInterface()
+                int boundIndex = !typeVariable.getUpperBounds().get(0).getSort().isTypeVariable() && typeVariable.getUpperBounds().get(0).asErasure().isInterface()
                         ? 1
                         : 0;
                 for (TypeDescription.Generic typeBound : typeVariable.getUpperBounds()) {

diff --git a/...uddy-dep/src/main/java/net/bytebuddy/implementation/attribute/FieldAttributeAppender.java b/...uddy-dep/src/main/java/net/bytebuddy/implementation/attribute/FieldAttributeAppender.java
@@ -130,10 +130,10 @@ enum ForInstrumentedField implements FieldAttributeAppender, Factory {
 
         @Override
         public void apply(FieldVisitor fieldVisitor, FieldDescription fieldDescription, AnnotationValueFilter annotationValueFilter) {
-            AnnotationAppender appender = new AnnotationAppender.Default(new AnnotationAppender.Target.OnField(fieldVisitor));
+            AnnotationAppender annotationAppender = new AnnotationAppender.Default(new AnnotationAppender.Target.OnField(fieldVisitor));
-            appender = fieldDescription.getType().accept(AnnotationAppender.ForTypeAnnotations.ofFieldType(appender, annotationValueFilter));
+            annotationAppender = fieldDescription.getType().accept(AnnotationAppender.ForTypeAnnotations.ofFieldType(annotationAppender, annotationValueFilter));
             for (AnnotationDescription annotation : fieldDescription.getDeclaredAnnotations()) {
-                appender = appender.append(annotation, annotationValueFilter);
+                annotationAppender = annotationAppender.append(annotation, annotationValueFilter);
             }
         }
 

diff --git a/...buddy-dep/src/main/java/net/bytebuddy/implementation/attribute/TypeAttributeAppender.java b/...buddy-dep/src/main/java/net/bytebuddy/implementation/attribute/TypeAttributeAppender.java
@@ -130,8 +130,9 @@ public boolean equals(Object other) {
                 if (this == other) return true;
                 if (other == null || getClass() != other.getClass()) return false;
                 Differentiating differentiating = (Differentiating) other;
-                if (annotationIndex != differentiating.annotationIndex) return false;
+                return annotationIndex == differentiating.annotationIndex
-                return typeVariableIndex == differentiating.typeVariableIndex && interfaceTypeIndex == differentiating.interfaceTypeIndex;
+                        && typeVariableIndex == differentiating.typeVariableIndex
+                        && interfaceTypeIndex == differentiating.interfaceTypeIndex;
             }
 
             @Override
@@ -144,7 +145,7 @@ public int hashCode() {
 
             @Override
             public String toString() {
-                return "TypeAttributeAppender.ForInstrumentedType.Excluding{" +
+                return "TypeAttributeAppender.ForInstrumentedType.Differentiating{" +
                         "annotationIndex=" + annotationIndex +
                         ", typeVariableIndex=" + typeVariableIndex +
                         ", interfaceTypeIndex=" + interfaceTypeIndex +

diff --git a/...c/test/java/net/bytebuddy/dynamic/scaffold/inline/RedefinitionDynamicTypeBuilderTest.java b/...c/test/java/net/bytebuddy/dynamic/scaffold/inline/RedefinitionDynamicTypeBuilderTest.java
@@ -150,6 +150,7 @@ public List<?> create() {
             public TypeDescription create() {
                 TypeDescription rawTypeDescription = mock(TypeDescription.class);
                 when(rawTypeDescription.getDeclaredAnnotations()).thenReturn(new AnnotationList.Empty());
+                when(rawTypeDescription.getTypeVariables()).thenReturn(new TypeList.Generic.Empty());
                 TypeDescription.Generic typeDescription = mock(TypeDescription.Generic.class);
                 when(typeDescription.asErasure()).thenReturn(rawTypeDescription);
                 when(typeDescription.asGenericType()).thenReturn(typeDescription);

diff --git a/...p/src/test/java/net/bytebuddy/implementation/attribute/AbstractAttributeAppenderTest.java b/...p/src/test/java/net/bytebuddy/implementation/attribute/AbstractAttributeAppenderTest.java
@@ -2,7 +2,9 @@
 
 import net.bytebuddy.description.annotation.AnnotationDescription;
 import net.bytebuddy.description.method.MethodDescription;
+import net.bytebuddy.description.type.TypeDefinition;
 import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.description.type.TypeList;
 import net.bytebuddy.test.utility.MockitoRule;
 import org.junit.Before;
 import org.junit.Rule;
@@ -27,9 +29,27 @@ public abstract class AbstractAttributeAppenderTest {
     @Mock
     protected AnnotationValueFilter annotationValueFilter;
 
+    @Mock
+    protected TypeDescription.Generic.OfNonGenericType simpleAnnotatedType;
+
+    @Mock
+    protected TypeDescription.Generic.OfTypeVariable annotatedTypeVariable;
+
+    @Mock
+    protected TypeDescription.Generic.OfNonGenericType annotatedTypeVariableBound;
+
     @Before
+    @SuppressWarnings("unchecked")
     public void setUp() throws Exception {
         when(annotationValueFilter.isRelevant(any(AnnotationDescription.class), any(MethodDescription.InDefinedShape.class))).thenReturn(true);
+        when(annotatedTypeVariable.accept(any(TypeDescription.Generic.Visitor.class))).thenCallRealMethod();
+        when(annotatedTypeVariable.getUpperBounds()).thenReturn(new TypeList.Generic.Explicit(annotatedTypeVariableBound));
+        when(annotatedTypeVariable.asGenericType()).thenReturn(annotatedTypeVariable);
+        when(annotatedTypeVariableBound.accept(any(TypeDescription.Generic.Visitor.class))).thenCallRealMethod();
+        when(annotatedTypeVariableBound.getSort()).thenReturn(TypeDefinition.Sort.VARIABLE);
+        when(annotatedTypeVariableBound.asGenericType()).thenReturn(annotatedTypeVariableBound);
+        when(simpleAnnotatedType.accept(any(TypeDescription.Generic.Visitor.class))).thenCallRealMethod();
+        when(simpleAnnotatedType.asGenericType()).thenReturn(simpleAnnotatedType);
     }
 
     @Retention(RetentionPolicy.SOURCE)

diff --git a/...et/bytebuddy/implementation/attribute/FieldAttributeAppenderForInstrumentedFieldTest.java b/...et/bytebuddy/implementation/attribute/FieldAttributeAppenderForInstrumentedFieldTest.java
@@ -1,8 +1,10 @@
 package net.bytebuddy.implementation.attribute;
 
 import net.bytebuddy.description.annotation.AnnotationList;
+import net.bytebuddy.description.type.TypeDescription;
 import org.junit.Test;
 import org.mockito.asm.Type;
+import org.objectweb.asm.TypeReference;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -18,30 +20,80 @@ public void testFactory() throws Exception {
 
     @Test
     public void testAnnotationAppenderNoRetention() throws Exception {
+        when(fieldDescription.getType()).thenReturn(TypeDescription.Generic.OBJECT);
         when(fieldDescription.getDeclaredAnnotations()).thenReturn(new AnnotationList.ForLoadedAnnotations(new Qux.Instance()));
         FieldAttributeAppender.ForInstrumentedField.INSTANCE.apply(fieldVisitor, fieldDescription, annotationValueFilter);
         verifyZeroInteractions(fieldVisitor);
         verify(fieldDescription).getDeclaredAnnotations();
+        verify(fieldDescription).getType();
         verifyNoMoreInteractions(fieldDescription);
     }
 
     @Test
     public void testAnnotationAppenderRuntimeRetention() throws Exception {
+        when(fieldDescription.getType()).thenReturn(TypeDescription.Generic.OBJECT);
         when(fieldDescription.getDeclaredAnnotations()).thenReturn(new AnnotationList.ForLoadedAnnotations(new Baz.Instance()));
         FieldAttributeAppender.ForInstrumentedField.INSTANCE.apply(fieldVisitor, fieldDescription, annotationValueFilter);
         verify(fieldVisitor).visitAnnotation(Type.getDescriptor(Baz.class), true);
         verifyNoMoreInteractions(fieldVisitor);
         verify(fieldDescription).getDeclaredAnnotations();
+        verify(fieldDescription).getType();
         verifyNoMoreInteractions(fieldDescription);
     }
 
     @Test
     public void testAnnotationAppenderByteCodeRetention() throws Exception {
+        when(fieldDescription.getType()).thenReturn(TypeDescription.Generic.OBJECT);
         when(fieldDescription.getDeclaredAnnotations()).thenReturn(new AnnotationList.ForLoadedAnnotations(new QuxBaz.Instance()));
         FieldAttributeAppender.ForInstrumentedField.INSTANCE.apply(fieldVisitor, fieldDescription, annotationValueFilter);
         verify(fieldVisitor).visitAnnotation(Type.getDescriptor(QuxBaz.class), false);
         verifyNoMoreInteractions(fieldVisitor);
         verify(fieldDescription).getDeclaredAnnotations();
+        verify(fieldDescription).getType();
+        verifyNoMoreInteractions(fieldDescription);
+    }
+
+    @Test
+    public void testFieldTypeTypeAnnotationNoRetention() throws Exception {
+        when(fieldDescription.getType()).thenReturn(simpleAnnotatedType);
+        when(simpleAnnotatedType.getDeclaredAnnotations()).thenReturn(new AnnotationList.ForLoadedAnnotations(new Qux.Instance()));
+        when(fieldDescription.getDeclaredAnnotations()).thenReturn(new AnnotationList.Empty());
+        FieldAttributeAppender.ForInstrumentedField.INSTANCE.apply(fieldVisitor, fieldDescription, annotationValueFilter);
+        verifyZeroInteractions(fieldVisitor);
+        verify(fieldDescription).getDeclaredAnnotations();
+        verify(fieldDescription).getType();
+        verifyNoMoreInteractions(fieldDescription);
+    }
+
+    @Test
+    public void testFieldTypeTypeAnnotationRuntimeRetention() throws Exception {
+        when(fieldDescription.getType()).thenReturn(simpleAnnotatedType);
+        when(simpleAnnotatedType.getDeclaredAnnotations()).thenReturn(new AnnotationList.ForLoadedAnnotations(new Baz.Instance()));
+        when(fieldDescription.getDeclaredAnnotations()).thenReturn(new AnnotationList.Empty());
+        FieldAttributeAppender.ForInstrumentedField.INSTANCE.apply(fieldVisitor, fieldDescription, annotationValueFilter);
+        verify(fieldVisitor).visitTypeAnnotation(TypeReference.newTypeReference(TypeReference.FIELD).getValue(),
+                null,
+                Type.getDescriptor(Baz.class),
+                true);
+        verifyNoMoreInteractions(fieldVisitor);
+        verify(fieldDescription).getDeclaredAnnotations();
+        verify(fieldDescription).getType();
+        verifyNoMoreInteractions(fieldDescription);
+    }
+
+    @Test
+    public void testFieldTypeTypeAnnotationByteCodeRetention() throws Exception {
+        when(fieldDescription.getType()).thenReturn(simpleAnnotatedType);
+        when(simpleAnnotatedType.getDeclaredAnnotations()).thenReturn(new AnnotationList.ForLoadedAnnotations(new QuxBaz.Instance()));
+        when(fieldDescription.getDeclaredAnnotations()).thenReturn(new AnnotationList.Empty());
+        FieldAttributeAppender.ForInstrumentedField.INSTANCE.apply(fieldVisitor, fieldDescription, annotationValueFilter);
+        verify(fieldVisitor).visitTypeAnnotation(TypeReference.newTypeReference(TypeReference.FIELD).getValue(),
+                null,
+                Type.getDescriptor(QuxBaz.class),
+                false);
+        verifyNoMoreInteractions(fieldVisitor);
+        verify(fieldDescription).getDeclaredAnnotations();
+        verify(fieldDescription).getType();
         verifyNoMoreInteractions(fieldDescription);
     }
 }