re-enabled constructor test based on annotations
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/digester/trunk@1209989 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/digester3/annotations/FromAnnotationsRuleModule.java b/src/main/java/org/apache/commons/digester3/annotations/FromAnnotationsRuleModule.java
index 2a7a0f2..86ccc4a 100644
--- a/src/main/java/org/apache/commons/digester3/annotations/FromAnnotationsRuleModule.java
+++ b/src/main/java/org/apache/commons/digester3/annotations/FromAnnotationsRuleModule.java
@@ -186,13 +186,26 @@
handle( annotation, element );
}
- if ( element instanceof Method )
+ if ( element instanceof Constructor || element instanceof Method )
{
- // method args
- Method method = (Method) element;
+ Annotation[][] parameterAnnotations;
+ Class<?>[] parameterTypes;
- Annotation[][] parameterAnnotations = method.getParameterAnnotations();
- Class<?>[] parameterTypes = method.getParameterTypes();
+ if ( element instanceof Constructor )
+ {
+ // constructor args
+ Constructor<?> construcotr = (Constructor<?>) element;
+ parameterAnnotations = construcotr.getParameterAnnotations();
+ parameterTypes = construcotr.getParameterTypes();
+ }
+ else
+ {
+ // method args
+ Method method = (Method) element;
+ parameterAnnotations = method.getParameterAnnotations();
+ parameterTypes = method.getParameterTypes();
+ }
+
for ( int i = 0; i < parameterTypes.length; i++ )
{
visitElements( new MethodArgument( i, parameterTypes[i], parameterAnnotations[i] ) );
diff --git a/src/test/java/org/apache/commons/digester3/Digester153TestCase.java b/src/test/java/org/apache/commons/digester3/Digester153TestCase.java
index 7804b3f..84f7f4b 100644
--- a/src/test/java/org/apache/commons/digester3/Digester153TestCase.java
+++ b/src/test/java/org/apache/commons/digester3/Digester153TestCase.java
@@ -108,6 +108,7 @@
} );
}
+ */
@Test
public void basicConstructorViaAnnotations()
@@ -125,7 +126,7 @@
} );
}
- @Test
+ /* @Test
public void basicConstructorViaXML()
throws Exception
{
@@ -139,7 +140,7 @@
}
} );
- }
+ } */
private void succesfullConstructor( RulesModule rulesModule )
throws Exception
@@ -152,7 +153,7 @@
assertEquals( 9.99D, bean.getDoubleProperty(), 0 );
}
- @Test
+ /* @Test
public void basicConstructorWithValuesNotFound()
throws Exception
{
