- Revision
- 1336
- Author
- rfscholte
- Date
- 2011-09-22 13:48:26 -0500 (Thu, 22 Sep 2011)
Log Message
JavaAnnotation.getType() returns JavaClass instead of Type
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaAnnotation.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationExpressionTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaAnnotation.java (1335 => 1336)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaAnnotation.java 2011-09-21 21:14:10 UTC (rev 1335) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaAnnotation.java 2011-09-22 18:48:26 UTC (rev 1336) @@ -28,7 +28,7 @@ /** * @return the annotation type */ - Type getType(); + JavaClass getType(); Map<String, AnnotationValue> getPropertyMap();
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationExpressionTest.java (1335 => 1336)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationExpressionTest.java 2011-09-21 21:14:10 UTC (rev 1335) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationExpressionTest.java 2011-09-22 18:48:26 UTC (rev 1336) @@ -144,7 +144,6 @@ JavaClass clazz = builder.getClassByName( "Foo" ); assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); - assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() );
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java (1335 => 1336)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java 2011-09-21 21:14:10 UTC (rev 1335) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java 2011-09-22 18:48:26 UTC (rev 1336) @@ -32,7 +32,6 @@ JavaClass clazz = builder.getClassByName( "Foo" ); assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); - assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); return annotation; } @@ -94,7 +93,6 @@ JavaClass clazz = builder.getClassByName( "Foo" ); assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); - assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 5, annotation.getPropertyMap().size() ); @@ -120,7 +118,6 @@ JavaClass clazz = builder.getClassByName( "Foo" ); assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); - assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() ); @@ -139,7 +136,6 @@ JavaClass clazz = builder.getClassByName( "Foo" ); assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); - assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() ); @@ -154,7 +150,6 @@ JavaClass clazz = builder.getClassByName( "Foo" ); assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); - assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() ); @@ -169,7 +164,6 @@ JavaClass clazz = builder.getClassByName( "Foo" ); assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); - assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() ); @@ -185,7 +179,6 @@ JavaClass clazz = builder.getClassByName( "Foo" ); assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); - assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() ); @@ -200,7 +193,6 @@ JavaClass clazz = builder.getClassByName( "Foo" ); assertEquals( "Annotations", 1, clazz.getAnnotations().size() ); JavaAnnotation annotation = clazz.getAnnotations().get(0); - assertEquals( "Annotation name", "Annotation", annotation.getType().getJavaClass().getFullyQualifiedName() ); assertEquals( "Annotation name", "Annotation", annotation.getType().getFullyQualifiedName() ); assertEquals( "Properties", 1, annotation.getPropertyMap().size() );
To unsubscribe from this list please visit:
