Skip to content

Commit 96b9027

Browse files
krmahadevankrmahadevan
committed
Minor discrepancy fixes
1 parent 092c97d commit 96b9027

File tree

19 files changed

+114
-184
lines changed

19 files changed

+114
-184
lines changed

‎testng-core-api/src/main/java/org/testng/internal/Utils.java‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -537,14 +537,7 @@ public static String replaceSpecialCharacters(String fileNameParameter) {
537537
}
538538

539539
public static <T> String join(List<T> objects, String separator) {
540-
StringBuilder result = new StringBuilder();
541-
for (int i = 0; i < objects.size(); i++) {
542-
if (i > 0) {
543-
result.append(separator);
544-
}
545-
result.append(objects.get(i).toString());
546-
}
547-
return result.toString();
540+
return objects.stream().map(Object::toString).collect(Collectors.joining(separator));
548541
}
549542

550543
/* Make sure that either we have an instance or if not, that the method is static */

‎testng-core-api/src/main/java/org/testng/xml/XmlInclude.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public class XmlInclude {
1414

1515
private String m_name;
16-
private Set<Integer> m_invocationNumbers;
16+
private final Set<Integer> m_invocationNumbers;
1717
private final int m_index;
1818
private String m_description;
1919
private final Map<String, String> m_parameters = Maps.newHashMap();
@@ -76,7 +76,7 @@ public String toXml(String indent) {
7676
Properties p = new Properties();
7777
p.setProperty("name", getName());
7878
List<Integer> invocationNumbers = getInvocationNumbers();
79-
if (invocationNumbers != null && invocationNumbers.size() > 0) {
79+
if (invocationNumbers != null && !invocationNumbers.isEmpty()) {
8080
p.setProperty("invocation-numbers", XmlClass.listToString(invocationNumbers));
8181
}
8282

@@ -108,8 +108,6 @@ public boolean equals(Object obj) {
108108
if (obj == null) return XmlSuite.f();
109109
if (getClass() != obj.getClass()) return XmlSuite.f();
110110
XmlInclude other = (XmlInclude) obj;
111-
// if (m_index != other.m_index)
112-
// return XmlSuite.f();
113111
if (m_invocationNumbers == null) {
114112
if (other.m_invocationNumbers != null) return XmlSuite.f();
115113
} else if (!m_invocationNumbers.equals(other.m_invocationNumbers)) return XmlSuite.f();

‎testng-core-api/src/main/java/org/testng/xml/XmlTest.java‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -223,23 +223,16 @@ public int getVerbose() {
223223
result = getSuite().getVerbose();
224224
}
225225

226-
if (null != result) {
227-
return result;
228-
} else {
229-
return 1;
230-
}
226+
return Optional.ofNullable(result).orElse(1);
231227
}
232228

233229
public boolean getGroupByInstances() {
234230
Boolean result = m_groupByInstances;
235231
if (result == null || XmlSuite.DEFAULT_GROUP_BY_INSTANCES.equals(m_groupByInstances)) {
236232
result = getSuite().getGroupByInstances();
237233
}
238-
if (result != null) {
239-
return result;
240-
} else {
241-
return XmlSuite.DEFAULT_GROUP_BY_INSTANCES;
242-
}
234+
235+
return Optional.ofNullable(result).orElse(XmlSuite.DEFAULT_GROUP_BY_INSTANCES);
243236
}
244237

245238
public void setGroupByInstances(boolean f) {
@@ -384,7 +377,7 @@ private void setTimeOut(String timeOut) {
384377

385378
public void setScript(XmlScript script) {
386379
List<XmlMethodSelector> selectors = getMethodSelectors();
387-
if (selectors.size() > 0) {
380+
if (!selectors.isEmpty()) {
388381
XmlMethodSelector xms = selectors.get(0);
389382
xms.setScript(script);
390383
} else if (script != null) {
@@ -425,8 +418,7 @@ public Object clone() {
425418
result.setParallel(getParallel());
426419
result.setThreadCount(getThreadCount());
427420
result.setVerbose(getVerbose());
428-
Map<String, String> localParameters = new HashMap<>();
429-
localParameters.putAll(getLocalParameters());
421+
Map<String, String> localParameters = Maps.newHashMap(getLocalParameters());
430422
result.setParameters(localParameters);
431423
result.setXmlPackages(getXmlPackages());
432424
result.setTimeOut(getTimeOut());
@@ -452,22 +444,15 @@ public List<Integer> getInvocationNumbers(String method) {
452444
for (XmlClass c : getXmlClasses()) {
453445
for (XmlInclude xi : c.getIncludedMethods()) {
454446
List<Integer> invocationNumbers = xi.getInvocationNumbers();
455-
if (invocationNumbers.size() > 0) {
447+
if (!invocationNumbers.isEmpty()) {
456448
String methodName = c.getName() + "." + xi.getName();
457449
m_failedInvocationNumbers.put(methodName, invocationNumbers);
458450
}
459451
}
460452
}
461453
}
462454

463-
List<Integer> result = m_failedInvocationNumbers.get(method);
464-
if (result == null) {
465-
// Don't use emptyList here since this list might end up receiving values if
466-
// the test run fails.
467-
return Lists.newArrayList();
468-
} else {
469-
return result;
470-
}
455+
return Optional.ofNullable(m_failedInvocationNumbers.get(method)).orElse(Lists.newArrayList());
471456
}
472457

473458
public void setPreserveOrder(Boolean preserveOrder) {

‎testng-core/src/main/java/org/testng/TestNG.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1600,7 +1600,7 @@ protected void configure(CommandLineArgs cla) {
16001600
addReporter(reporterConfig);
16011601
}
16021602

1603-
if (cla.commandLineMethods.size() > 0) {
1603+
if (!cla.commandLineMethods.isEmpty()) {
16041604
m_commandLineMethods = cla.commandLineMethods;
16051605
}
16061606

‎testng-core/src/main/java/org/testng/internal/ClassImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public Object[] getInstances(boolean create, String errorMsgPrefix) {
130130
};
131131
}
132132
}
133-
if (m_instances.size() > 0) {
133+
if (!m_instances.isEmpty()) {
134134
result = m_instances.toArray(new Object[0]);
135135
} else {
136136
Object defaultInstance = getDefaultInstance(create, errorMsgPrefix);

‎testng-core/src/main/java/org/testng/internal/Yaml.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.testng.internal;
22

3-
import java.io.File;
43
import java.io.FileInputStream;
54
import java.io.FileNotFoundException;
65
import java.io.InputStream;
@@ -54,7 +53,7 @@ public static XmlSuite parse(String filePath, InputStream is, boolean loadClasse
5453

5554
org.yaml.snakeyaml.Yaml y = new org.yaml.snakeyaml.Yaml(constructor);
5655
if (is == null) {
57-
is = new FileInputStream(new File(filePath));
56+
is = new FileInputStream(filePath);
5857
}
5958
XmlSuite result = y.load(is);
6059

@@ -180,11 +179,19 @@ private static void toYaml(StringBuilder result, XmlTest t) {
180179
result.append(sp2).append(sp2).append("xmlDependencyGroups:\n");
181180
t.getXmlDependencyGroups()
182181
.forEach(
183-
(k, v) -> result.append(sp2).append(sp2).append(sp2).append(k + ": " + v + "\n"));
182+
(k, v) ->
183+
result
184+
.append(sp2)
185+
.append(sp2)
186+
.append(sp2)
187+
.append(k)
188+
.append(": ")
189+
.append(v)
190+
.append("\n"));
184191
}
185192

186193
Map<String, List<String>> mg = t.getMetaGroups();
187-
if (mg.size() > 0) {
194+
if (!mg.isEmpty()) {
188195
result.append(sp2).append("metaGroups: { ");
189196
boolean first = true;
190197
for (Map.Entry<String, List<String>> entry : mg.entrySet()) {
@@ -279,7 +286,7 @@ private static void generateIncludeExclude(
279286
}
280287

281288
private static void mapToYaml(Map<String, String> map, StringBuilder out) {
282-
if (map.size() > 0) {
289+
if (!map.isEmpty()) {
283290
out.append("{ ");
284291
boolean first = true;
285292
for (Map.Entry<String, String> e : map.entrySet()) {

‎testng-core/src/main/java/org/testng/internal/invokers/TestMethodWorker.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ public int compareTo(@Nonnull IWorker<ITestNGMethod> other) {
274274
/** The priority of a worker is the priority of the first method it's going to run. */
275275
@Override
276276
public int getPriority() {
277-
return m_methodInstances.size() > 0 ? m_methodInstances.get(0).getMethod().getPriority() : 0;
277+
return !m_methodInstances.isEmpty() ? m_methodInstances.get(0).getMethod().getPriority() : 0;
278278
}
279279

280280
@Override

‎testng-core/src/main/java/org/testng/reporters/FailedReporter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ protected void generateFailureSuite(XmlSuite xmlSuite, ISuite suite, String outp
7676
testContext.getSkippedTests().getAllResults());
7777
}
7878

79-
if (null != failedSuite.getTests() && failedSuite.getTests().size() > 0) {
79+
if (null != failedSuite.getTests() && !failedSuite.getTests().isEmpty()) {
8080
if (xmlSuite.getParentSuite() != null
8181
&& !xmlSuite.getParentSuite().getLocalListeners().isEmpty()) {
8282
List<String> merged =
@@ -95,7 +95,7 @@ private void generateXmlTest(
9595
Set<ITestResult> skippedTests) {
9696
// Note: we can have skipped tests and no failed tests
9797
// if a method depends on nonexistent groups
98-
if (skippedTests.size() > 0 || failedTests.size() > 0) {
98+
if (!skippedTests.isEmpty() || !failedTests.isEmpty()) {
9999
Set<ITestNGMethod> methodsToReRun = Sets.newHashSet();
100100

101101
// Get the transitive closure of all the failed methods and the methods

‎testng-core/src/main/java/org/testng/reporters/JUnitXMLReporter.java‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,9 @@ public class JUnitXMLReporter implements IResultListener2 {
4242
private int m_numFailed = 0;
4343
private Queue<ITestResult> m_allTests = new ConcurrentLinkedDeque<>();
4444
private Queue<ITestResult> m_configIssues = new ConcurrentLinkedDeque<>();
45-
private Map<String, String> m_fileNameMap = Maps.newHashMap();
45+
private final Map<String, String> m_fileNameMap = Maps.newHashMap();
4646
private int m_fileNameIncrementer = 0;
4747

48-
@Override
49-
public void onTestStart(ITestResult result) {}
50-
51-
@Override
52-
public void beforeConfiguration(ITestResult tr) {}
53-
5448
/** Invoked each time a test succeeds. */
5549
@Override
5650
public void onTestSuccess(ITestResult tr) {
@@ -123,7 +117,7 @@ protected void generateReport(ITestContext context) {
123117
// ignore
124118
}
125119
Set<String> packages = getPackages(context);
126-
if (packages.size() > 0) {
120+
if (!packages.isEmpty()) {
127121
attrs.setProperty(XMLConstants.ATTR_NAME, context.getCurrentXmlTest().getName());
128122
// attrs.setProperty(XMLConstants.ATTR_PACKAGE, packages.iterator().next());
129123
}
@@ -219,7 +213,7 @@ private void createFailureElement(XMLStringBuffer doc, ITestResult tr) {
219213
if (t != null) {
220214
attrs.setProperty(XMLConstants.ATTR_TYPE, t.getClass().getName());
221215
String message = t.getMessage();
222-
if ((message != null) && (message.length() > 0)) {
216+
if ((message != null) && (!message.isEmpty())) {
223217
attrs.setProperty(XMLConstants.ATTR_MESSAGE, encodeAttr(message)); // ENCODE
224218
}
225219
doc.push(XMLConstants.FAILURE, attrs);
@@ -235,24 +229,24 @@ private void createSkipElement(XMLStringBuffer doc) {
235229
}
236230

237231
private String encodeAttr(String attr) {
238-
String result = replaceAmpersand(attr, ENTITY);
232+
String result = replaceAmpersand(attr);
239233
for (Map.Entry<String, Pattern> e : ATTR_ESCAPES.entrySet()) {
240234
result = e.getValue().matcher(result).replaceAll(e.getKey());
241235
}
242236

243237
return result;
244238
}
245239

246-
private String replaceAmpersand(String str, Pattern pattern) {
240+
private String replaceAmpersand(String str) {
247241
int start = 0;
248242
int idx = str.indexOf('&', start);
249243
if (idx == -1) {
250244
return str;
251245
}
252246
StringBuilder result = new StringBuilder();
253247
while (idx != -1) {
254-
result.append(str.substring(start, idx));
255-
if (pattern.matcher(str.substring(idx)).matches()) {
248+
result.append(str, start, idx);
249+
if (JUnitXMLReporter.ENTITY.matcher(str.substring(idx)).matches()) {
256250
// do nothing it is an entity;
257251
result.append("&");
258252
} else {

‎testng-core/src/main/java/org/testng/reporters/SuiteHTMLReporter.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void generateReport(
6464
// Generate the various reports
6565
//
6666
XmlSuite xmlSuite = suite.getXmlSuite();
67-
if (xmlSuite.getTests().size() == 0) {
67+
if (xmlSuite.getTests().isEmpty()) {
6868
continue;
6969
}
7070
generateTableOfContents(xmlSuite, suite);
@@ -133,7 +133,7 @@ private void generateIndex(List<ISuite> suites) {
133133

134134
StringBuilder suiteBuf = new StringBuilder();
135135
for (ISuite suite : suites) {
136-
if (suite.getResults().size() == 0) {
136+
if (suite.getResults().isEmpty()) {
137137
continue;
138138
}
139139

@@ -493,7 +493,7 @@ private void generateMethodsAndGroups(XmlSuite xmlSuite, ISuite suite) {
493493
Map<String, Collection<ITestNGMethod>> groups = suite.getMethodsByGroups();
494494

495495
sb.append("<h2>Groups used for this test run</h2>");
496-
if (groups.size() > 0) {
496+
if (!groups.isEmpty()) {
497497
sb.append("<table border=\"1\">\n")
498498
.append("<tr> <td align=\"center\"><b>Group name</b></td>")
499499
.append("<td align=\"center\"><b>Methods</b></td></tr>");
@@ -607,7 +607,7 @@ private void generateTableOfContents(XmlSuite xmlSuite, ISuite suite) {
607607
.append("chronological</a><br/>\n")
608608
.append("&nbsp;&nbsp;<a target='mainFrame' href='")
609609
.append(METHODS_ALPHABETICAL)
610-
.append("\'>")
610+
.append("'>")
611611
.append("alphabetical</a><br/>\n")
612612
.append("&nbsp;&nbsp;<a target='mainFrame' href='")
613613
.append(METHODS_NOT_RUN)
@@ -689,7 +689,7 @@ private String getOutputDirectory(XmlSuite xmlSuite) {
689689
File fileResult =
690690
new File(m_outputDirectory + File.separatorChar + xmlSuite.getName()).getAbsoluteFile();
691691
if (!fileResult.exists()) {
692-
fileResult.mkdirs();
692+
boolean ignored = fileResult.mkdirs();
693693
if (!fileResult.exists()) {
694694
Utils.log(
695695
"Reports", 2, "Problem creating output directory " + fileResult.getAbsolutePath());

0 commit comments

Comments
 (0)