[qdox-scm] [1416] trunk/qdox/src/test/java/com/thoughtworks/qdox/builder: EvaluatingVisitor.visit(AnnotationValueList) now returns a List instead of a plain Object

[rfscholte]

Title: [1416] trunk/qdox/src/test/java/com/thoughtworks/qdox/builder: EvaluatingVisitor.visit(AnnotationValueList) now returns a List instead of a plain Object

Revision

1416

Author

rfscholte

Date

2011-10-15 15:22:13 -0500 (Sat, 15 Oct 2011)

Log Message

EvaluatingVisitor.visit(AnnotationValueList) now returns a List instead of a plain Object
Enable EvaluatingVisitorTest.testVisitAnnotationValueList()

Modified Paths

trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/EvaluatingVisitor.java
trunk/qdox/src/test/java/com/thoughtworks/qdox/builder/EvaluatingVisitorTest.java

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/EvaluatingVisitor.java (1415 => 1416)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/EvaluatingVisitor.java	2011-10-15 13:06:17 UTC (rev 1415)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/EvaluatingVisitor.java	2011-10-15 20:22:13 UTC (rev 1416)
@@ -444,7 +444,7 @@
         return typeRef.getType();
     }
 
-    public Object visit( AnnotationValueList valueList )
+    public List<?> visit( AnnotationValueList valueList )
     {
         List<Object> list = new LinkedList<Object>();
 

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/builder/EvaluatingVisitorTest.java (1415 => 1416)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/builder/EvaluatingVisitorTest.java	2011-10-15 13:06:17 UTC (rev 1415)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/builder/EvaluatingVisitorTest.java	2011-10-15 20:22:13 UTC (rev 1416)
@@ -18,6 +18,7 @@
 import com.thoughtworks.qdox.model._expression_.Add;
 import com.thoughtworks.qdox.model._expression_.And;
 import com.thoughtworks.qdox.model._expression_.AnnotationValue;
+import com.thoughtworks.qdox.model._expression_.AnnotationValueList;
 import com.thoughtworks.qdox.model._expression_.Cast;
 import com.thoughtworks.qdox.model._expression_.Divide;
 import com.thoughtworks.qdox.model._expression_.Equals;
@@ -309,9 +310,22 @@
         }
     }
     
-    @Ignore
     @Test
     public void testVisitAnnotationValueList() {
+        {
+            List<AnnotationValue> emptyList = Collections.emptyList();
+            List<?> visitedResult = visitor.visit( new AnnotationValueList( emptyList ) );
+            assertEquals( 0, visitedResult.size() );
+        }
+        
+        {
+            AnnotationValue annoVal = mock( AnnotationValue.class );
+            Object singleResult = new Object();
+            when( annoVal.accept( visitor ) ).thenReturn( singleResult );
+            List<?> visitedResult = visitor.visit( new AnnotationValueList( Collections.singletonList( annoVal ) ) );
+            assertEquals( 1, visitedResult.size() );
+            assertSame( singleResult, visitedResult.get( 0 )  );
+        }
     }
 
     @Test

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email