diff options
author | Cedric Beust <cedric@beust.com> | 2015-11-29 23:06:17 -0800 |
---|---|---|
committer | Cedric Beust <cedric@beust.com> | 2015-11-29 23:06:17 -0800 |
commit | 46017205fd97839302fdee7f67265132cdb7ed1b (patch) | |
tree | 6126cbef36f57540c840cbffc15b3b404b6c634a /src/main/java | |
parent | a3322457c09dddfe070221e72dd279071ab0adbe (diff) | |
parent | 6528aa29713294f6126ebec9ee41ba81bf991517 (diff) | |
download | testng-46017205fd97839302fdee7f67265132cdb7ed1b.tar.gz |
Merge pull request #882 from testn/code-cleanup
Code cleanup
Diffstat (limited to 'src/main/java')
25 files changed, 115 insertions, 191 deletions
diff --git a/src/main/java/org/testng/Converter.java b/src/main/java/org/testng/Converter.java index 294de1aa..b009b549 100644 --- a/src/main/java/org/testng/Converter.java +++ b/src/main/java/org/testng/Converter.java @@ -90,9 +90,9 @@ public class Converter { } private void writeFile(File newFile, String content) throws IOException { - FileWriter bw = new FileWriter(newFile); - bw.write(content); - bw.close(); + try (FileWriter bw = new FileWriter(newFile)) { + bw.write(content); + } System.out.println("Wrote " + newFile); } } diff --git a/src/main/java/org/testng/DependencyMap.java b/src/main/java/org/testng/DependencyMap.java index ae4f9ed9..ee3896fc 100644 --- a/src/main/java/org/testng/DependencyMap.java +++ b/src/main/java/org/testng/DependencyMap.java @@ -54,14 +54,16 @@ public class DependencyMap { if (l == null && fromMethod.ignoreMissingDependencies()){ return fromMethod; } - for (ITestNGMethod m : l) { - // If they are in the same class hierarchy, they must belong to the same instance, - // otherwise, it's a method depending on a method in a different class so we - // don't bother checking the instance - if (fromMethod.getRealClass().isAssignableFrom(m.getRealClass())) { - if (m.getInstance() == fromMethod.getInstance()) return m; - } else { - return m; + if (l != null) { + for (ITestNGMethod m : l) { + // If they are in the same class hierarchy, they must belong to the same instance, + // otherwise, it's a method depending on a method in a different class so we + // don't bother checking the instance + if (fromMethod.getRealClass().isAssignableFrom(m.getRealClass())) { + if (m.getInstance() == fromMethod.getInstance()) return m; + } else { + return m; + } } } throw new TestNGException("Method \"" + fromMethod diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java index d40c9803..1925690a 100644 --- a/src/main/java/org/testng/TestNG.java +++ b/src/main/java/org/testng/TestNG.java @@ -351,31 +351,31 @@ public class TestNG { Utils.log("TestNG", 2, "Trying to open jar file:" + jarFile); - JarFile jf = new JarFile(jarFile); -// System.out.println(" result: " + jf); - Enumeration<JarEntry> entries = jf.entries(); - List<String> classes = Lists.newArrayList(); boolean foundTestngXml = false; - while (entries.hasMoreElements()) { - JarEntry je = entries.nextElement(); - if (je.getName().equals(m_xmlPathInJar)) { - Parser parser = getParser(jf.getInputStream(je)); - Collection<XmlSuite> suites = parser.parse(); - for (XmlSuite suite : suites) { - // If test names were specified, only run these test names - if (m_testNames != null) { - m_suites.add(extractTestNames(suite, m_testNames)); - } else { - m_suites.add(suite); + List<String> classes = Lists.newArrayList(); + try (JarFile jf = new JarFile(jarFile)) { +// System.out.println(" result: " + jf); + Enumeration<JarEntry> entries = jf.entries(); + while (entries.hasMoreElements()) { + JarEntry je = entries.nextElement(); + if (je.getName().equals(m_xmlPathInJar)) { + Parser parser = getParser(jf.getInputStream(je)); + Collection<XmlSuite> suites = parser.parse(); + for (XmlSuite suite : suites) { + // If test names were specified, only run these test names + if (m_testNames != null) { + m_suites.add(extractTestNames(suite, m_testNames)); + } else { + m_suites.add(suite); + } } - } - foundTestngXml = true; - break; - } - else if (je.getName().endsWith(".class")) { - int n = je.getName().length() - ".class".length(); - classes.add(je.getName().replace("/", ".").substring(0, n)); + foundTestngXml = true; + break; + } else if (je.getName().endsWith(".class")) { + int n = je.getName().length() - ".class".length(); + classes.add(je.getName().replace("/", ".").substring(0, n)); + } } } if (! foundTestngXml) { @@ -882,9 +882,7 @@ public class TestNG { } } private void addReporter(Class<? extends IReporter> r) { - if (! m_reporters.contains(r)) { - m_reporters.add(ClassHelper.newInstance(r)); - } + m_reporters.add(ClassHelper.newInstance(r)); } private void initializeDefaultListeners() { @@ -1484,7 +1482,7 @@ public class TestNG { String[] sel = Utils.split(cls, ":"); try { if (sel.length == 2) { - addMethodSelector(sel[0], Integer.valueOf(sel[1])); + addMethodSelector(sel[0], Integer.parseInt(sel[1])); } else { error("Method selector value was not in the format org.example.Selector:4"); } diff --git a/src/main/java/org/testng/TestRunner.java b/src/main/java/org/testng/TestRunner.java index 5dddfd0c..22eb9272 100644 --- a/src/main/java/org/testng/TestRunner.java +++ b/src/main/java/org/testng/TestRunner.java @@ -46,7 +46,6 @@ import org.testng.internal.XmlMethodSelector; import org.testng.internal.annotations.AnnotationHelper; import org.testng.internal.annotations.IAnnotationFinder; import org.testng.internal.annotations.IListeners; -import org.testng.internal.thread.ThreadUtil; import org.testng.internal.thread.graph.GraphThreadPoolExecutor; import org.testng.internal.thread.graph.IThreadWorkerFactory; import org.testng.internal.thread.graph.IWorker; @@ -252,7 +251,7 @@ public class TestRunner addConfigurationListener(m_confListener); } - private class ListenerHolder { + private static class ListenerHolder { private List<Class<? extends ITestNGListener>> listenerClasses; private Class<? extends ITestNGListenerFactory> listenerFactoryClass; } @@ -674,7 +673,7 @@ public class TestRunner // so it can be eager => failure workers.add(new IWorker<ITestNGMethod>() { /** - * @see org.testng.internal.IMethodWorker#getMaxTimeOut() + * @see TestMethodWorker#getTimeOut() */ @Override public long getTimeOut() { @@ -726,7 +725,7 @@ public class TestRunner } }); - runWorkers(workers, "" /* JUnit does not support parallel */, null); + runJUnitWorkers(workers); m_allTestMethods= runMethods.toArray(new ITestNGMethod[runMethods.size()]); } @@ -997,34 +996,13 @@ public class TestRunner private static final EnumSet<XmlSuite.ParallelMode> WORKERS_PARALLEL_MODES = EnumSet.of(XmlSuite.ParallelMode.METHODS, XmlSuite.ParallelMode.TRUE, XmlSuite.ParallelMode.CLASSES); - private void runWorkers(List<? extends IWorker<ITestNGMethod>> workers, String parallelMode, - ListMultiMap<Integer, TestMethodWorker> sequentialWorkers) { - if (WORKERS_PARALLEL_MODES.contains(parallelMode)) - { - // - // Parallel run - // - // Default timeout for individual methods: same as the test global-time-out, but - // overridden if a method defines its own. - long maxTimeOut = m_xmlTest.getTimeOut(XmlTest.DEFAULT_TIMEOUT_MS); - for (IWorker<ITestNGMethod> tmw : workers) { - long mt = tmw.getTimeOut(); - if (mt > maxTimeOut) { - maxTimeOut= mt; - } - } - - ThreadUtil.execute(workers, m_xmlTest.getThreadCount(), maxTimeOut, false); -// ThreadUtil.execute(sequentialWorkers); - } - else { + private void runJUnitWorkers(List<? extends IWorker<ITestNGMethod>> workers) { // // Sequential run // for (IWorker<ITestNGMethod> tmw : workers) { tmw.run(); } - } } private void afterRun() { diff --git a/src/main/java/org/testng/internal/ClassHelper.java b/src/main/java/org/testng/internal/ClassHelper.java index a348da34..cf4aa74a 100644 --- a/src/main/java/org/testng/internal/ClassHelper.java +++ b/src/main/java/org/testng/internal/ClassHelper.java @@ -552,13 +552,12 @@ public final class ClassHelper { // if (-1 != m_lastGoodRootIndex) { - // TODO use a SringBuffer here - String className = segments[m_lastGoodRootIndex]; + StringBuilder className = new StringBuilder(segments[m_lastGoodRootIndex]); for (int i = m_lastGoodRootIndex + 1; i < segments.length; i++) { - className += "." + segments[i]; + className.append(".").append(segments[i]); } - result = ClassHelper.forName(className); + result = ClassHelper.forName(className.toString()); if (null != result) { return result; diff --git a/src/main/java/org/testng/internal/MethodHelper.java b/src/main/java/org/testng/internal/MethodHelper.java index b7545e81..88666a8b 100644 --- a/src/main/java/org/testng/internal/MethodHelper.java +++ b/src/main/java/org/testng/internal/MethodHelper.java @@ -5,6 +5,7 @@ import java.util.Collection; import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.NoSuchElementException;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
@@ -351,6 +352,9 @@ class ArrayIterator implements Iterator<Object[]> { @Override
public Object[] next() {
+ if (m_count >= m_objects.length) {
+ throw new NoSuchElementException();
+ }
return m_objects[m_count++];
}
diff --git a/src/main/java/org/testng/internal/ResultMap.java b/src/main/java/org/testng/internal/ResultMap.java index f9931e6e..ae37ee4c 100755 --- a/src/main/java/org/testng/internal/ResultMap.java +++ b/src/main/java/org/testng/internal/ResultMap.java @@ -28,9 +28,9 @@ public class ResultMap implements IResultMap { public Set<ITestResult> getResults(ITestNGMethod method) { Set<ITestResult> result = new HashSet<>(); - for (ITestResult tr : m_map.keySet()) { - if (m_map.get(tr).equals(method)) { - result.add(tr); + for (Map.Entry<ITestResult, ITestNGMethod> entry : m_map.entrySet()) { + if (entry.getValue().equals(method)) { + result.add(entry.getKey()); } } diff --git a/src/main/java/org/testng/internal/Tarjan.java b/src/main/java/org/testng/internal/Tarjan.java index 2fcff633..07ba35da 100755 --- a/src/main/java/org/testng/internal/Tarjan.java +++ b/src/main/java/org/testng/internal/Tarjan.java @@ -5,6 +5,7 @@ import org.testng.collections.Maps; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Stack; /** @@ -40,7 +41,7 @@ public class Tarjan<T> { } } - if (m_lowlinks.get(v) == m_indices.get(v)) { + if (Objects.equals(m_lowlinks.get(v), m_indices.get(v))) { m_cycle = Lists.newArrayList(); T n; do { @@ -77,4 +78,4 @@ public class Tarjan<T> { return m_cycle; } -}
\ No newline at end of file +} diff --git a/src/main/java/org/testng/internal/TestNGClassFinder.java b/src/main/java/org/testng/internal/TestNGClassFinder.java index 8920c7dd..f9a0b5c3 100644 --- a/src/main/java/org/testng/internal/TestNGClassFinder.java +++ b/src/main/java/org/testng/internal/TestNGClassFinder.java @@ -205,10 +205,10 @@ public class TestNGClassFinder extends BaseClassFinder { // // Add all the instances we found to their respective IClasses // - for(Class c : m_instanceMap.keySet()) { - List<Object> instances= m_instanceMap.get(c); - for(Object instance : instances) { - IClass ic= getIClass(c); + for(Map.Entry<Class, List<Object>> entry : m_instanceMap.entrySet()) { + Class clazz = entry.getKey(); + for(Object instance : entry.getValue()) { + IClass ic= getIClass(clazz); if(null != ic) { ic.addInstance(instance); } diff --git a/src/main/java/org/testng/internal/Utils.java b/src/main/java/org/testng/internal/Utils.java index b98163c8..c65acba3 100644 --- a/src/main/java/org/testng/internal/Utils.java +++ b/src/main/java/org/testng/internal/Utils.java @@ -748,23 +748,13 @@ public final class Utils { } public static void copyFile(File from, File to) { - try{ - InputStream in = new FileInputStream(from); - - //For Append the file. -// OutputStream out = new FileOutputStream(f2,true); - - //For Overwrite the file. - to.getParentFile().mkdirs(); - OutputStream out = new FileOutputStream(to); - + to.getParentFile().mkdirs(); + try (InputStream in = new FileInputStream(from); OutputStream out = new FileOutputStream(to)) { byte[] buf = new byte[1024]; int len; - while ((len = in.read(buf)) > 0){ + while ((len = in.read(buf)) > 0) { out.write(buf, 0, len); } - in.close(); - out.close(); } catch(IOException e){ e.printStackTrace(); } diff --git a/src/main/java/org/testng/internal/Yaml.java b/src/main/java/org/testng/internal/Yaml.java index 331e83b5..11ecd257 100644 --- a/src/main/java/org/testng/internal/Yaml.java +++ b/src/main/java/org/testng/internal/Yaml.java @@ -151,10 +151,10 @@ public class Yaml { if (mg.size() > 0) { result.append(sp2).append("metaGroups: { "); boolean first = true; - for (String group : mg.keySet()) { + for (Map.Entry<String, List<String>> entry : mg.entrySet()) { if (! first) result.append(", "); - result.append(group).append(": [ ") - .append(Utils.join(mg.get(group), ",")).append(" ] "); + result.append(entry.getKey()).append(": [ ") + .append(Utils.join(entry.getValue(), ",")).append(" ] "); first = false; } result.append(" }\n"); diff --git a/src/main/java/org/testng/internal/annotations/AnnotationHelper.java b/src/main/java/org/testng/internal/annotations/AnnotationHelper.java index 182e5280..f08490b6 100755 --- a/src/main/java/org/testng/internal/annotations/AnnotationHelper.java +++ b/src/main/java/org/testng/internal/annotations/AnnotationHelper.java @@ -164,7 +164,7 @@ public class AnnotationHelper { result.setTimeOut(bs.getTimeOut()); } - private static Class[] ALL_ANNOTATIONS = new Class[] { + private static final Class[] ALL_ANNOTATIONS = new Class[] { ITestAnnotation.class, IConfigurationAnnotation.class, IBeforeClass.class, IAfterClass.class, IBeforeMethod.class, IAfterMethod.class, @@ -175,7 +175,7 @@ public class AnnotationHelper { IBeforeGroups.class, IAfterGroups.class }; - public static Class[] CONFIGURATION_CLASSES = new Class[] { + public static final Class[] CONFIGURATION_CLASSES = new Class[] { IConfigurationAnnotation.class, IBeforeSuite.class, IAfterSuite.class, IBeforeTest.class, IAfterTest.class, diff --git a/src/main/java/org/testng/internal/annotations/Converter.java b/src/main/java/org/testng/internal/annotations/Converter.java index ee98c158..206bd6b7 100755 --- a/src/main/java/org/testng/internal/annotations/Converter.java +++ b/src/main/java/org/testng/internal/annotations/Converter.java @@ -26,7 +26,7 @@ public class Converter { public static int getInt(String tagValue, int def) { int result = def; if (tagValue != null) { - result = new Integer(tagValue); + result = Integer.parseInt(tagValue); } return result; } @@ -42,7 +42,7 @@ public class Converter { public static long getLong(String tagValue, long def) { long result = def; if (tagValue != null) { - result = new Long(tagValue); + result = Long.parseLong(tagValue); } return result; } diff --git a/src/main/java/org/testng/remote/strprotocol/BaseMessageSender.java b/src/main/java/org/testng/remote/strprotocol/BaseMessageSender.java index d1bbea3b..2a86bfff 100644 --- a/src/main/java/org/testng/remote/strprotocol/BaseMessageSender.java +++ b/src/main/java/org/testng/remote/strprotocol/BaseMessageSender.java @@ -24,7 +24,7 @@ abstract public class BaseMessageSender implements IMessageSender { protected Socket m_clientSocket; private String m_host; private int m_port; - protected Object m_ackLock = new Object(); + protected final Object m_ackLock = new Object(); private boolean m_requestStopReceiver; /** Outgoing message stream. */ diff --git a/src/main/java/org/testng/remote/strprotocol/GenericMessage.java b/src/main/java/org/testng/remote/strprotocol/GenericMessage.java index 8c23ea03..db30e6c3 100755 --- a/src/main/java/org/testng/remote/strprotocol/GenericMessage.java +++ b/src/main/java/org/testng/remote/strprotocol/GenericMessage.java @@ -37,25 +37,6 @@ public class GenericMessage implements IStringMessage { m_testCount = testCount; } -// public GenericMessage(final int type, Map props) { -// m_messageType = type; -// m_properties = props; -// } - -// public GenericMessage addProperty(final String propName, final Object propValue) { -// m_properties.put(propName, propValue); -// -// return this; -// } - - public GenericMessage addProperty(final String propName, final int propValue) { - return addProperty(propName, propValue); - } - -// public String getProperty(final String propName) { -// return (String) m_properties.get(propName); -// } - @Override public String getMessageAsString() { StringBuffer buf = new StringBuffer(); @@ -64,17 +45,6 @@ public class GenericMessage implements IStringMessage { buf.append(MessageHelper.DELIMITER).append("testCount").append(getTestCount()) .append(MessageHelper.DELIMITER).append("suiteCount").append(getSuiteCount()); -// for(Iterator it = m_properties.entrySet().iterator(); it.hasNext(); ) { -// Map.Entry entry = (Map.Entry) it.next(); -// -// buf.append(MessageHelper.DELIMITER) -// .append(entry.getKey()) -// .append(MessageHelper.DELIMITER) -// .append(entry.getValue()) -// ; -// } - - return buf.toString(); } diff --git a/src/main/java/org/testng/reporters/EmailableReporter.java b/src/main/java/org/testng/reporters/EmailableReporter.java index 308bee7f..890bf8cb 100755 --- a/src/main/java/org/testng/reporters/EmailableReporter.java +++ b/src/main/java/org/testng/reporters/EmailableReporter.java @@ -488,7 +488,7 @@ public class EmailableReporter implements IReporter { // ~ Inner Classes -------------------------------------------------------- /** Arranges methods by classname and method name */ - private class TestSorter implements Comparator<IInvokedMethod> { + private static final class TestSorter implements Comparator<IInvokedMethod> { // ~ Methods ------------------------------------------------------------- /** Arranges methods by classname and method name */ diff --git a/src/main/java/org/testng/reporters/FileStringBuffer.java b/src/main/java/org/testng/reporters/FileStringBuffer.java index af2e98b1..6c980ca8 100644 --- a/src/main/java/org/testng/reporters/FileStringBuffer.java +++ b/src/main/java/org/testng/reporters/FileStringBuffer.java @@ -116,12 +116,9 @@ public class FileStringBuffer implements IBuffer { } } - FileWriter fw; - try { - p("Size " + m_sb.length() + ", flushing to " + m_file); - fw = new FileWriter(m_file, true /* append */); + p("Size " + m_sb.length() + ", flushing to " + m_file); + try (FileWriter fw = new FileWriter(m_file, true /* append */)) { fw.append(m_sb); - fw.close(); } catch (IOException e) { e.printStackTrace(); } @@ -152,9 +149,9 @@ public class FileStringBuffer implements IBuffer { private static void save(File expected, String s) throws IOException { expected.delete(); - FileWriter expectedWriter = new FileWriter(expected); - expectedWriter.append(s); - expectedWriter.close(); + try (FileWriter expectedWriter = new FileWriter(expected)) { + expectedWriter.append(s); + } } public static void main(String[] args) throws IOException { diff --git a/src/main/java/org/testng/reporters/JUnitReportReporter.java b/src/main/java/org/testng/reporters/JUnitReportReporter.java index 95c3b198..6fb4d9c4 100644 --- a/src/main/java/org/testng/reporters/JUnitReportReporter.java +++ b/src/main/java/org/testng/reporters/JUnitReportReporter.java @@ -244,7 +244,7 @@ public class JUnitReportReporter implements IReporter { return result; } - class TestTag { + static class TestTag { public Properties properties; public String message; public String type; diff --git a/src/main/java/org/testng/reporters/XMLReporter.java b/src/main/java/org/testng/reporters/XMLReporter.java index b532514f..0afd2c0a 100755 --- a/src/main/java/org/testng/reporters/XMLReporter.java +++ b/src/main/java/org/testng/reporters/XMLReporter.java @@ -177,7 +177,7 @@ public class XMLReporter implements IReporter { */ public static void addDurationAttributes(XMLReporterConfig config, Properties attributes, Date minStartDate, Date maxEndDate) { - SimpleDateFormat format = new SimpleDateFormat(XMLReporterConfig.getTimestampFormat()); + SimpleDateFormat format = new SimpleDateFormat(config.getTimestampFormat()); TimeZone utc = TimeZone.getTimeZone("UTC"); format.setTimeZone(utc); String startTime = format.format(minStartDate); diff --git a/src/main/java/org/testng/reporters/XMLReporterConfig.java b/src/main/java/org/testng/reporters/XMLReporterConfig.java index f48186c6..af25cfe2 100755 --- a/src/main/java/org/testng/reporters/XMLReporterConfig.java +++ b/src/main/java/org/testng/reporters/XMLReporterConfig.java @@ -105,16 +105,6 @@ public class XMLReporterConfig { // intricacies of ISO-8601. static final String FMT_DEFAULT = "yyyy-MM-dd'T'HH:mm:ss'Z'"; - public static long convertDate(String date) { - SimpleDateFormat format = new SimpleDateFormat(getTimestampFormat()); - try { - long result = format.parse(date).getTime(); - return result; - } catch (ParseException e) { - return -1; - } - } - /** * Indicates the way that the file fragmentation should be performed. Set this * property to one of the FF_LEVEL_* values for the desired output structure @@ -169,7 +159,7 @@ public class XMLReporterConfig { /** * The output format for timestamps */ - private static String timestampFormat = FMT_DEFAULT; + private String timestampFormat = FMT_DEFAULT; public int getFileFragmentationLevel() { return fileFragmentationLevel; @@ -211,7 +201,7 @@ public class XMLReporterConfig { this.splitClassAndPackageNames = splitClassAndPackageNames; } - public static String getTimestampFormat() { + public String getTimestampFormat() { return timestampFormat; } diff --git a/src/main/java/org/testng/reporters/jq/ResultsByClass.java b/src/main/java/org/testng/reporters/jq/ResultsByClass.java index 6864b05e..de242fe3 100644 --- a/src/main/java/org/testng/reporters/jq/ResultsByClass.java +++ b/src/main/java/org/testng/reporters/jq/ResultsByClass.java @@ -9,7 +9,7 @@ import java.util.Comparator; import java.util.List; public class ResultsByClass { - public static Comparator<ITestResult> METHOD_NAME_COMPARATOR = + public static final Comparator<ITestResult> METHOD_NAME_COMPARATOR = new Comparator<ITestResult>() { @Override diff --git a/src/main/java/org/testng/xml/TestNGContentHandler.java b/src/main/java/org/testng/xml/TestNGContentHandler.java index 004e4551..a4bf2fb7 100755 --- a/src/main/java/org/testng/xml/TestNGContentHandler.java +++ b/src/main/java/org/testng/xml/TestNGContentHandler.java @@ -150,7 +150,7 @@ public class TestNGContentHandler extends DefaultHandler { String verbose = attributes.getValue("verbose"); if (null != verbose) { - m_currentSuite.setVerbose(new Integer(verbose)); + m_currentSuite.setVerbose(Integer.parseInt(verbose)); } String jUnit = attributes.getValue("junit"); if (null != jUnit) { @@ -433,7 +433,7 @@ public class TestNGContentHandler extends DefaultHandler { if (priority == null) { priority = "0"; } - m_currentSelector.setPriority(new Integer(priority)); + m_currentSelector.setPriority(Integer.parseInt(priority)); } else { // do nothing @@ -608,7 +608,7 @@ public class TestNGContentHandler extends DefaultHandler { } } - private class Include { + private static class Include { String name; String invocationNumbers; String description; diff --git a/src/main/java/org/testng/xml/XmlClass.java b/src/main/java/org/testng/xml/XmlClass.java index c5889657..d3b4ba37 100755 --- a/src/main/java/org/testng/xml/XmlClass.java +++ b/src/main/java/org/testng/xml/XmlClass.java @@ -285,12 +285,8 @@ public class XmlClass implements Serializable, Cloneable { public Map<String, String> getAllParameters() { Map<String, String> result = Maps.newHashMap(); Map<String, String> parameters = m_xmlTest.getLocalParameters(); - for (Map.Entry<String, String> parameter : parameters.entrySet()) { - result.put(parameter.getKey(), parameter.getValue()); - } - for (String key : m_parameters.keySet()) { - result.put(key, m_parameters.get(key)); - } + result.putAll(parameters); + result.putAll(m_parameters); return result; } diff --git a/src/main/java/org/testng/xml/XmlSuite.java b/src/main/java/org/testng/xml/XmlSuite.java index fe3b4f76..678a9264 100755 --- a/src/main/java/org/testng/xml/XmlSuite.java +++ b/src/main/java/org/testng/xml/XmlSuite.java @@ -61,32 +61,32 @@ public class XmlSuite implements Serializable, Cloneable { private String m_name = DEFAULT_SUITE_NAME; /** The suite verbose flag. (0 to 10)*/ - public static Integer DEFAULT_VERBOSE = 1; + public static final Integer DEFAULT_VERBOSE = 1; private Integer m_verbose = null; - public static ParallelMode DEFAULT_PARALLEL = ParallelMode.FALSE; + public static final ParallelMode DEFAULT_PARALLEL = ParallelMode.FALSE; private ParallelMode m_parallel = DEFAULT_PARALLEL; private String m_parentModule = ""; private String m_guiceStage = ""; /** Whether to SKIP or CONTINUE to re-attempt failed configuration methods. */ - public static String DEFAULT_CONFIG_FAILURE_POLICY = SKIP; + public static final String DEFAULT_CONFIG_FAILURE_POLICY = SKIP; private String m_configFailurePolicy = DEFAULT_CONFIG_FAILURE_POLICY; /** JUnit compatibility flag. */ - public static Boolean DEFAULT_JUNIT = Boolean.FALSE; + public static final Boolean DEFAULT_JUNIT = Boolean.FALSE; private Boolean m_isJUnit = DEFAULT_JUNIT; /** mixed mode flag. */ - public static Boolean DEFAULT_MIXED = Boolean.FALSE; + public static final Boolean DEFAULT_MIXED = Boolean.FALSE; private Boolean m_isMixed = DEFAULT_MIXED; - public static Boolean DEFAULT_SKIP_FAILED_INVOCATION_COUNTS = Boolean.FALSE; + public static final Boolean DEFAULT_SKIP_FAILED_INVOCATION_COUNTS = Boolean.FALSE; private Boolean m_skipFailedInvocationCounts = DEFAULT_SKIP_FAILED_INVOCATION_COUNTS; /** The thread count. */ - public static Integer DEFAULT_THREAD_COUNT = 5; + public static final Integer DEFAULT_THREAD_COUNT = 5; private int m_threadCount = DEFAULT_THREAD_COUNT; /** Thread count for the data provider pool */ @@ -97,7 +97,7 @@ public class XmlSuite implements Serializable, Cloneable { public static final Boolean DEFAULT_GROUP_BY_INSTANCES = false; private Boolean m_groupByInstances = DEFAULT_GROUP_BY_INSTANCES; - public static Boolean DEFAULT_ALLOW_RETURN_VALUES = Boolean.FALSE; + public static final Boolean DEFAULT_ALLOW_RETURN_VALUES = Boolean.FALSE; private Boolean m_allowReturnValues = DEFAULT_ALLOW_RETURN_VALUES; /** The packages containing test classes. */ @@ -135,7 +135,7 @@ public class XmlSuite implements Serializable, Cloneable { private static final long serialVersionUID = 4999962288272750226L; - public static String DEFAULT_PRESERVE_ORDER = "true"; + public static final String DEFAULT_PRESERVE_ORDER = "true"; private String m_preserveOrder = DEFAULT_PRESERVE_ORDER; private List<String> m_includedGroups = Lists.newArrayList(); @@ -677,7 +677,7 @@ public class XmlSuite implements Serializable, Cloneable { public long getTimeOut(long def) { long result = def; if (m_timeOut != null) { - result = new Long(m_timeOut); + result = Long.parseLong(m_timeOut); } return result; diff --git a/src/main/java/org/testng/xml/XmlTest.java b/src/main/java/org/testng/xml/XmlTest.java index f5a4b919..336a46b2 100755 --- a/src/main/java/org/testng/xml/XmlTest.java +++ b/src/main/java/org/testng/xml/XmlTest.java @@ -23,7 +23,7 @@ import org.testng.xml.dom.ParentSetter; public class XmlTest implements Serializable, Cloneable { private static final long serialVersionUID = 6533504325942417606L; - public static int DEFAULT_TIMEOUT_MS = Integer.MAX_VALUE; + public static final int DEFAULT_TIMEOUT_MS = Integer.MAX_VALUE; private XmlSuite m_suite; private String m_name; @@ -356,13 +356,8 @@ public class XmlTest implements Serializable, Cloneable { */ public Map<String, String> getAllParameters() { Map<String, String> result = Maps.newHashMap(); - Map<String, String> parameters = getSuite().getParameters(); - for (Map.Entry<String, String> parameter : parameters.entrySet()) { - result.put(parameter.getKey(), parameter.getValue()); - } - for (String key : m_parameters.keySet()) { - result.put(key, m_parameters.get(key)); - } + result.putAll(getSuite().getParameters()); + result.putAll(m_parameters); return result; } @@ -420,7 +415,7 @@ public class XmlTest implements Serializable, Cloneable { public long getTimeOut(long def) { long result = def; if (getTimeOut() != null) { - result = new Long(getTimeOut()); + result = Long.parseLong(getTimeOut()); } return result; @@ -506,13 +501,16 @@ public class XmlTest implements Serializable, Cloneable { xsb.push("groups"); // define - for (String metaGroupName: m_metaGroups.keySet()) { + for (Map.Entry<String, List<String>> entry: m_metaGroups.entrySet()) { + String metaGroupName = entry.getKey(); + List<String> groupNames = entry.getValue(); + Properties metaGroupProp= new Properties(); metaGroupProp.setProperty("name", metaGroupName); xsb.push("define", metaGroupProp); - for (String groupName: m_metaGroups.get(metaGroupName)) { + for (String groupName: groupNames) { Properties includeProps = new Properties(); includeProps.setProperty("name", groupName); @@ -582,21 +580,22 @@ public class XmlTest implements Serializable, Cloneable { @Override public String toString() { // return toXml(""); - StringBuffer result = new StringBuffer("[Test: \"" + m_name + "\"") - .append(" verbose:" + m_verbose); + StringBuilder result = new StringBuilder("[Test: \"") + .append(m_name) + .append("\"") + .append(" verbose:") + .append(m_verbose); result.append("[parameters:"); - for (String k : m_parameters.keySet()) { - String v = m_parameters.get(k); - result.append(k + "=>" + v); + for (Map.Entry<String, String> entry : m_parameters.entrySet()) { + result.append(entry.getKey()).append("=>").append(entry.getValue()); } result.append("]"); result.append("[metagroups:"); - for (String g : m_metaGroups.keySet()) { - List<String> mg = m_metaGroups.get(g); - result.append(g).append("="); - for (String n : mg) { + for (Map.Entry<String, List<String>> entry : m_metaGroups.entrySet()) { + result.append(entry.getKey()).append("="); + for (String n : entry.getValue()) { result.append(n).append(","); } } @@ -610,7 +609,7 @@ public class XmlTest implements Serializable, Cloneable { result.append("[excluded: "); for (String g : m_excludedGroups) { - result.append(g).append(""); + result.append(g).append(" "); } result.append("] "); |