fix few typos

Author: asolntsev

CHANGES.txt

@@ -1322,7 +1322,7 @@ Added: comand line support for setting parallel mode, suite and test names
 Eclipse plug-in
 Added: Support for configuring per project usedefaultlisteners
 Added: Contextual drop-down menu on failures tab of the TestNG view to enable running/debugging method failure only
-Added: Suppport for configuring per project TestNG jar usage (project provided one or plugin provided one)
+Added: Support for configuring per project TestNG jar usage (project provided one or plugin provided one)
 
 ===========================================================================
 5.2

testng-core-api/src/main/java/org/testng/IConfigurationListener2.java

@@ -1,6 +1,6 @@
 package org.testng;
 
-// WARNING: Donot delete this interface. This is internally being referred to by Gradle here
+// WARNING: Do not delete this interface. This is internally being referred to by Gradle here
 // https://github.com/gradle/gradle/blob/f0b9d60906c7b8c42cd6c61a39ae7b74767bb012/subprojects/testing-jvm/src/main/java/org/gradle/api/internal/tasks/testing/testng/TestNGListenerAdapterFactory.java#L37-L49
 /** @deprecated As of release 7.0.0, replaced by {@link org.testng.IConfigurationListener} */
 @Deprecated

testng-core-api/src/main/java/org/testng/Reporter.java

@@ -75,7 +75,7 @@ private static synchronized void log(String s, ITestResult m) {
     }
 
     if (m == null) {
-      // Persist the output temporarily into a Threadlocal String list.
+      // Persist the output temporarily into a ThreadLocal String list.
       if (m_orphanedOutput.get() == null) {
         m_orphanedOutput.set(new ArrayList<>());
       }

testng-core-api/src/main/java/org/testng/annotations/AfterSuite.java

@@ -72,9 +72,9 @@
 
   /**
    * The maximum number of milliseconds this method should take. If it hasn't returned after this
-   * time, this method will fail and it will cause test methods depending on it to be skipped.
+   * time, this method will fail, and it will cause test methods depending on it to be skipped.
    *
-   * @return the valude (default 0)
+   * @return the value (default 0)
    */
   long timeOut() default 0;
 }

testng-core-api/src/main/java/org/testng/annotations/Factory.java

@@ -21,7 +21,7 @@
   String dataProvider() default "";
 
   /**
-   * The class where to look for the data provider. If not specified, the dataprovider will be
+   * The class where to look for the data provider. If not specified, the data provider will be
    * looked on the class of the current test method or one of its super classes. If this attribute
    * is specified, the data provider method needs to be static on the specified class.
    *

testng-core-api/src/main/java/org/testng/annotations/Test.java

@@ -96,7 +96,7 @@
   String dataProvider() default "";
 
   /**
-   * The class where to look for the data provider. If not specified, the dataprovider will be
+   * The class where to look for the data provider. If not specified, the data provider will be
    * looked on the class of the current test method or one of its super classes. If this attribute
    * is specified, the data provider method needs to be static on the specified class.
    *

testng-core-api/src/main/java/org/testng/internal/PropertyUtils.java

@@ -89,7 +89,7 @@ public static void setProperty(Object instance, String name, String value) {
     }
 
     Object realValue = convertType(propClass, value, name);
-    // TODO: Here the property desc is serched again
+    // TODO: Here the property desc is searched again
     setPropertyRealValue(instance, name, realValue);
   }
 
@@ -130,7 +130,7 @@ private static PropertyDescriptor getPropertyDescriptor(
   public static void setPropertyRealValue(Object instance, String name, Object value) {
     if (instance == null) {
       LOGGER.warn(
-          "Cannot set property " + name + " with value " + value + ". Targe instance is null");
+          "Cannot set property " + name + " with value " + value + ". Target instance is null");
       return;
     }
 

testng-core-api/src/main/java/org/testng/xml/IWeaveXml.java

@@ -1,6 +1,6 @@
 package org.testng.xml;
 
-/** Represents the capabilities of a XML serialiser (As string) */
+/** Represents the capabilities of a XML serializer (As string) */
 public interface IWeaveXml {
   /**
    * Helps represent the contents of {@link XmlSuite} as a String.

testng-core-api/src/main/java/org/testng/xml/XmlWeaver.java

@@ -14,7 +14,7 @@ private XmlWeaver() {}
 
   private static IWeaveXml getInstance() {
     if (testMode) {
-      // Donot resort to caching when running Unit tests for TestNG, because we have to check
+      // Do not resort to caching when running Unit tests for TestNG, because we have to check
       // both implementations. If we cache the instance, then its not possible to do that.
       return attemptDefaultImplementationInstantiation();
     }

testng-core/src/main/java/org/testng/SuiteRunnerWorker.java

@@ -158,10 +158,10 @@ public void calculateResultCounts(XmlSuite xmlSuite, SuiteRunnerMap suiteRunnerM
     for (ISuiteResult isr : tempSuiteResult) {
       ITestContext ctx = isr.getTestContext();
       int passes = ctx.getPassedTests().size();
-      Map<String, Integer> seggregated = seggregateSkippedTests(ctx);
-      int skipped = seggregated.get(SKIPPED);
+      Map<String, Integer> segregated = seggregateSkippedTests(ctx);
+      int skipped = segregated.get(SKIPPED);
       m_skipped += skipped;
-      int retried = seggregated.get(RETRIED);
+      int retried = segregated.get(RETRIED);
       m_retries += retried;
       int failed =
           ctx.getFailedTests().size() + ctx.getFailedButWithinSuccessPercentageTests().size();

testng-core/src/main/java/org/testng/TimeBombSkipException.java

@@ -13,7 +13,7 @@
  * a time trigger.
  *
  * <p>By default the time format is yyyy/MM/dd (according to {@code SimpleDateFormat}). You can
- * customize this by using the specialized constructors. Suppported date formats are according to
+ * customize this by using the specialized constructors. Supported date formats are according to
  * the {@code SimpleDateFormat}.
  *
  * @since 5.6
@@ -41,7 +41,7 @@ public TimeBombSkipException(String msg, Date expirationDate) {
 
   /**
    * Creates a {@code TimeBombedSkipException} using the <code>expirationDate</code>. The <code>
-   * format</code> parameter wiil be used for performing the time comparison.
+   * format</code> parameter will be used for performing the time comparison.
    *
    * @param msg exception message
    * @param expirationDate time limit after which the SKIP becomes a FAILURE
@@ -112,7 +112,7 @@ public TimeBombSkipException(String msg, Date expirationDate, Throwable cause) {
 
   /**
    * Creates a {@code TimeBombedSkipException} using the <code>expirationDate</code>. The <code>
-   * format</code> parameter wiil be used for performing the time comparison.
+   * format</code> parameter will be used for performing the time comparison.
    *
    * @param msg exception message
    * @param expirationDate time limit after which the SKIP becomes a FAILURE

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

@@ -374,13 +374,13 @@ protected void initGroups(Class<? extends ITestOrConfiguration> annotationClass)
   protected void initBeforeAfterGroups(
       Class<? extends ITestOrConfiguration> annotationClass, String[] groups) {
     String[] groupsAtMethodLevel =
-        calculateGroupsTouseConsideringValuesAndGroupValues(annotationClass, groups);
+        calculateGroupsToUseConsideringValuesAndGroupValues(annotationClass, groups);
     // @BeforeGroups and @AfterGroups annotation cannot be used at Class level. So its always null
     setGroups(getStringArray(groupsAtMethodLevel, null));
     initRestOfGroupDependencies(annotationClass);
   }
 
-  private String[] calculateGroupsTouseConsideringValuesAndGroupValues(
+  private String[] calculateGroupsToUseConsideringValuesAndGroupValues(
       Class<? extends ITestOrConfiguration> annotationClass, String[] groups) {
     if (groups == null || groups.length == 0) {
       ITestOrConfiguration annotation =

testng-core/src/main/java/org/testng/internal/Parameters.java

@@ -234,8 +234,8 @@ private static List<Object> createParams(
       XmlSuite xmlSuite) {
     List<Object> vResult = Lists.newArrayList();
     if (optionalValues.length != parameterNames.length) {
-      FilterOutInJectedTypesResult filterOutResult =
-          filterOutInJectedTypesFromOptionalValues(parameterTypes, optionalValues);
+      FilterOutInjectedTypesResult filterOutResult =
+          filterOutInjectedTypesFromOptionalValues(parameterTypes, optionalValues);
       optionalValues = filterOutResult.getOptionalValues();
       parameterTypes = filterOutResult.getParameterTypes();
     }
@@ -277,9 +277,9 @@ private static List<Object> createParams(
    *
    * @param parameterTypes - The parameter types to be used
    * @param optionalValues - The optional values to be considered.
-   * @return FilterOutInJectedTypesResult
+   * @return FilterOutInjectedTypesResult
    */
-  static FilterOutInJectedTypesResult filterOutInJectedTypesFromOptionalValues(
+  static FilterOutInjectedTypesResult filterOutInjectedTypesFromOptionalValues(
       Class<?>[] parameterTypes, String[] optionalValues) {
     List<Class<?>> typeList = Lists.newArrayList(parameterTypes);
     List<String> optionalValueList = Lists.newArrayList(optionalValues);
@@ -293,16 +293,16 @@ static FilterOutInJectedTypesResult filterOutInJectedTypesFromOptionalValues(
         typeIterator.remove();
       }
     }
-    return new FilterOutInJectedTypesResult(
+    return new FilterOutInjectedTypesResult(
         typeList.toArray(new Class<?>[0]), optionalValueList.toArray(new String[0]));
   }
 
   /** Store the result of parameterTypes and optionalValues after filter out injected types */
-  static final class FilterOutInJectedTypesResult {
+  static final class FilterOutInjectedTypesResult {
     private final Class<?>[] parameterTypes;
     private final String[] optionalValues;
 
-    private FilterOutInJectedTypesResult(Class<?>[] parameterTypes, String[] optionalValues) {
+    private FilterOutInjectedTypesResult(Class<?>[] parameterTypes, String[] optionalValues) {
       this.parameterTypes = parameterTypes;
       this.optionalValues = optionalValues;
     }
@@ -790,7 +790,7 @@ public static ParameterHolder handleParameters(
         initParams =
             MethodInvocationHelper.invokeDataProvider(
                 dataProviderMethod
-                    .getInstance(), /* a test instance or null if the dataprovider is static*/
+                    .getInstance(), /* a test instance or null if the data provider is static*/
                 dataProviderMethod.getMethod(),
                 testMethod,
                 methodParams.context,

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

@@ -109,32 +109,32 @@ public String toString() {
   public void run() {
     this.currentThreadId = Thread.currentThread().getId();
     if (RuntimeBehavior.enforceThreadAffinity()
-        && doesTaskHavePreRequistes()
+        && doesTaskHavePreRequisites()
         && currentThreadId != threadIdToRunOn) {
       completed = false;
       return;
     }
 
-    for (IMethodInstance testMthdInst : m_methodInstances) {
-      ITestNGMethod testMethod = testMthdInst.getMethod();
+    for (IMethodInstance testMethdInstance : m_methodInstances) {
+      ITestNGMethod testMethod = testMethdInstance.getMethod();
       if (canInvokeBeforeClassMethods()) {
         synchronized (testMethod.getInstance()) {
-          invokeBeforeClassMethods(testMethod.getTestClass(), testMthdInst);
+          invokeBeforeClassMethods(testMethod.getTestClass(), testMethdInstance);
         }
       }
 
       // Invoke test method
       try {
-        invokeTestMethods(testMethod, testMthdInst.getInstance());
+        invokeTestMethods(testMethod, testMethdInstance.getInstance());
       } finally {
         synchronized (testMethod.getInstance()) {
-          invokeAfterClassMethods(testMethod.getTestClass(), testMthdInst);
+          invokeAfterClassMethods(testMethod.getTestClass(), testMethdInstance);
         }
       }
     }
   }
 
-  private boolean doesTaskHavePreRequistes() {
+  private boolean doesTaskHavePreRequisites() {
     return threadIdToRunOn != -1;
   }
 

testng-core/src/main/java/org/testng/junit/JUnit4TestRunner.java

@@ -22,9 +22,9 @@ public class JUnit4TestRunner implements IJUnitTestRunner {
   private final ITestObjectFactory objectFactory;
   private final ITestResultNotifier m_parentRunner;
   private final List<ITestListener> m_listeners;
-  private List<ITestNGMethod> m_methods = Lists.newArrayList();
+  private final List<ITestNGMethod> m_methods = Lists.newArrayList();
   private Collection<IInvokedMethodListener> m_invokeListeners = Lists.newArrayList();
-  private Map<Description, ITestResult> m_findedMethods = new WeakHashMap<>();
+  private final Map<Description, ITestResult> m_foundMethods = new WeakHashMap<>();
 
   public JUnit4TestRunner(ITestObjectFactory objectFactory, ITestResultNotifier tr) {
     this.objectFactory = objectFactory;
@@ -80,7 +80,7 @@ public boolean shouldRun(Description description) {
                   if (methods.length == 0) {
                     if (description.getTestClass() != null) {
                       ITestResult tr = createTestResult(objectFactory, description);
-                      m_findedMethods.put(description, tr);
+                      m_foundMethods.put(description, tr);
                     }
                     // run everything
                     return true;
@@ -89,7 +89,7 @@ public boolean shouldRun(Description description) {
                     Pattern p = Pattern.compile(m);
                     if (p.matcher(description.getMethodName()).matches()) {
                       ITestResult tr = createTestResult(objectFactory, description);
-                      m_findedMethods.put(description, tr);
+                      m_foundMethods.put(description, tr);
                       return true;
                     }
                   }
@@ -113,7 +113,7 @@ private class RL extends RunListener {
     @Override
     public void testAssumptionFailure(Failure failure) {
       notified.add(failure.getDescription());
-      ITestResult tr = m_findedMethods.get(failure.getDescription());
+      ITestResult tr = m_foundMethods.get(failure.getDescription());
       validate(tr, failure.getDescription());
       runAfterInvocationListeners(tr);
       tr.setStatus(TestResult.SKIP);
@@ -135,7 +135,7 @@ public void testFailure(Failure failure) throws Exception {
         return;
       }
       notified.add(failure.getDescription());
-      ITestResult tr = m_findedMethods.get(failure.getDescription());
+      ITestResult tr = m_foundMethods.get(failure.getDescription());
       if (tr == null) {
         // Not a test method, should be a config
         tr = createTestResult(objectFactory, failure.getDescription());
@@ -163,7 +163,7 @@ public void testFailure(Failure failure) throws Exception {
 
     @Override
     public void testFinished(Description description) throws Exception {
-      ITestResult tr = m_findedMethods.get(description);
+      ITestResult tr = m_foundMethods.get(description);
       validate(tr, description);
       runAfterInvocationListeners(tr);
       if (!notified.contains(description)) {
@@ -181,7 +181,7 @@ public void testFinished(Description description) throws Exception {
     public void testIgnored(Description description) throws Exception {
       if (!notified.contains(description)) {
         notified.add(description);
-        ITestResult tr = m_findedMethods.get(description);
+        ITestResult tr = m_foundMethods.get(description);
         validate(tr, description);
         runAfterInvocationListeners(tr);
         tr.setStatus(TestResult.SKIP);
@@ -202,7 +202,7 @@ public void testRunStarted(Description description) throws Exception {}
 
     @Override
     public void testStarted(Description description) throws Exception {
-      ITestResult tr = m_findedMethods.get(description);
+      ITestResult tr = m_foundMethods.get(description);
       validate(tr, description);
       for (ITestListener l : m_listeners) {
         l.onTestStart(tr);

testng-core/src/main/java/org/testng/reporters/util/StackTraceTools.java

@@ -40,7 +40,7 @@ public static int getTestRoot(StackTraceElement[] stack, ITestNGMethod method) {
    * @return topmost position of the test method in the stack, or top of stack if <code>method
    *     </code> is not in it.
    */
-  public static StackTraceElement[] getTestNGInstrastructure(
+  public static StackTraceElement[] getTestNGInfrastructure(
       StackTraceElement[] stack, ITestNGMethod method) {
     if (method == null || stack == null) {
       return new StackTraceElement[] {};

testng-core/src/test/java/org/testng/internal/ParametersTest.java

@@ -5,7 +5,7 @@
 import org.testng.annotations.Optional;
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
-import org.testng.internal.Parameters.FilterOutInJectedTypesResult;
+import org.testng.internal.Parameters.FilterOutInjectedTypesResult;
 import org.testng.internal.annotations.JDK15AnnotationFinder;
 import org.testng.xml.XmlTest;
 
@@ -19,8 +19,8 @@ public void filterOutInJectedTypesFromOptionalValuesTest(
       XmlTest xmlTest, @Optional("optionaltestdata") String testdata) {
     JDK15AnnotationFinder finder = new JDK15AnnotationFinder(null);
     Method curMethod = new Object() {}.getClass().getEnclosingMethod();
-    FilterOutInJectedTypesResult filterOutResult =
-        org.testng.internal.Parameters.filterOutInJectedTypesFromOptionalValues(
+    FilterOutInjectedTypesResult filterOutResult =
+        org.testng.internal.Parameters.filterOutInjectedTypesFromOptionalValues(
             curMethod.getParameterTypes(), finder.findOptionalValues(curMethod));
     Assert.assertEquals(filterOutResult.getOptionalValues()[0], "optionaltestdata");
     Assert.assertEquals(filterOutResult.getParameterTypes()[0], String.class);