fix bug in QDox reader so that it now recoqnises vararg signatures.

scarytom · scarytom · commit 9ecdf0bc186d · 2012-05-20T12:46:43.000+01:00
diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
@@ -80,14 +80,16 @@ private JavaMethod findMethodInSource(FactoryMethod factoryMethod) {
         // This seems to cover most cases though.
         List<FactoryMethod.Parameter> params = factoryMethod.getParameters();
         Type[] types = new Type[params.size()];
+        boolean varArgs = false;
         for (int i = 0; i < types.length; i++) {
-            // QDox ignores varargs and generics, so we strip them out to help QDox.
             String type = params.get(i).getType();
+            varArgs = VARARGS_REGEX.matcher(type).find();
+            // QDox ignores varargs and generics, so we strip them out to help QDox.
             type = GENERIC_REGEX.matcher(type).replaceAll("");
             type = VARARGS_REGEX.matcher(type).replaceAll("");
             types[i] = new Type(type);
         }
-        JavaMethod[] methods = classSource.getMethodsBySignature(factoryMethod.getName(), types, false);
+        JavaMethod[] methods = classSource.getMethodsBySignature(factoryMethod.getName(), types, false, varArgs);
         return methods.length == 1 ?  methods[0] : null;
     }
 
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/generator/QDoxFactoryReaderTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/generator/QDoxFactoryReaderTest.java
@@ -23,6 +23,36 @@ public void testExtractsOriginalParameterNamesFromSource() {
         assertEquals("java.lang.String", factoryMethod.getParameters().get(0).getType());
         assertEquals("realParamName", factoryMethod.getParameters().get(0).getName());
     }
+    
+    public void testExtractsOriginalGenericParameterNamesFromSource() {
+        FactoryMethod method = new FactoryMethod("org.SomeClass", "someMethod", "unusedReturnType");
+        method.addParameter("java.util.Collection<java.lang.String>", "badParamName");
+
+        String input = "" +
+                "package org;\n" +
+                "class SomeClass {\n" +
+                "  Matcher someMethod(java.util.Collection<String> realParamName) { ... } \n" +
+                "}\n";
+        FactoryMethod factoryMethod = wrapUsingQDoxedSource(method, "org.SomeClass", input);
+
+        assertEquals("java.util.Collection<java.lang.String>", factoryMethod.getParameters().get(0).getType());
+        assertEquals("realParamName", factoryMethod.getParameters().get(0).getName());
+    }
+    
+    public void testExtractsOriginalVarArgParameterNamesFromSource() {
+        FactoryMethod method = new FactoryMethod("org.SomeClass", "someMethod", "unusedReturnType");
+        method.addParameter("java.lang.String...", "badParamName");
+
+        String input = "" +
+                "package org;\n" +
+                "class SomeClass {\n" +
+                "  Matcher someMethod(java.lang.String... realParamName) { ... } \n" +
+                "}\n";
+        FactoryMethod factoryMethod = wrapUsingQDoxedSource(method, "org.SomeClass", input);
+
+        assertEquals("java.lang.String...", factoryMethod.getParameters().get(0).getType());
+        assertEquals("realParamName", factoryMethod.getParameters().get(0).getName());
+    }
 
     public void testExtractsOriginalJavaDocFromSource() {
         FactoryMethod method = new FactoryMethod("org.SomeClass", "someMethod", "unusedReturnType");
