Fixed issue testng-team#473. Order superclass methods before child ones.

enisher · Apr 25, 2014 · 11e787a · 11e787a
1 parent 9bad50d
commit 11e787a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/org/testng/internal/ClassHelper.java b/src/main/java/org/testng/internal/ClassHelper.java
@@ -10,6 +10,7 @@
 import org.testng.annotations.IAnnotation;
 import org.testng.annotations.IFactoryAnnotation;
 import org.testng.annotations.IParametersAnnotation;
+import org.testng.collections.Lists;
 import org.testng.internal.annotations.IAnnotationFinder;
 import org.testng.internal.annotations.Sets;
 import org.testng.junit.IJUnitTestRunner;
@@ -178,13 +179,13 @@ public static ConstructorOrMethod findDeclaredFactoryMethod(Class<?> cls,
    * @param clazz
    * @return
    */
-  public static Set<Method> getAvailableMethods(Class<?> clazz) {
-    Set<Method> methods = Sets.newHashSet();
+  public static List<Method> getAvailableMethods(Class<?> clazz) {
+    List<Method> methods = Lists.newArrayList();
     methods.addAll(Arrays.asList(clazz.getDeclaredMethods()));
 
     Class<?> parent = clazz.getSuperclass();
     while (Object.class != parent) {
-      methods.addAll(extractMethods(clazz, parent, methods));
+      methods.addAll(0, extractMethods(clazz, parent, methods));
       parent = parent.getSuperclass();
     }
 
@@ -220,7 +221,7 @@ public static IJUnitTestRunner createTestRunner(TestRunner runner) {
   }
 
   private static Set<Method> extractMethods(Class<?> childClass, Class<?> clazz,
-      Set<Method> collected) {
+      List<Method> collected) {
     Set<Method> methods = Sets.newHashSet();
 
     Method[] declaredMethods = clazz.getDeclaredMethods();
@@ -249,7 +250,7 @@ private static Set<Method> extractMethods(Class<?> childClass, Class<?> clazz,
     return methods;
   }
 
-  private static boolean isOverridden(Method method, Set<Method> collectedMethods) {
+  private static boolean isOverridden(Method method, List<Method> collectedMethods) {
     Class<?> methodClass = method.getDeclaringClass();
     Class<?>[] methodParams = method.getParameterTypes();
 

diff --git a/src/main/java/org/testng/internal/MethodHelper.java b/src/main/java/org/testng/internal/MethodHelper.java
@@ -346,7 +346,7 @@ protected static Iterator<Object[]> createArrayIterator(final Object[][] objects
   }
 
   protected static String calculateMethodCanonicalName(Class<?> methodClass, String methodName) {
-    Set<Method> methods = ClassHelper.getAvailableMethods(methodClass); // TESTNG-139
+    List<Method> methods = ClassHelper.getAvailableMethods(methodClass); // TESTNG-139
     Method result = null;
     for (Method m : methods) {
       if (methodName.equals(m.getName())) {

diff --git a/src/main/java/org/testng/internal/TestNGMethodFinder.java b/src/main/java/org/testng/internal/TestNGMethodFinder.java
@@ -102,7 +102,7 @@ public ITestNGMethod[] getAfterGroupsConfigurationMethods(Class clazz) {
   private ITestNGMethod[] findConfiguration(final Class clazz, final int configurationType) {
     List<ITestNGMethod> vResult = Lists.newArrayList();
 
-    Set<Method> methods = ClassHelper.getAvailableMethods(clazz);
+    List<Method> methods = ClassHelper.getAvailableMethods(clazz);
 
     for (Method m : methods) {
       IConfigurationAnnotation configuration = AnnotationHelper.findConfiguration(m_annotationFinder, m);