[testng] 39/160: JDK7 migration: Use diamond syntax everywhere

Eugene Zhukov eugene-guest at moszumanska.debian.org
Tue Aug 18 10:22:19 UTC 2015


This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag testng-6.9.5
in repository testng.

commit 10c223b7aa6bf34778079bb5ee1a494c83cd1239
Author: Ryan Schmitt <rschmitt at pobox.com>
Date:   Sat May 30 21:11:53 2015 -0700

    JDK7 migration: Use diamond syntax everywhere
---
 src/main/java/org/testng/CommandLineArgs.java      |  2 +-
 src/main/java/org/testng/Reporter.java             |  6 ++---
 src/main/java/org/testng/SuiteRunner.java          |  4 ++--
 src/main/java/org/testng/TestNG.java               | 10 ++++-----
 src/main/java/org/testng/TestRunner.java           | 10 ++++-----
 src/main/java/org/testng/internal/ClassHelper.java |  4 ++--
 src/main/java/org/testng/internal/Graph.java       | 16 ++++++-------
 src/main/java/org/testng/internal/Invoker.java     |  2 +-
 .../org/testng/internal/MethodGroupsHelper.java    |  4 ++--
 .../java/org/testng/internal/MethodHelper.java     |  8 +++----
 .../testng/internal/MethodInvocationHelper.java    |  2 +-
 src/main/java/org/testng/internal/PoolService.java |  2 +-
 src/main/java/org/testng/internal/ResultMap.java   |  4 ++--
 src/main/java/org/testng/internal/Tarjan.java      |  6 ++---
 .../java/org/testng/internal/TestMethodWorker.java |  4 ++--
 .../org/testng/internal/XmlMethodSelector.java     |  4 ++--
 .../internal/annotations/JDK15TagFactory.java      |  2 +-
 .../java/org/testng/internal/collections/Pair.java |  2 +-
 .../internal/junit/ArrayComparisonFailure.java     |  2 +-
 .../java/org/testng/junit/JUnit4TestRunner.java    |  4 ++--
 .../java/org/testng/junit/JUnitMethodFinder.java   |  2 +-
 .../java/org/testng/junit/JUnitTestRunner.java     |  2 +-
 src/main/java/org/testng/mustache/Model.java       |  2 +-
 .../java/org/testng/reporters/FailedReporter.java  |  2 +-
 .../java/org/testng/reporters/XMLReporter.java     |  2 +-
 .../java/org/testng/reporters/XMLStringBuffer.java |  2 +-
 .../org/testng/reporters/XMLSuiteResultWriter.java |  2 +-
 .../java/org/testng/xml/TestNGContentHandler.java  |  6 ++---
 .../org/testng/internal/MethodInstanceTest.java    |  2 +-
 src/test/java/test/BaseTest.java                   | 26 +++++++++++-----------
 src/test/java/test/DynamicGraphTest.java           |  4 ++--
 src/test/java/test/GraphTest.java                  | 10 ++++-----
 src/test/java/test/MapTest.java                    |  4 ++--
 src/test/java/test/Test1.java                      |  6 ++---
 src/test/java/test/TestHelper.java                 |  2 +-
 .../java/test/configuration/BaseSuiteTest.java     |  2 +-
 .../test/configuration/BeforeTestOrderingTest.java |  2 +-
 .../ConfigurationGroupDataProviderSampleTest.java  |  2 +-
 ...onfigurationGroupInvocationCountSampleTest.java |  2 +-
 .../ConfigurationGroups1SampleTest.java            |  2 +-
 .../ConfigurationGroups2SampleTest.java            |  2 +-
 .../ConfigurationGroups3SampleTest.java            |  2 +-
 .../ConfigurationGroups7SampleTest.java            |  2 +-
 .../ConfigurationGroups8SampleTest.java            |  2 +-
 ...tMethodParametrizedConfigurationMethodTest.java |  4 ++--
 src/test/java/test/dependent/DepBugSampleTest.java |  2 +-
 src/test/java/test/dependent/SD2.java              |  2 +-
 .../java/test/distributed/DistributedTest.java     |  4 ++--
 src/test/java/test/factory/FactoryTest2.java       |  2 +-
 .../java/test/factory/FactoryWithDataProvider.java |  2 +-
 .../test/factory/FactoryWithInstanceInfoTest2.java |  2 +-
 src/test/java/test/factory/Sample2.java            |  6 ++---
 src/test/java/test/failures/FailuresTest.java      |  2 +-
 src/test/java/test/groupinvocation/DummyTest.java  |  2 +-
 src/test/java/test/inheritance/ZBase_0.java        |  4 ++--
 .../InterleavedInvocationTest.java                 |  4 ++--
 .../FastTestsFirstInterceptor.java                 |  4 ++--
 .../methodinterceptors/NullMethodInterceptor.java  |  2 +-
 .../RemoveAMethodInterceptor.java                  |  4 ++--
 .../java/test/methodselectors/CommandLineTest.java |  2 +-
 src/test/java/test/mustache/MustacheTest.java      |  8 +++----
 src/test/java/test/pholser/Captor.java             |  2 +-
 .../java/test/sample/BaseSampleInheritance.java    |  2 +-
 src/test/java/test/testng285/BugBase.java          |  2 +-
 src/test/java/test/testng317/VerifyTest.java       |  4 ++--
 src/test/java/test/testng387/FailedDPTest.java     |  2 +-
 src/test/java/test/thread/B.java                   |  2 +-
 src/test/java/test/thread/Helper.java              |  4 ++--
 src/test/java/test/thread/ParallelTestTest.java    |  2 +-
 src/test/java/test/thread/SequentialTest.java      |  2 +-
 src/test/java/test/timeout/TimeOutFromXmlTest.java |  2 +-
 src/test/java/test/tmp/DataDrivenTest.java         |  2 +-
 .../java/test/tmp/verify/VerifyInterceptor.java    |  4 ++--
 73 files changed, 138 insertions(+), 138 deletions(-)

diff --git a/src/main/java/org/testng/CommandLineArgs.java b/src/main/java/org/testng/CommandLineArgs.java
index 8b1b23b..430fcca 100644
--- a/src/main/java/org/testng/CommandLineArgs.java
+++ b/src/main/java/org/testng/CommandLineArgs.java
@@ -136,7 +136,7 @@ public class CommandLineArgs {
   public static final String METHODS = "-methods";
   @Parameter(names = METHODS, description = "Comma separated of test methods",
       splitter = CommaParameterSplitter.class)
-  public List<String> commandLineMethods = new ArrayList<String>();
+  public List<String> commandLineMethods = new ArrayList<>();
 
   public static final String SUITE_THREAD_POOL_SIZE = "-suitethreadpoolsize";
   public static final Integer SUITE_THREAD_POOL_SIZE_DEFAULT = 1;
diff --git a/src/main/java/org/testng/Reporter.java b/src/main/java/org/testng/Reporter.java
index 0deba10..3b16a20 100755
--- a/src/main/java/org/testng/Reporter.java
+++ b/src/main/java/org/testng/Reporter.java
@@ -31,12 +31,12 @@ public class Reporter {
   // when tests are run in parallel, each thread may be working with different
   // 'current test result'. Also, this value should be inherited if the test code
   // spawns its own thread.
-  private static ThreadLocal<ITestResult> m_currentTestResult = new InheritableThreadLocal<ITestResult>();
+  private static ThreadLocal<ITestResult> m_currentTestResult = new InheritableThreadLocal<>();
 
   /**
    * All output logged in a sequential order.
    */
-  private static List<String> m_output = new Vector<String>();
+  private static List<String> m_output = new Vector<>();
 
   /** The key is the hashCode of the ITestResult */
   private static Map<Integer, List<Integer>> m_methodOutputMap = Maps.newHashMap();
@@ -44,7 +44,7 @@ public class Reporter {
   private static boolean m_escapeHtml = false;
   //This variable is responsible for persisting all output that is yet to be associated with any
   //valid TestResult objects.
-  private static ThreadLocal<List<String>> m_orphanedOutput = new InheritableThreadLocal<List<String>>();
+  private static ThreadLocal<List<String>> m_orphanedOutput = new InheritableThreadLocal<>();
 
   public static void setCurrentTestResult(ITestResult m) {
     m_currentTestResult.set(m);
diff --git a/src/main/java/org/testng/SuiteRunner.java b/src/main/java/org/testng/SuiteRunner.java
index fef2fa5..5dd72aa 100644
--- a/src/main/java/org/testng/SuiteRunner.java
+++ b/src/main/java/org/testng/SuiteRunner.java
@@ -266,8 +266,8 @@ public class SuiteRunner implements ISuite, Serializable, IInvokedMethodListener
   private void privateRun() {
 
     // Map for unicity, Linked for guaranteed order
-    Map<Method, ITestNGMethod> beforeSuiteMethods= new LinkedHashMap<Method, ITestNGMethod>();
-    Map<Method, ITestNGMethod> afterSuiteMethods = new LinkedHashMap<Method, ITestNGMethod>();
+    Map<Method, ITestNGMethod> beforeSuiteMethods= new LinkedHashMap<>();
+    Map<Method, ITestNGMethod> afterSuiteMethods = new LinkedHashMap<>();
 
     IInvoker invoker = null;
 
diff --git a/src/main/java/org/testng/TestNG.java b/src/main/java/org/testng/TestNG.java
index 35c92ec..06e1ddf 100644
--- a/src/main/java/org/testng/TestNG.java
+++ b/src/main/java/org/testng/TestNG.java
@@ -603,7 +603,7 @@ public class TestNG {
       xmlTest.getXmlClasses().add(xmlClasses[i]);
     }
 
-    return new ArrayList<XmlSuite>(suites.values());
+    return new ArrayList<>(suites.values());
   }
 
   public void addMethodSelector(String className, int priority) {
@@ -1129,7 +1129,7 @@ public class TestNG {
         // Multithreaded: generate a dynamic graph that stores the suite hierarchy. This is then
         // used to run related suites in specific order. Parent suites are run only
         // once all the child suites have completed execution
-        DynamicGraph<ISuite> suiteGraph = new DynamicGraph<ISuite>();
+        DynamicGraph<ISuite> suiteGraph = new DynamicGraph<>();
         for (XmlSuite xmlSuite : m_suites) {
           populateSuiteGraph(suiteGraph, suiteRunnerMap, xmlSuite);
         }
@@ -1137,9 +1137,9 @@ public class TestNG {
         IThreadWorkerFactory<ISuite> factory = new SuiteWorkerFactory(suiteRunnerMap,
           0 /* verbose hasn't been set yet */, getDefaultSuiteName());
         GraphThreadPoolExecutor<ISuite> pooledExecutor =
-          new GraphThreadPoolExecutor<ISuite>(suiteGraph, factory, m_suiteThreadPoolSize,
-          m_suiteThreadPoolSize, Integer.MAX_VALUE, TimeUnit.MILLISECONDS,
-          new LinkedBlockingQueue<Runnable>());
+                new GraphThreadPoolExecutor<>(suiteGraph, factory, m_suiteThreadPoolSize,
+                        m_suiteThreadPoolSize, Integer.MAX_VALUE, TimeUnit.MILLISECONDS,
+                        new LinkedBlockingQueue<Runnable>());
 
         Utils.log("TestNG", 2, "Starting executor for all suites");
         // Run all suites in parallel
diff --git a/src/main/java/org/testng/TestRunner.java b/src/main/java/org/testng/TestRunner.java
index f736400..89d0e8e 100644
--- a/src/main/java/org/testng/TestRunner.java
+++ b/src/main/java/org/testng/TestRunner.java
@@ -739,9 +739,9 @@ public class TestRunner
       if (parallel) {
         if (graph.getNodeCount() > 0) {
           GraphThreadPoolExecutor<ITestNGMethod> executor =
-              new GraphThreadPoolExecutor<ITestNGMethod>(graph, this,
-                  threadCount, threadCount, 0, TimeUnit.MILLISECONDS,
-                  new LinkedBlockingQueue<Runnable>());
+                  new GraphThreadPoolExecutor<>(graph, this,
+                          threadCount, threadCount, 0, TimeUnit.MILLISECONDS,
+                          new LinkedBlockingQueue<Runnable>());
           executor.run();
           try {
             long timeOut = m_xmlTest.getTimeOut(XmlTest.DEFAULT_TIMEOUT_MS);
@@ -931,7 +931,7 @@ public class TestRunner
     }
 //    return map.getKeys();
 //    System.out.println(map);
-    return new ArrayList<List<IMethodInstance>>(map.values());
+    return new ArrayList<>(map.values());
   }
 
   private TestMethodWorker createTestMethodWorker(
@@ -1041,7 +1041,7 @@ public class TestRunner
   }
 
   private DynamicGraph<ITestNGMethod> createDynamicGraph(ITestNGMethod[] methods) {
-    DynamicGraph<ITestNGMethod> result = new DynamicGraph<ITestNGMethod>();
+    DynamicGraph<ITestNGMethod> result = new DynamicGraph<>();
     result.setComparator(new Comparator<ITestNGMethod>() {
       @Override
       public int compare(ITestNGMethod o1, ITestNGMethod o2) {
diff --git a/src/main/java/org/testng/internal/ClassHelper.java b/src/main/java/org/testng/internal/ClassHelper.java
index 405ca31..87a9ae3 100644
--- a/src/main/java/org/testng/internal/ClassHelper.java
+++ b/src/main/java/org/testng/internal/ClassHelper.java
@@ -33,7 +33,7 @@ public final class ClassHelper {
   private static final String JUNIT_4_TESTRUNNER = "org.testng.junit.JUnit4TestRunner";
 
   /** The additional class loaders to find classes in. */
-  private static final List<ClassLoader> m_classLoaders = new Vector<ClassLoader>();
+  private static final List<ClassLoader> m_classLoaders = new Vector<>();
 
   /** Add a class loader to the searchable loaders. */
   public static void addClassLoader(final ClassLoader loader) {
@@ -86,7 +86,7 @@ public final class ClassHelper {
    * @return the class or null if the class is not found.
    */
   public static Class<?> forName(final String className) {
-    Vector<ClassLoader> allClassLoaders = new Vector<ClassLoader>();
+    Vector<ClassLoader> allClassLoaders = new Vector<>();
     ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
     if (contextClassLoader != null) {
       allClassLoaders.add(contextClassLoader);
diff --git a/src/main/java/org/testng/internal/Graph.java b/src/main/java/org/testng/internal/Graph.java
index f7ba442..df121a8 100644
--- a/src/main/java/org/testng/internal/Graph.java
+++ b/src/main/java/org/testng/internal/Graph.java
@@ -29,7 +29,7 @@ public class Graph<T> {
 
   public void addNode(T tm) {
     ppp("ADDING NODE " + tm + " " + tm.hashCode());
-    m_nodes.put(tm, new Node<T>(tm));
+    m_nodes.put(tm, new Node<>(tm));
     // Initially, all the nodes are put in the independent list as well
   }
 
@@ -69,7 +69,7 @@ public class Graph<T> {
   }
 
   public Set<T> getNeighbors(T t) {
-    Set<T> result = new HashSet<T>();
+    Set<T> result = new HashSet<>();
     for (Node<T> n : findNode(t).getNeighbors()) {
       result.add(n.getObject());
     }
@@ -139,7 +139,7 @@ public class Graph<T> {
       //
       Node<T> node = findNodeWithNoPredecessors(nodes2);
       if (null == node) {
-        List<T> cycle = new Tarjan<T>(this, nodes2.get(0).getObject()).getCycle();
+        List<T> cycle = new Tarjan<>(this, nodes2.get(0).getObject()).getCycle();
         StringBuilder sb = new StringBuilder();
         sb.append("The following methods have cyclic dependencies:\n");
         for (T m : cycle) {
@@ -212,9 +212,9 @@ public class Graph<T> {
     // already encountered.  "queue" is the queue of items whose
     // predecessors we haven't yet explored.
 
-    LinkedList<T> result = new LinkedList<T>();
-    Set<T> visited = new HashSet<T>();
-    LinkedList<T> queue = new LinkedList<T>();
+    LinkedList<T> result = new LinkedList<>();
+    Set<T> visited = new HashSet<>();
+    LinkedList<T> queue = new LinkedList<>();
     visited.add(o);
     queue.addLast(o);
 
@@ -254,7 +254,7 @@ public class Graph<T> {
       m_object = tm;
     }
 
-    private Set<Node<T>> m_neighbors = new HashSet<Node<T>>();
+    private Set<Node<T>> m_neighbors = new HashSet<>();
     public void addNeighbor(Node<T> neighbor) {
       m_neighbors.add(neighbor);
     }
@@ -265,7 +265,7 @@ public class Graph<T> {
 
     @Override
     public Node<T> clone() {
-      Node<T> result = new Node<T>(m_object);
+      Node<T> result = new Node<>(m_object);
       for (T pred : m_predecessors.values()) {
         result.addPredecessor(pred);
       }
diff --git a/src/main/java/org/testng/internal/Invoker.java b/src/main/java/org/testng/internal/Invoker.java
index d7ad276..14fb401 100644
--- a/src/main/java/org/testng/internal/Invoker.java
+++ b/src/main/java/org/testng/internal/Invoker.java
@@ -1140,7 +1140,7 @@ public class Invoker implements IInvoker {
               parametersIndex++;
             }
             PoolService<List<ITestResult>> ps =
-                new PoolService<List<ITestResult>>(suite.getDataProviderThreadCount());
+                    new PoolService<>(suite.getDataProviderThreadCount());
             List<List<ITestResult>> r = ps.submitTasksAndWait(workers);
             for (List<ITestResult> l2 : r) {
               result.addAll(l2);
diff --git a/src/main/java/org/testng/internal/MethodGroupsHelper.java b/src/main/java/org/testng/internal/MethodGroupsHelper.java
index 1923d07..a8d1c2c 100644
--- a/src/main/java/org/testng/internal/MethodGroupsHelper.java
+++ b/src/main/java/org/testng/internal/MethodGroupsHelper.java
@@ -27,9 +27,9 @@ import java.util.regex.Pattern;
  */
 public class MethodGroupsHelper {
 
-  private static final Map<String, Pattern> PATTERN_CACHE = new ConcurrentHashMap<String, Pattern>();
+  private static final Map<String, Pattern> PATTERN_CACHE = new ConcurrentHashMap<>();
   private static final Map<Pair<String, String>, Boolean> MATCH_CACHE =
-      new ConcurrentHashMap<Pair<String, String>, Boolean>();
+          new ConcurrentHashMap<>();
 
     /**
    * Collect all the methods that belong to the included groups and exclude all
diff --git a/src/main/java/org/testng/internal/MethodHelper.java b/src/main/java/org/testng/internal/MethodHelper.java
index ca5554c..db36311 100644
--- a/src/main/java/org/testng/internal/MethodHelper.java
+++ b/src/main/java/org/testng/internal/MethodHelper.java
@@ -28,10 +28,10 @@ import java.util.regex.Pattern;
  */
 public class MethodHelper {
   private static final Map<ITestNGMethod[], Graph<ITestNGMethod>> GRAPH_CACHE =
-      new ConcurrentHashMap<ITestNGMethod[], Graph<ITestNGMethod>>();
-  private static final Map<Method, String> CANONICAL_NAME_CACHE = new ConcurrentHashMap<Method, String>();
+          new ConcurrentHashMap<>();
+  private static final Map<Method, String> CANONICAL_NAME_CACHE = new ConcurrentHashMap<>();
   private static final Map<Pair<String, String>, Boolean> MATCH_CACHE =
-      new ConcurrentHashMap<Pair<String, String>, Boolean>();
+          new ConcurrentHashMap<>();
 
   /**
    * Collects and orders test or configuration methods
@@ -220,7 +220,7 @@ public class MethodHelper {
 
   private static Graph<ITestNGMethod> topologicalSort(ITestNGMethod[] methods,
       List<ITestNGMethod> sequentialList, List<ITestNGMethod> parallelList) {
-    Graph<ITestNGMethod> result = new Graph<ITestNGMethod>();
+    Graph<ITestNGMethod> result = new Graph<>();
 
     if (methods.length == 0) {
       return result;
diff --git a/src/main/java/org/testng/internal/MethodInvocationHelper.java b/src/main/java/org/testng/internal/MethodInvocationHelper.java
index f5821f8..9e1665e 100644
--- a/src/main/java/org/testng/internal/MethodInvocationHelper.java
+++ b/src/main/java/org/testng/internal/MethodInvocationHelper.java
@@ -100,7 +100,7 @@ public class MethodInvocationHelper {
       // Anything else is an error
       Class<?>[] parameterTypes = dataProvider.getParameterTypes();
 
-      final Collection<Pair<Integer, Class<?>>> unresolved = new ArrayList<Pair<Integer, Class<?>>>(parameterTypes.length);
+      final Collection<Pair<Integer, Class<?>>> unresolved = new ArrayList<>(parameterTypes.length);
       int i = 0;
       for (Class<?> cls : parameterTypes) {
         boolean isTestInstance = annotationFinder.hasTestInstance(dataProvider, i++);
diff --git a/src/main/java/org/testng/internal/PoolService.java b/src/main/java/org/testng/internal/PoolService.java
index 3c53b39..0154cb0 100755
--- a/src/main/java/org/testng/internal/PoolService.java
+++ b/src/main/java/org/testng/internal/PoolService.java
@@ -34,7 +34,7 @@ public class PoolService<FutureType> {
       }
     };
     m_executor = Executors.newFixedThreadPool(threadPoolSize, m_threadFactory);
-    m_completionService = new ExecutorCompletionService<FutureType>(m_executor);
+    m_completionService = new ExecutorCompletionService<>(m_executor);
   }
 
   public List<FutureType> submitTasksAndWait(List<? extends Callable<FutureType>> tasks) {
diff --git a/src/main/java/org/testng/internal/ResultMap.java b/src/main/java/org/testng/internal/ResultMap.java
index 5477a61..f9931e6 100755
--- a/src/main/java/org/testng/internal/ResultMap.java
+++ b/src/main/java/org/testng/internal/ResultMap.java
@@ -17,7 +17,7 @@ public class ResultMap implements IResultMap {
    *
    */
   private static final long serialVersionUID = 80134376515999093L;
-  private Map<ITestResult, ITestNGMethod> m_map = new ConcurrentHashMap<ITestResult, ITestNGMethod>();
+  private Map<ITestResult, ITestNGMethod> m_map = new ConcurrentHashMap<>();
 
   @Override
   public void addResult(ITestResult result, ITestNGMethod method) {
@@ -26,7 +26,7 @@ public class ResultMap implements IResultMap {
 
   @Override
   public Set<ITestResult> getResults(ITestNGMethod method) {
-    Set<ITestResult> result = new HashSet<ITestResult>();
+    Set<ITestResult> result = new HashSet<>();
 
     for (ITestResult tr : m_map.keySet()) {
       if (m_map.get(tr).equals(method)) {
diff --git a/src/main/java/org/testng/internal/Tarjan.java b/src/main/java/org/testng/internal/Tarjan.java
index 71b8eb1..2fcff63 100755
--- a/src/main/java/org/testng/internal/Tarjan.java
+++ b/src/main/java/org/testng/internal/Tarjan.java
@@ -19,7 +19,7 @@ public class Tarjan<T> {
   private List<T> m_cycle;
 
   public Tarjan(Graph<T> graph, T start) {
-    m_s = new Stack<T>();
+    m_s = new Stack<>();
     run(graph, start);
   }
 
@@ -52,7 +52,7 @@ public class Tarjan<T> {
   }
 
   public static void main(String[] args) {
-    Graph<String> g = new Graph<String>();
+    Graph<String> g = new Graph<>();
     g.addNode("a");
     g.addNode("b");
     g.addNode("c");
@@ -70,7 +70,7 @@ public class Tarjan<T> {
       g.addPredecessor(edges[i], edges[i+1]);
     }
 
-    new Tarjan<String>(g, "a");
+    new Tarjan<>(g, "a");
   }
 
   public List<T> getCycle() {
diff --git a/src/main/java/org/testng/internal/TestMethodWorker.java b/src/main/java/org/testng/internal/TestMethodWorker.java
index cb93beb..ef72ff1 100644
--- a/src/main/java/org/testng/internal/TestMethodWorker.java
+++ b/src/main/java/org/testng/internal/TestMethodWorker.java
@@ -161,7 +161,7 @@ public class TestMethodWorker implements IWorker<ITestNGMethod> {
     synchronized(testClass) {
       Set<Object> instances= invokedBeforeClassMethods.get(testClass);
       if(null == instances) {
-        instances= new HashSet<Object>();
+        instances= new HashSet<>();
         invokedBeforeClassMethods.put(testClass, instances);
       }
       for(Object instance: mi.getInstances()) {
@@ -206,7 +206,7 @@ public class TestMethodWorker implements IWorker<ITestNGMethod> {
       synchronized(invokedAfterClassMethods) {
         Set<Object> instances = invokedAfterClassMethods.get(testClass);
         if(null == instances) {
-          instances= new HashSet<Object>();
+          instances= new HashSet<>();
           invokedAfterClassMethods.put(testClass, instances);
         }
         for(Object inst: mi.getInstances()) {
diff --git a/src/main/java/org/testng/internal/XmlMethodSelector.java b/src/main/java/org/testng/internal/XmlMethodSelector.java
index 5dc419b..c3f644f 100755
--- a/src/main/java/org/testng/internal/XmlMethodSelector.java
+++ b/src/main/java/org/testng/internal/XmlMethodSelector.java
@@ -341,8 +341,8 @@ public class XmlMethodSelector implements IMethodSelector {
 
   private void init(IMethodSelectorContext context) {
     String[] groups = m_includedGroups.keySet().toArray(new String[m_includedGroups.size()]);
-    Set<String> groupClosure = new HashSet<String>();
-    Set<ITestNGMethod> methodClosure = new HashSet<ITestNGMethod>();
+    Set<String> groupClosure = new HashSet<>();
+    Set<ITestNGMethod> methodClosure = new HashSet<>();
 
     List<ITestNGMethod> includedMethods = Lists.newArrayList();
     for (ITestNGMethod m : m_testMethods) {
diff --git a/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java b/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java
index 5d4e6b3..4a13707 100755
--- a/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java
+++ b/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java
@@ -420,7 +420,7 @@ public class JDK15TagFactory {
 
   private String[] join(String[] strings, String[] strings2) {
     List<String> result = Lists.newArrayList(strings);
-    Set<String> seen = new HashSet<String>(Lists.newArrayList(strings));
+    Set<String> seen = new HashSet<>(Lists.newArrayList(strings));
     for (String s : strings2) {
       if (! seen.contains(s)) {
         result.add(s);
diff --git a/src/main/java/org/testng/internal/collections/Pair.java b/src/main/java/org/testng/internal/collections/Pair.java
index 4d5e6a3..815536a 100644
--- a/src/main/java/org/testng/internal/collections/Pair.java
+++ b/src/main/java/org/testng/internal/collections/Pair.java
@@ -68,7 +68,7 @@ public class Pair<A, B> {
   }
 
   public static <A, B> Pair<A, B> of(A a, B b) {
-    return new Pair<A, B>(a, b);
+    return new Pair<>(a, b);
   }
 
   @Override
diff --git a/src/main/java/org/testng/internal/junit/ArrayComparisonFailure.java b/src/main/java/org/testng/internal/junit/ArrayComparisonFailure.java
index c025dc2..8a45725 100644
--- a/src/main/java/org/testng/internal/junit/ArrayComparisonFailure.java
+++ b/src/main/java/org/testng/internal/junit/ArrayComparisonFailure.java
@@ -11,7 +11,7 @@ public class ArrayComparisonFailure extends AssertionError {
 
     private static final long serialVersionUID= 1L;
     
-    private List<Integer> fIndices= new ArrayList<Integer>();
+    private List<Integer> fIndices= new ArrayList<>();
     private final String fMessage;
     private final AssertionError fCause;
 
diff --git a/src/main/java/org/testng/junit/JUnit4TestRunner.java b/src/main/java/org/testng/junit/JUnit4TestRunner.java
index ef627f2..4f1b42d 100644
--- a/src/main/java/org/testng/junit/JUnit4TestRunner.java
+++ b/src/main/java/org/testng/junit/JUnit4TestRunner.java
@@ -110,8 +110,8 @@ public class JUnit4TestRunner implements IJUnitTestRunner {
 
     private class RL extends RunListener {
 
-        private Map<Description, ITestResult> runs = new WeakHashMap<Description, ITestResult>();
-        private List<Description> notified = new LinkedList<Description>();
+        private Map<Description, ITestResult> runs = new WeakHashMap<>();
+        private List<Description> notified = new LinkedList<>();
 
         @Override
         public void testAssumptionFailure(Failure failure) {
diff --git a/src/main/java/org/testng/junit/JUnitMethodFinder.java b/src/main/java/org/testng/junit/JUnitMethodFinder.java
index cb52891..e90dffe 100755
--- a/src/main/java/org/testng/junit/JUnitMethodFinder.java
+++ b/src/main/java/org/testng/junit/JUnitMethodFinder.java
@@ -75,7 +75,7 @@ public class JUnitMethodFinder implements ITestMethodFinder {
     // same method twice (e.g. setUp) which would lead to double-invocation.
     // All relevant JUnit methods are parameter-less so we store accepted
     // method names in a Set to filter out duplicates.
-    Set<String> acceptedMethodNames = new HashSet<String>();
+    Set<String> acceptedMethodNames = new HashSet<>();
 
     //
     // Collect all methods that start with test
diff --git a/src/main/java/org/testng/junit/JUnitTestRunner.java b/src/main/java/org/testng/junit/JUnitTestRunner.java
index 402d530..14efab7 100755
--- a/src/main/java/org/testng/junit/JUnitTestRunner.java
+++ b/src/main/java/org/testng/junit/JUnitTestRunner.java
@@ -35,7 +35,7 @@ public class JUnitTestRunner implements TestListener, IJUnitTestRunner {
 
   private ITestResultNotifier m_parentRunner;
 
-  private Map<Test, TestRunInfo> m_tests= new WeakHashMap<Test, TestRunInfo>();
+  private Map<Test, TestRunInfo> m_tests= new WeakHashMap<>();
   private List<ITestNGMethod> m_methods= Lists.newArrayList();
   private List<IInvokedMethodListener> m_invokedMethodListeners = Lists.newArrayList();
 
diff --git a/src/main/java/org/testng/mustache/Model.java b/src/main/java/org/testng/mustache/Model.java
index 5aca73f..9a58171 100644
--- a/src/main/java/org/testng/mustache/Model.java
+++ b/src/main/java/org/testng/mustache/Model.java
@@ -6,7 +6,7 @@ import java.util.Stack;
 
 public class Model {
   private Map<String, Object> m_model;
-  private Stack<SubModel> m_subModels = new Stack<SubModel>();
+  private Stack<SubModel> m_subModels = new Stack<>();
   private static class SubModel {
     String variable;
     Object subModel;
diff --git a/src/main/java/org/testng/reporters/FailedReporter.java b/src/main/java/org/testng/reporters/FailedReporter.java
index 3765290..621b63c 100755
--- a/src/main/java/org/testng/reporters/FailedReporter.java
+++ b/src/main/java/org/testng/reporters/FailedReporter.java
@@ -192,7 +192,7 @@ public class FailedReporter extends TestListenerAdapter implements IReporter {
           : instances[0].getClass();
       Set<ITestNGMethod> methodList= methodsMap.get(clazz);
       if(null == methodList) {
-        methodList= new HashSet<ITestNGMethod>();
+        methodList= new HashSet<>();
         methodsMap.put(clazz, methodList);
       }
       methodList.add(m);
diff --git a/src/main/java/org/testng/reporters/XMLReporter.java b/src/main/java/org/testng/reporters/XMLReporter.java
index e7c33ef..b52c689 100755
--- a/src/main/java/org/testng/reporters/XMLReporter.java
+++ b/src/main/java/org/testng/reporters/XMLReporter.java
@@ -190,7 +190,7 @@ public class XMLReporter implements IReporter {
   }
 
   private Set<ITestNGMethod> getUniqueMethodSet(Collection<ITestNGMethod> methods) {
-    Set<ITestNGMethod> result = new LinkedHashSet<ITestNGMethod>();
+    Set<ITestNGMethod> result = new LinkedHashSet<>();
     for (ITestNGMethod method : methods) {
       result.add(method);
     }
diff --git a/src/main/java/org/testng/reporters/XMLStringBuffer.java b/src/main/java/org/testng/reporters/XMLStringBuffer.java
index 84046b4..2ef53ba 100755
--- a/src/main/java/org/testng/reporters/XMLStringBuffer.java
+++ b/src/main/java/org/testng/reporters/XMLStringBuffer.java
@@ -24,7 +24,7 @@ public class XMLStringBuffer {
   private IBuffer m_buffer;
 
   /** The stack of tags to make sure XML document is well formed. */
-  private final Stack<Tag> m_tagStack = new Stack<Tag>();
+  private final Stack<Tag> m_tagStack = new Stack<>();
 
   /** A string of space character representing the current indentation. */
   private String m_currentIndent = "";
diff --git a/src/main/java/org/testng/reporters/XMLSuiteResultWriter.java b/src/main/java/org/testng/reporters/XMLSuiteResultWriter.java
index a0223e1..c8ebebd 100755
--- a/src/main/java/org/testng/reporters/XMLSuiteResultWriter.java
+++ b/src/main/java/org/testng/reporters/XMLSuiteResultWriter.java
@@ -79,7 +79,7 @@ public class XMLSuiteResultWriter {
   private void addAllTestResults(Set<ITestResult> testResults, IResultMap resultMap) {
     if (resultMap != null) {
       // Sort the results chronologically before adding them
-      List<ITestResult> allResults = new ArrayList<ITestResult>();
+      List<ITestResult> allResults = new ArrayList<>();
       allResults.addAll(resultMap.getAllResults());
 
       Collections.sort(new ArrayList(allResults), new Comparator<ITestResult>() {
diff --git a/src/main/java/org/testng/xml/TestNGContentHandler.java b/src/main/java/org/testng/xml/TestNGContentHandler.java
index 62951f3..6588152 100755
--- a/src/main/java/org/testng/xml/TestNGContentHandler.java
+++ b/src/main/java/org/testng/xml/TestNGContentHandler.java
@@ -54,7 +54,7 @@ public class TestNGContentHandler extends DefaultHandler {
     INCLUDE,
     EXCLUDE
   }
-  private Stack<Location> m_locations = new Stack<Location>();
+  private Stack<Location> m_locations = new Stack<>();
 
   private XmlClass m_currentClass = null;
   private ArrayList<XmlInclude> m_currentIncludedMethods = null;
@@ -405,7 +405,7 @@ public class TestNGContentHandler extends DefaultHandler {
    */
   public void xmlMethodSelectors(boolean start, Attributes attributes) {
     if (start) {
-      m_currentSelectors = new ArrayList<XmlMethodSelector>();
+      m_currentSelectors = new ArrayList<>();
     }
     else {
       switch(m_locations.peek()) {
@@ -453,7 +453,7 @@ public class TestNGContentHandler extends DefaultHandler {
 
   private void xmlMethod(boolean start, Attributes attributes) {
     if (start) {
-      m_currentIncludedMethods = new ArrayList<XmlInclude>();
+      m_currentIncludedMethods = new ArrayList<>();
       m_currentExcludedMethods = Lists.newArrayList();
       m_currentIncludeIndex = 0;
     }
diff --git a/src/test/java/org/testng/internal/MethodInstanceTest.java b/src/test/java/org/testng/internal/MethodInstanceTest.java
index f3c81dc..0b3223c 100644
--- a/src/test/java/org/testng/internal/MethodInstanceTest.java
+++ b/src/test/java/org/testng/internal/MethodInstanceTest.java
@@ -32,7 +32,7 @@ public class MethodInstanceTest {
 
     // Build a list of entries imposing the same behavior as the live suite, reduced to the
     // minimum to create the same condition.
-    List<MethodInstance> methods = new ArrayList<MethodInstance>();
+    List<MethodInstance> methods = new ArrayList<>();
     methods.add(buildMethodInstance("unittests", "StateTest", 1, "aCategorization"));
     methods.add(buildMethodInstance("unittests", "StateTest", 1, "bCategorization"));
     methods.add(buildMethodInstance("unittests", "StateTest", 1, "cCategorization"));
diff --git a/src/test/java/test/BaseTest.java b/src/test/java/test/BaseTest.java
index ccfed28..2d63eb8 100644
--- a/src/test/java/test/BaseTest.java
+++ b/src/test/java/test/BaseTest.java
@@ -89,20 +89,20 @@ public class BaseTest extends BaseDistributedTest {
     getTest().getSuite().setThreadCount(count);
   }
 
-  private Map<Long, XmlTest> m_tests= new HashMap<Long, XmlTest>();
-  private Map<Long, Map> m_passedTests= new HashMap<Long, Map>();
-  private Map<Long, Map> m_failedTests= new HashMap<Long, Map>();
-  private Map<Long, Map> m_skippedTests= new HashMap<Long, Map>();
-  private Map<Long, XmlTest> m_testConfigs= new HashMap<Long, XmlTest>();
-  private Map<Long, Map> m_passedConfigs= new HashMap<Long, Map>();
-  private Map<Long, Map> m_failedConfigs= new HashMap<Long, Map>();
-  private Map<Long, Map> m_skippedConfigs= new HashMap<Long, Map>();
-  private Map<Long, Map> m_failedButWithinSuccessPercentageTests= new HashMap<Long, Map>();
+  private Map<Long, XmlTest> m_tests= new HashMap<>();
+  private Map<Long, Map> m_passedTests= new HashMap<>();
+  private Map<Long, Map> m_failedTests= new HashMap<>();
+  private Map<Long, Map> m_skippedTests= new HashMap<>();
+  private Map<Long, XmlTest> m_testConfigs= new HashMap<>();
+  private Map<Long, Map> m_passedConfigs= new HashMap<>();
+  private Map<Long, Map> m_failedConfigs= new HashMap<>();
+  private Map<Long, Map> m_skippedConfigs= new HashMap<>();
+  private Map<Long, Map> m_failedButWithinSuccessPercentageTests= new HashMap<>();
 
   protected Map<String, List<ITestResult>> getTests(Map<Long, Map> map) {
     Map<String, List<ITestResult>> result= map.get(getId());
     if(null == result) {
-      result= new HashMap<String, List<ITestResult>>();
+      result= new HashMap<>();
       map.put(getId(), result);
     }
 
@@ -258,7 +258,7 @@ public class BaseTest extends BaseDistributedTest {
   }
 
   public void addMetaGroup(String mg, String n) {
-    List<String> l= new ArrayList<String>();
+    List<String> l= new ArrayList<>();
     l.add(n);
     addMetaGroup(mg, l);
   }
@@ -290,7 +290,7 @@ public class BaseTest extends BaseDistributedTest {
   private void addTest(Map<String, List<ITestResult>> tests, ITestResult t) {
     List<ITestResult> l= tests.get(t.getMethod().getMethodName());
     if(null == l) {
-      l= new ArrayList<ITestResult>();
+      l= new ArrayList<>();
       tests.put(t.getMethod().getMethodName(), l);
     }
     l.add(t);
@@ -395,7 +395,7 @@ public class BaseTest extends BaseDistributedTest {
      * result.size() at the end of this function.
      */
     public static List<Integer> grep(File fileName, String regexp, List<String> resultLines) {
-      List<Integer> resultLineNumbers = new ArrayList<Integer>();
+      List<Integer> resultLineNumbers = new ArrayList<>();
       BufferedReader fr = null;
       try {
         fr = new BufferedReader(new FileReader(fileName));
diff --git a/src/test/java/test/DynamicGraphTest.java b/src/test/java/test/DynamicGraphTest.java
index 33eaa15..7424539 100644
--- a/src/test/java/test/DynamicGraphTest.java
+++ b/src/test/java/test/DynamicGraphTest.java
@@ -16,7 +16,7 @@ public class DynamicGraphTest {
 
   @Test
   public void test8() {
-    DynamicGraph<String> dg = new DynamicGraph<String>();
+    DynamicGraph<String> dg = new DynamicGraph<>();
     dg.addEdge("b1", "a1");
     dg.addEdge("b1", "a2");
     dg.addEdge("b2", "a1");
@@ -45,7 +45,7 @@ public class DynamicGraphTest {
 
   @Test
   public void test2() {
-    DynamicGraph<String> dg = new DynamicGraph<String>();
+    DynamicGraph<String> dg = new DynamicGraph<>();
     dg.addEdge("b1", "a1");
     dg.addEdge("b1", "a2");
     dg.addNode("x");
diff --git a/src/test/java/test/GraphTest.java b/src/test/java/test/GraphTest.java
index 04c4f41..871f959 100644
--- a/src/test/java/test/GraphTest.java
+++ b/src/test/java/test/GraphTest.java
@@ -18,7 +18,7 @@ public class GraphTest {
 
   @Test
   public void sort() {
-    Graph<String> g = new Graph<String>();
+    Graph<String> g = new Graph<>();
     g.addNode("3");
     g.addNode("1");
     g.addNode("2.2");
@@ -63,14 +63,14 @@ public class GraphTest {
       g.topologicalSort();
     }
     catch(TestNGException ex) {
-      Tarjan<String> t = new Tarjan<String>(g, "1");
+      Tarjan<String> t = new Tarjan<>(g, "1");
       Assert.assertEquals(t.getCycle().size(), 3);
     }
 
   }
 
   private Graph<String> createCyclicGraph() {
-    Graph<String> g = new Graph<String>();
+    Graph<String> g = new Graph<>();
     g.addNode("3");
     g.addNode("2");
     g.addNode("1");
@@ -84,7 +84,7 @@ public class GraphTest {
 
   @Test
   public void findPredecessors() {
-    Graph<String> g = new Graph<String>();
+    Graph<String> g = new Graph<>();
     g.addNode("3");
     g.addNode("1");
     g.addNode("2.2");
@@ -146,7 +146,7 @@ public class GraphTest {
   //
   @Test(timeOut = 5000) // If this takes more than 5 seconds we've definitely regressed.
   public void findPredecessorsTiming() {
-    Graph<String> g = new Graph<String>();
+    Graph<String> g = new Graph<>();
 
     final String rootNode = "myroot";
     final String independentNode = "independent";
diff --git a/src/test/java/test/MapTest.java b/src/test/java/test/MapTest.java
index e936740..ae3aedc 100644
--- a/src/test/java/test/MapTest.java
+++ b/src/test/java/test/MapTest.java
@@ -9,8 +9,8 @@ import java.util.Map;
 public class MapTest {
   @Test(description = "Make sure that arrays as map values work with assert")
   public void testMap() {
-    Map<String, boolean[]> mapA = new HashMap<String, boolean[]>();
-    Map<String, boolean[]> mapB = new HashMap<String, boolean[]>();
+    Map<String, boolean[]> mapA = new HashMap<>();
+    Map<String, boolean[]> mapB = new HashMap<>();
     mapA.put("A", new boolean[] { true });
     mapB.put("A", new boolean[] { true });
     Assert.assertEquals(mapA, mapB);
diff --git a/src/test/java/test/Test1.java b/src/test/java/test/Test1.java
index 0014b79..ecf825a 100644
--- a/src/test/java/test/Test1.java
+++ b/src/test/java/test/Test1.java
@@ -37,7 +37,7 @@ public class Test1 extends BaseTest {
     assert 1 == getTest().getXmlClasses().size();
     // should match all methods belonging to group "odd" and "even"
     addIncludedGroup("evenodd");
-    List l = new ArrayList<String>();
+    List l = new ArrayList<>();
     l.add("even");
     l.add("odd");
     addMetaGroup("evenodd", l);
@@ -55,11 +55,11 @@ public class Test1 extends BaseTest {
   public void groupsOfGroupsWithIndirections() {
     addClass("test.sample.Sample1");
     addIncludedGroup("all");
-    List l = new ArrayList<String>();
+    List l = new ArrayList<>();
     l.add("methods");
     l.add("broken");
     addMetaGroup("all", l);
-    l = new ArrayList<String>();
+    l = new ArrayList<>();
     l.add("odd");
     l.add("even");
     addMetaGroup("methods", l);
diff --git a/src/test/java/test/TestHelper.java b/src/test/java/test/TestHelper.java
index a965e91..8f703ac 100644
--- a/src/test/java/test/TestHelper.java
+++ b/src/test/java/test/TestHelper.java
@@ -19,7 +19,7 @@ public class TestHelper {
 
     XmlTest test = new XmlTest(result);
     test.setName("TmpTest");
-    List<XmlClass> classes = new ArrayList<XmlClass>();
+    List<XmlClass> classes = new ArrayList<>();
     classes.add(new XmlClass(cls));
     test.setXmlClasses(classes);
 
diff --git a/src/test/java/test/configuration/BaseSuiteTest.java b/src/test/java/test/configuration/BaseSuiteTest.java
index 62e31a6..2a80722 100644
--- a/src/test/java/test/configuration/BaseSuiteTest.java
+++ b/src/test/java/test/configuration/BaseSuiteTest.java
@@ -10,7 +10,7 @@ public class BaseSuiteTest {
 
   @BeforeSuite
   public void beforeSuiteParent(){
-    m_order = new ArrayList<Integer>();
+    m_order = new ArrayList<>();
     m_order.add(1);
   }
 
diff --git a/src/test/java/test/configuration/BeforeTestOrderingTest.java b/src/test/java/test/configuration/BeforeTestOrderingTest.java
index bcb2480..428765c 100644
--- a/src/test/java/test/configuration/BeforeTestOrderingTest.java
+++ b/src/test/java/test/configuration/BeforeTestOrderingTest.java
@@ -21,7 +21,7 @@ public class BeforeTestOrderingTest {
 
   @BeforeSuite
   public void init() {
-    m_testNames = new ArrayList<String>();
+    m_testNames = new ArrayList<>();
   }
 
   static void addTest(String testName) {
diff --git a/src/test/java/test/configuration/ConfigurationGroupDataProviderSampleTest.java b/src/test/java/test/configuration/ConfigurationGroupDataProviderSampleTest.java
index c7becd6..5a686fd 100644
--- a/src/test/java/test/configuration/ConfigurationGroupDataProviderSampleTest.java
+++ b/src/test/java/test/configuration/ConfigurationGroupDataProviderSampleTest.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ConfigurationGroupDataProviderSampleTest {
-  static List<Integer> m_list = new ArrayList<Integer>();
+  static List<Integer> m_list = new ArrayList<>();
 
   @BeforeGroups(groups={"twice"}, value={"twice"})
   public void a(){
diff --git a/src/test/java/test/configuration/ConfigurationGroupInvocationCountSampleTest.java b/src/test/java/test/configuration/ConfigurationGroupInvocationCountSampleTest.java
index 2aca7fb..ea41b34 100644
--- a/src/test/java/test/configuration/ConfigurationGroupInvocationCountSampleTest.java
+++ b/src/test/java/test/configuration/ConfigurationGroupInvocationCountSampleTest.java
@@ -8,7 +8,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ConfigurationGroupInvocationCountSampleTest {
-  static List<Integer> m_list = new ArrayList<Integer>();
+  static List<Integer> m_list = new ArrayList<>();
 
   @BeforeGroups(groups={"twice"}, value={"twice"})
   public void a(){
diff --git a/src/test/java/test/configuration/ConfigurationGroups1SampleTest.java b/src/test/java/test/configuration/ConfigurationGroups1SampleTest.java
index 7f1f0fb..ebf2639 100644
--- a/src/test/java/test/configuration/ConfigurationGroups1SampleTest.java
+++ b/src/test/java/test/configuration/ConfigurationGroups1SampleTest.java
@@ -37,7 +37,7 @@ public class ConfigurationGroups1SampleTest {
     log("f1");
   }
 
-  private List<String> m_list = new ArrayList<String>();
+  private List<String> m_list = new ArrayList<>();
 
   @Test(dependsOnGroups = {"cg1-a", "cg1-1"})
   public void verify() {
diff --git a/src/test/java/test/configuration/ConfigurationGroups2SampleTest.java b/src/test/java/test/configuration/ConfigurationGroups2SampleTest.java
index 61124cb..442f5f2 100644
--- a/src/test/java/test/configuration/ConfigurationGroups2SampleTest.java
+++ b/src/test/java/test/configuration/ConfigurationGroups2SampleTest.java
@@ -47,7 +47,7 @@ public class ConfigurationGroups2SampleTest {
     log("g1");
   }
 
-  private List<String> m_list = new ArrayList<String>();
+  private List<String> m_list = new ArrayList<>();
 
   @Test(dependsOnGroups = {"cg2-a", "cg2-1"})
   public void verify() {
diff --git a/src/test/java/test/configuration/ConfigurationGroups3SampleTest.java b/src/test/java/test/configuration/ConfigurationGroups3SampleTest.java
index 85b0a5a..ab30607 100644
--- a/src/test/java/test/configuration/ConfigurationGroups3SampleTest.java
+++ b/src/test/java/test/configuration/ConfigurationGroups3SampleTest.java
@@ -39,7 +39,7 @@ public class ConfigurationGroups3SampleTest extends Base3 {
     log("f1");
   }
 
-  private List<String> m_list = new ArrayList<String>();
+  private List<String> m_list = new ArrayList<>();
 
   @Test(dependsOnGroups = {"cg34-a", "cg34-1"})
   public void verify() {
diff --git a/src/test/java/test/configuration/ConfigurationGroups7SampleTest.java b/src/test/java/test/configuration/ConfigurationGroups7SampleTest.java
index e6fc5a3..448e032 100644
--- a/src/test/java/test/configuration/ConfigurationGroups7SampleTest.java
+++ b/src/test/java/test/configuration/ConfigurationGroups7SampleTest.java
@@ -10,7 +10,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public class ConfigurationGroups7SampleTest {
-  private List<String> m_log = new ArrayList<String>();
+  private List<String> m_log = new ArrayList<>();
 
    @BeforeGroups({"A"})
    private void initA() {
diff --git a/src/test/java/test/configuration/ConfigurationGroups8SampleTest.java b/src/test/java/test/configuration/ConfigurationGroups8SampleTest.java
index 1da1437..ee049c1 100644
--- a/src/test/java/test/configuration/ConfigurationGroups8SampleTest.java
+++ b/src/test/java/test/configuration/ConfigurationGroups8SampleTest.java
@@ -17,7 +17,7 @@ import java.util.List;
  * @date Mar 9, 2006
  */
 public class ConfigurationGroups8SampleTest {
-  private List<String> m_log = new ArrayList<String>();
+  private List<String> m_log = new ArrayList<>();
 
   @Test
   public void dummy() {
diff --git a/src/test/java/test/configuration/ReflectMethodParametrizedConfigurationMethodTest.java b/src/test/java/test/configuration/ReflectMethodParametrizedConfigurationMethodTest.java
index fa60b34..beba936 100644
--- a/src/test/java/test/configuration/ReflectMethodParametrizedConfigurationMethodTest.java
+++ b/src/test/java/test/configuration/ReflectMethodParametrizedConfigurationMethodTest.java
@@ -15,8 +15,8 @@ import java.util.Map;
  * This class/interface
  */
 public class ReflectMethodParametrizedConfigurationMethodTest {
-  private Map<String, String> m_before= new HashMap<String, String>();
-  private Map<String, String> m_after= new HashMap<String, String>();
+  private Map<String, String> m_before= new HashMap<>();
+  private Map<String, String> m_after= new HashMap<>();
 
   @BeforeMethod
   public void beforeMethod(Method tobeInvokedTestMethod) {
diff --git a/src/test/java/test/dependent/DepBugSampleTest.java b/src/test/java/test/dependent/DepBugSampleTest.java
index ebbadef..9d82b8f 100644
--- a/src/test/java/test/dependent/DepBugSampleTest.java
+++ b/src/test/java/test/dependent/DepBugSampleTest.java
@@ -9,7 +9,7 @@ import java.util.List;
 
 @Test
 public class DepBugSampleTest {
-  private static List<String> m_log = new ArrayList<String>();
+  private static List<String> m_log = new ArrayList<>();
 
   private static void log(String s) {
 //    ppp(s);
diff --git a/src/test/java/test/dependent/SD2.java b/src/test/java/test/dependent/SD2.java
index 0b96c2b..372269f 100644
--- a/src/test/java/test/dependent/SD2.java
+++ b/src/test/java/test/dependent/SD2.java
@@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class SD2 {
-  public static List<String> m_log = new ArrayList<String>();
+  public static List<String> m_log = new ArrayList<>();
 
   @Test(groups = { "one" })
   public void oneA() {
diff --git a/src/test/java/test/distributed/DistributedTest.java b/src/test/java/test/distributed/DistributedTest.java
index dd7b8aa..7713671 100644
--- a/src/test/java/test/distributed/DistributedTest.java
+++ b/src/test/java/test/distributed/DistributedTest.java
@@ -26,7 +26,7 @@ import java.util.Random;
 
 public class DistributedTest extends BaseDistributedTest {
 
-  private List<Thread> m_hostThreads = new ArrayList<Thread>();
+  private List<Thread> m_hostThreads = new ArrayList<>();
 
   protected Thread startSlave(final String filename) {
     Thread result = new Thread(new Runnable() {
@@ -160,7 +160,7 @@ public class DistributedTest extends BaseDistributedTest {
   }
 
   private Map<String, ITestResult> toMap(List<ITestResult> results) {
-    Map<String, ITestResult> result = new HashMap<String, ITestResult>();
+    Map<String, ITestResult> result = new HashMap<>();
     for (ITestResult tr : results) {
       result.put(tr.getName(), tr);
     }
diff --git a/src/test/java/test/factory/FactoryTest2.java b/src/test/java/test/factory/FactoryTest2.java
index 3588aa1..9dc100b 100644
--- a/src/test/java/test/factory/FactoryTest2.java
+++ b/src/test/java/test/factory/FactoryTest2.java
@@ -11,7 +11,7 @@ import java.util.Map;
  * @author cbeust
  */
 public class FactoryTest2 {
-  private static Map<Integer, Integer> m_numbers = new HashMap<Integer, Integer>();
+  private static Map<Integer, Integer> m_numbers = new HashMap<>();
   private int m_number;
 
   public FactoryTest2() {
diff --git a/src/test/java/test/factory/FactoryWithDataProvider.java b/src/test/java/test/factory/FactoryWithDataProvider.java
index 2c51978..982df60 100644
--- a/src/test/java/test/factory/FactoryWithDataProvider.java
+++ b/src/test/java/test/factory/FactoryWithDataProvider.java
@@ -18,7 +18,7 @@ public class FactoryWithDataProvider {
 
   @Factory(dataProvider = "dp")
   public Object[] factory(int[] array) {
-    List<Object> result = new ArrayList<Object>();
+    List<Object> result = new ArrayList<>();
     for (int n : array) {
       result.add(new OddTest(n));
     }
diff --git a/src/test/java/test/factory/FactoryWithInstanceInfoTest2.java b/src/test/java/test/factory/FactoryWithInstanceInfoTest2.java
index df116c3..b8ce967 100644
--- a/src/test/java/test/factory/FactoryWithInstanceInfoTest2.java
+++ b/src/test/java/test/factory/FactoryWithInstanceInfoTest2.java
@@ -11,7 +11,7 @@ import java.util.Map;
  * @author cbeust
  */
 public class FactoryWithInstanceInfoTest2 {
-  private static Map<Integer, Integer> m_numbers = new HashMap<Integer, Integer>();
+  private static Map<Integer, Integer> m_numbers = new HashMap<>();
   private int m_number;
 
   public FactoryWithInstanceInfoTest2() {
diff --git a/src/test/java/test/factory/Sample2.java b/src/test/java/test/factory/Sample2.java
index c233c23..97a6dc9 100644
--- a/src/test/java/test/factory/Sample2.java
+++ b/src/test/java/test/factory/Sample2.java
@@ -18,11 +18,11 @@ import java.util.List;
  * @author cbeust
  */
 public class Sample2 {
-  private static List<String> m_methodList = new ArrayList<String>();
+  private static List<String> m_methodList = new ArrayList<>();
 
   @BeforeSuite
   public void init() {
-    m_methodList = new ArrayList<String>();
+    m_methodList = new ArrayList<>();
   }
 
   @BeforeMethod
@@ -53,7 +53,7 @@ public class Sample2 {
         "testImages",
         "tearDown",
     };
-    List<String> expected = new ArrayList<String>();
+    List<String> expected = new ArrayList<>();
     for (String s : expectedStrings) {
       expected.add(s);
     }
diff --git a/src/test/java/test/failures/FailuresTest.java b/src/test/java/test/failures/FailuresTest.java
index 4c35dee..fcef49a 100644
--- a/src/test/java/test/failures/FailuresTest.java
+++ b/src/test/java/test/failures/FailuresTest.java
@@ -44,7 +44,7 @@ public class FailuresTest extends BaseFailuresTest {
   @Test(enabled = false)
   public void shouldIncludeParameters() {
     XmlSuite suite = TestHelper.createSuite("test.failures.Child", getSuiteName());
-    Map<String, String> params = new HashMap<String, String>();
+    Map<String, String> params = new HashMap<>();
     params.put("first-name", "Cedric");
     params.put("last-name", "Beust");
     suite.setParameters(params);
diff --git a/src/test/java/test/groupinvocation/DummyTest.java b/src/test/java/test/groupinvocation/DummyTest.java
index d37a478..2259f4f 100644
--- a/src/test/java/test/groupinvocation/DummyTest.java
+++ b/src/test/java/test/groupinvocation/DummyTest.java
@@ -12,7 +12,7 @@ import java.util.Map;
  * This class/interface
  */
 public class DummyTest {
-  private static Map<String, Integer> s_externalClassGroups= new HashMap<String, Integer>();
+  private static Map<String, Integer> s_externalClassGroups= new HashMap<>();
 
   @Test(groups={"a"})
   public void testA() {
diff --git a/src/test/java/test/inheritance/ZBase_0.java b/src/test/java/test/inheritance/ZBase_0.java
index 08e1fdc..0d79923 100644
--- a/src/test/java/test/inheritance/ZBase_0.java
+++ b/src/test/java/test/inheritance/ZBase_0.java
@@ -9,11 +9,11 @@ import java.util.List;
 
 public class ZBase_0 {
   protected static boolean m_verbose = false;
-  protected static List<String> m_methodList = new ArrayList<String>();
+  protected static List<String> m_methodList = new ArrayList<>();
 
   @BeforeTest
   public void beforeTest() {
-    m_methodList = new ArrayList<String>();
+    m_methodList = new ArrayList<>();
   }
 
   @BeforeMethod
diff --git a/src/test/java/test/interleavedorder/InterleavedInvocationTest.java b/src/test/java/test/interleavedorder/InterleavedInvocationTest.java
index 9fc9f84..e160964 100644
--- a/src/test/java/test/interleavedorder/InterleavedInvocationTest.java
+++ b/src/test/java/test/interleavedorder/InterleavedInvocationTest.java
@@ -14,11 +14,11 @@ import java.util.List;
 
 
 public class InterleavedInvocationTest extends BaseTest {
-  public static List<String> LOG = new ArrayList<String>();
+  public static List<String> LOG = new ArrayList<>();
 
   @BeforeTest
   public void beforeTest() {
-    LOG = new ArrayList<String>();
+    LOG = new ArrayList<>();
   }
 
   private void verifyInvocation(int number, List<String> log, int index) {
diff --git a/src/test/java/test/methodinterceptors/FastTestsFirstInterceptor.java b/src/test/java/test/methodinterceptors/FastTestsFirstInterceptor.java
index ae84fea..87d515c 100644
--- a/src/test/java/test/methodinterceptors/FastTestsFirstInterceptor.java
+++ b/src/test/java/test/methodinterceptors/FastTestsFirstInterceptor.java
@@ -15,10 +15,10 @@ public class FastTestsFirstInterceptor implements IMethodInterceptor {
   public List<IMethodInstance> intercept(List<IMethodInstance> methods,
       ITestContext context)
   {
-    List<IMethodInstance> result = new ArrayList<IMethodInstance>();
+    List<IMethodInstance> result = new ArrayList<>();
     for (IMethodInstance m : methods) {
       Test test = m.getMethod().getMethod().getAnnotation(Test.class);
-      Set<String> groups = new HashSet<String>();
+      Set<String> groups = new HashSet<>();
       for (String group : test.groups()) {
         groups.add(group);
       }
diff --git a/src/test/java/test/methodinterceptors/NullMethodInterceptor.java b/src/test/java/test/methodinterceptors/NullMethodInterceptor.java
index a1ee39d..79936b5 100644
--- a/src/test/java/test/methodinterceptors/NullMethodInterceptor.java
+++ b/src/test/java/test/methodinterceptors/NullMethodInterceptor.java
@@ -10,6 +10,6 @@ import java.util.List;
 public class NullMethodInterceptor implements IMethodInterceptor {
   @Override
   public List<IMethodInstance> intercept(List<IMethodInstance> methods, ITestContext context) {
-    return new ArrayList<IMethodInstance>();
+    return new ArrayList<>();
   }
 }
diff --git a/src/test/java/test/methodinterceptors/RemoveAMethodInterceptor.java b/src/test/java/test/methodinterceptors/RemoveAMethodInterceptor.java
index 89ceae3..b5f9d6f 100644
--- a/src/test/java/test/methodinterceptors/RemoveAMethodInterceptor.java
+++ b/src/test/java/test/methodinterceptors/RemoveAMethodInterceptor.java
@@ -14,7 +14,7 @@ public class RemoveAMethodInterceptor implements IMethodInterceptor {
 
   @Override
   public List<IMethodInstance> intercept(List<IMethodInstance> methods, ITestContext context) {
-    List<IMethodInstance> result = new ArrayList<IMethodInstance>();
+    List<IMethodInstance> result = new ArrayList<>();
 
     for (IMethodInstance method : methods) {
       String name = method.getMethod().getMethodName();
@@ -38,7 +38,7 @@ public class RemoveAMethodInterceptor implements IMethodInterceptor {
   }
 
   public static List<String> getMethodNames(List<IMethodInstance> methods) {
-    List<String> names = new ArrayList<String>();
+    List<String> names = new ArrayList<>();
     for (IMethodInstance m : methods) {
       names.add(m.getMethod().getMethodName());
     }
diff --git a/src/test/java/test/methodselectors/CommandLineTest.java b/src/test/java/test/methodselectors/CommandLineTest.java
index 26cba2a..04e693a 100644
--- a/src/test/java/test/methodselectors/CommandLineTest.java
+++ b/src/test/java/test/methodselectors/CommandLineTest.java
@@ -165,7 +165,7 @@ public class CommandLineTest extends SimpleBaseTest {
   }
 
   private void verifyTests(String title, String[] expected, List<ITestResult> found) {
-    List<String> resultMethods = new ArrayList<String>();
+    List<String> resultMethods = new ArrayList<>();
     for( ITestResult result : found ) {
       resultMethods.add( result.getName() );
     }
diff --git a/src/test/java/test/mustache/MustacheTest.java b/src/test/java/test/mustache/MustacheTest.java
index 79f00f9..3ca4631 100644
--- a/src/test/java/test/mustache/MustacheTest.java
+++ b/src/test/java/test/mustache/MustacheTest.java
@@ -30,11 +30,11 @@ public class MustacheTest {
     }
   }
 
-  private static final List<Person> PEOPLE = new ArrayList<Person>(
-      Arrays.asList(new Person("Carl"), new Person("Christopher")));
+  private static final List<Person> PEOPLE = new ArrayList<>(
+          Arrays.asList(new Person("Carl"), new Person("Christopher")));
 
-  private static final List<Age> AGES = new ArrayList<Age>(
-      Arrays.asList(new Age(42), new Age(43)));
+  private static final List<Age> AGES = new ArrayList<>(
+          Arrays.asList(new Age(42), new Age(43)));
 
   @DataProvider
   public Object[][] dp() {
diff --git a/src/test/java/test/pholser/Captor.java b/src/test/java/test/pholser/Captor.java
index 4e3c8a3..deb7c7c 100644
--- a/src/test/java/test/pholser/Captor.java
+++ b/src/test/java/test/pholser/Captor.java
@@ -21,7 +21,7 @@ public class Captor {
 
   public static void reset() {
 //    System.out.println("@@PHOLSER RESETTING CAPTOR");
-    instance().captives = new ArrayList<String>();
+    instance().captives = new ArrayList<>();
   }
 
   public void capture( String aString ) {
diff --git a/src/test/java/test/sample/BaseSampleInheritance.java b/src/test/java/test/sample/BaseSampleInheritance.java
index 3b35897..a97ece9 100644
--- a/src/test/java/test/sample/BaseSampleInheritance.java
+++ b/src/test/java/test/sample/BaseSampleInheritance.java
@@ -14,7 +14,7 @@ import java.util.List;
  */
 public class BaseSampleInheritance {
 
-  protected List<String> m_configurations = new ArrayList<String>();
+  protected List<String> m_configurations = new ArrayList<>();
 
   protected void addConfiguration(String c) {
     m_configurations.add(c);
diff --git a/src/test/java/test/testng285/BugBase.java b/src/test/java/test/testng285/BugBase.java
index 16d60da..0cdcb4b 100644
--- a/src/test/java/test/testng285/BugBase.java
+++ b/src/test/java/test/testng285/BugBase.java
@@ -12,7 +12,7 @@ public class BugBase {
 
   @BeforeClass
   public void setup() {
-    m_threadIds = new HashSet<Long>();
+    m_threadIds = new HashSet<>();
   }
 
   void log(long threadId) {
diff --git a/src/test/java/test/testng317/VerifyTest.java b/src/test/java/test/testng317/VerifyTest.java
index 37abced..3b415b4 100755
--- a/src/test/java/test/testng317/VerifyTest.java
+++ b/src/test/java/test/testng317/VerifyTest.java
@@ -10,11 +10,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class VerifyTest extends SimpleBaseTest {
-  static List<String> m_methods = new ArrayList<String>();
+  static List<String> m_methods = new ArrayList<>();
 
   @BeforeMethod
   public void before() {
-    m_methods = new ArrayList<String>();
+    m_methods = new ArrayList<>();
   }
 
   @Test
diff --git a/src/test/java/test/testng387/FailedDPTest.java b/src/test/java/test/testng387/FailedDPTest.java
index 8824684..341df5f 100644
--- a/src/test/java/test/testng387/FailedDPTest.java
+++ b/src/test/java/test/testng387/FailedDPTest.java
@@ -24,7 +24,7 @@ public class FailedDPTest {
 	 * */
 	@DataProvider(name = "DP", parallel = true)
 	public Iterator<Integer[]> getData() {
-		List<Integer[]> list = new ArrayList<Integer[]>();
+		List<Integer[]> list = new ArrayList<>();
 		for (int i = 0; i < 10; i++) {
 			list.add(new Integer[] { i });
 		}
diff --git a/src/test/java/test/thread/B.java b/src/test/java/test/thread/B.java
index edf4966..d0a91be 100644
--- a/src/test/java/test/thread/B.java
+++ b/src/test/java/test/thread/B.java
@@ -10,7 +10,7 @@ public class B {
   public static Map<Long, Long> m_threadIds = Maps.newHashMap();
 
   public static void setUp() {
-    m_threadIds = new HashMap<Long, Long>();
+    m_threadIds = new HashMap<>();
   }
 
   @Test
diff --git a/src/test/java/test/thread/Helper.java b/src/test/java/test/thread/Helper.java
index 642cd11..2053a0b 100644
--- a/src/test/java/test/thread/Helper.java
+++ b/src/test/java/test/thread/Helper.java
@@ -4,7 +4,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class Helper {
-  private static Map<String, Map<Long, Long>> m_maps = new HashMap<String, Map<Long, Long>>();
+  private static Map<String, Map<Long, Long>> m_maps = new HashMap<>();
 
   public static Map<Long, Long> getMap(String className) {
     synchronized(m_maps) {
@@ -20,6 +20,6 @@ public class Helper {
   }
 
   public static void reset() {
-    m_maps = new HashMap<String, Map<Long, Long>>();
+    m_maps = new HashMap<>();
   }
 }
diff --git a/src/test/java/test/thread/ParallelTestTest.java b/src/test/java/test/thread/ParallelTestTest.java
index 9335a14..598a6fc 100644
--- a/src/test/java/test/thread/ParallelTestTest.java
+++ b/src/test/java/test/thread/ParallelTestTest.java
@@ -83,7 +83,7 @@ public class ParallelTestTest extends BaseTest {
       maps.add(Helper.getMap(c));
     };
 
-    Map<Long, Long> mergedMap = new HashMap<Long, Long>();
+    Map<Long, Long> mergedMap = new HashMap<>();
     for (Map<Long, Long>m : maps) {
       mergedMap.putAll(m);
     }
diff --git a/src/test/java/test/thread/SequentialTest.java b/src/test/java/test/thread/SequentialTest.java
index 68b41d5..5870507 100644
--- a/src/test/java/test/thread/SequentialTest.java
+++ b/src/test/java/test/thread/SequentialTest.java
@@ -81,7 +81,7 @@ public class SequentialTest extends BaseTest {
         maps[1].keySet().iterator().next().longValue(),
         maps[2].keySet().iterator().next().longValue(),
     };
-    Map<Long, Long> verifyMap = new HashMap<Long, Long>();
+    Map<Long, Long> verifyMap = new HashMap<>();
 
     for (long id : ids) {
       verifyMap.put(id, id);
diff --git a/src/test/java/test/timeout/TimeOutFromXmlTest.java b/src/test/java/test/timeout/TimeOutFromXmlTest.java
index 640230f..15f21a5 100644
--- a/src/test/java/test/timeout/TimeOutFromXmlTest.java
+++ b/src/test/java/test/timeout/TimeOutFromXmlTest.java
@@ -86,7 +86,7 @@ public class TimeOutFromXmlTest extends BaseTest {
     private XmlTest createXmlTest(XmlSuite suite, String name) {
         XmlTest result = new XmlTest(suite);
         result.setName(name);
-        List<XmlClass> classes = new ArrayList<XmlClass>();
+        List<XmlClass> classes = new ArrayList<>();
         XmlClass cls = new XmlClass(TestTimeOutSampleTest.class);
         cls.setIncludedMethods(
             Arrays.asList(new XmlInclude[] { new XmlInclude("timeoutTest") }));
diff --git a/src/test/java/test/tmp/DataDrivenTest.java b/src/test/java/test/tmp/DataDrivenTest.java
index afd88e3..41ddaaa 100644
--- a/src/test/java/test/tmp/DataDrivenTest.java
+++ b/src/test/java/test/tmp/DataDrivenTest.java
@@ -19,7 +19,7 @@ public class DataDrivenTest {
   @DataProvider(name = "provider")
   public Object[][] createData() throws FileNotFoundException, IOException {
     Properties p = new Properties();
-    List<Object> vResult = new ArrayList<Object>();
+    List<Object> vResult = new ArrayList<>();
     p.load(new FileInputStream(new File("c:/t/data.properties")));
     for (Enumeration e = p.keys(); e.hasMoreElements(); ) {
       vResult.add(e.nextElement());
diff --git a/src/test/java/test/tmp/verify/VerifyInterceptor.java b/src/test/java/test/tmp/verify/VerifyInterceptor.java
index 6178c8a..9f15cb0 100644
--- a/src/test/java/test/tmp/verify/VerifyInterceptor.java
+++ b/src/test/java/test/tmp/verify/VerifyInterceptor.java
@@ -29,7 +29,7 @@ public class VerifyInterceptor implements IMethodInterceptor {
   public List<IMethodInstance> intercept(List<IMethodInstance> methods,
       ITestContext context) {
 
-    List<IMethodInstance> result = new ArrayList<IMethodInstance>();
+    List<IMethodInstance> result = new ArrayList<>();
     Map<Class<?>, List<IMethodInstance>> verifyMethods = Maps.newHashMap();
     for (IMethodInstance mi : methods) {
       ITestNGMethod tm = mi.getMethod();
@@ -48,7 +48,7 @@ public class VerifyInterceptor implements IMethodInterceptor {
    * @return all the @Verify methods found on @code{realClass}
    */
   private List<IMethodInstance> findVerifyMethods(Class realClass, final ITestNGMethod tm) {
-    List<IMethodInstance> result = new ArrayList<IMethodInstance>();
+    List<IMethodInstance> result = new ArrayList<>();
     for (final Method m : realClass.getDeclaredMethods()) {
       Annotation a = m.getAnnotation(Verify.class);
       if (a != null) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git



More information about the pkg-java-commits mailing list