Refactorings.

testng-team · Aug 3, 2011 · 10a202a · 10a202a
1 parent c31cd07
commit 10a202a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/org/testng/TestRunner.java b/src/main/java/org/testng/TestRunner.java
@@ -771,7 +771,7 @@ private void privateRun(XmlTest xmlTest) {
       // Make sure we create a graph based on the intercepted methods, otherwise an interceptor
       // removing methods would cause the graph never to terminate (because it would expect
       // termination from methods that never get invoked).
-      DynamicGraph<ITestNGMethod> graph = computeAlternateTestList(intercept(m_allTestMethods));
+      DynamicGraph<ITestNGMethod> graph = createDynamicGraph(intercept(m_allTestMethods));
       if (graph.getNodeCount() > 0) {
         GraphThreadPoolExecutor<ITestNGMethod> executor =
             new GraphThreadPoolExecutor<ITestNGMethod>(graph, this,
@@ -1271,7 +1271,7 @@ private boolean containsString(Map<String, String> regexps, String group) {
     return false;
   }
 
-  private DynamicGraph<ITestNGMethod> computeAlternateTestList(ITestNGMethod[] methods) {
+  private DynamicGraph<ITestNGMethod> createDynamicGraph(ITestNGMethod[] methods) {
     DynamicGraph<ITestNGMethod> result = new DynamicGraph<ITestNGMethod>();
     Map<String, ITestNGMethod> map = Maps.newHashMap();
     ListMultiMap<String, ITestNGMethod> groups = Maps.newListMultiMap();

diff --git a/src/main/java/org/testng/internal/BaseTestMethod.java b/src/main/java/org/testng/internal/BaseTestMethod.java
@@ -501,7 +501,7 @@ protected String getSignature() {
       result.append(p.getName());
     }
     result.append(")");
-    result.append("[" + getPriority() + ", " + m_instance + "]");
+    result.append("[pri:" + getPriority() + ", instance:" + m_instance + "]");
 
     return result.toString();
   }

diff --git a/src/main/java/org/testng/internal/Invoker.java b/src/main/java/org/testng/internal/Invoker.java
@@ -1673,16 +1673,16 @@ private boolean haveBeenRunSuccessfully(ITestNGMethod testMethod, ITestNGMethod[
     return true;
   }
 
-  private boolean containsInstance(Set<ITestResult> failedresults, Object[] instances) {
-    for (ITestResult tr : failedresults) {
-      for (Object o : instances) {
-        if (o == tr.getInstance()) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
+//  private boolean containsInstance(Set<ITestResult> failedresults, Object[] instances) {
+//    for (ITestResult tr : failedresults) {
+//      for (Object o : instances) {
+//        if (o == tr.getInstance()) {
+//          return true;
+//        }
+//      }
+//    }
+//    return false;
+//  }
 
   /**
    * An exception was thrown by the test, determine if this method