Skip to content

Commit 10a202a

Browse files
committed
Refactorings.
1 parent c31cd07 commit 10a202a

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

src/main/java/org/testng/TestRunner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ private void privateRun(XmlTest xmlTest) {
771771
// Make sure we create a graph based on the intercepted methods, otherwise an interceptor
772772
// removing methods would cause the graph never to terminate (because it would expect
773773
// termination from methods that never get invoked).
774-
DynamicGraph<ITestNGMethod> graph = computeAlternateTestList(intercept(m_allTestMethods));
774+
DynamicGraph<ITestNGMethod> graph = createDynamicGraph(intercept(m_allTestMethods));
775775
if (graph.getNodeCount() > 0) {
776776
GraphThreadPoolExecutor<ITestNGMethod> executor =
777777
new GraphThreadPoolExecutor<ITestNGMethod>(graph, this,
@@ -1271,7 +1271,7 @@ private boolean containsString(Map<String, String> regexps, String group) {
12711271
return false;
12721272
}
12731273

1274-
private DynamicGraph<ITestNGMethod> computeAlternateTestList(ITestNGMethod[] methods) {
1274+
private DynamicGraph<ITestNGMethod> createDynamicGraph(ITestNGMethod[] methods) {
12751275
DynamicGraph<ITestNGMethod> result = new DynamicGraph<ITestNGMethod>();
12761276
Map<String, ITestNGMethod> map = Maps.newHashMap();
12771277
ListMultiMap<String, ITestNGMethod> groups = Maps.newListMultiMap();

src/main/java/org/testng/internal/BaseTestMethod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ protected String getSignature() {
501501
result.append(p.getName());
502502
}
503503
result.append(")");
504-
result.append("[" + getPriority() + ", " + m_instance + "]");
504+
result.append("[pri:" + getPriority() + ", instance:" + m_instance + "]");
505505

506506
return result.toString();
507507
}

src/main/java/org/testng/internal/Invoker.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1673,16 +1673,16 @@ private boolean haveBeenRunSuccessfully(ITestNGMethod testMethod, ITestNGMethod[
16731673
return true;
16741674
}
16751675

1676-
private boolean containsInstance(Set<ITestResult> failedresults, Object[] instances) {
1677-
for (ITestResult tr : failedresults) {
1678-
for (Object o : instances) {
1679-
if (o == tr.getInstance()) {
1680-
return true;
1681-
}
1682-
}
1683-
}
1684-
return false;
1685-
}
1676+
// private boolean containsInstance(Set<ITestResult> failedresults, Object[] instances) {
1677+
// for (ITestResult tr : failedresults) {
1678+
// for (Object o : instances) {
1679+
// if (o == tr.getInstance()) {
1680+
// return true;
1681+
// }
1682+
// }
1683+
// }
1684+
// return false;
1685+
// }
16861686

16871687
/**
16881688
* An exception was thrown by the test, determine if this method

0 commit comments

Comments
 (0)