Merge remote-tracking branch 'origin/master'

smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackLowLevelIntegrationTest.java

@@ -50,7 +50,7 @@ protected AbstractSmackLowLevelIntegrationTest(SmackIntegrationTestEnvironment e
      * Get a connected connection. Note that this method will return a connection constructed via the default connection
      * descriptor. It is primarily meant for integration tests to discover if the XMPP service supports a certain
      * feature, that the integration test requires to run. This feature discovery is typically done in the constructor of the
-     * integration tests. And if the discovery fails a {@link TestNotPossibleException} should be thrown by he constructor.
+     * integration tests. And if the discovery fails a {@link TestNotPossibleException} should be thrown by the constructor.
      *
      * <p> Please ensure that you invoke {@link #recycle(AbstractXMPPConnection connection)} once you are done with this connection.
      *

smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/Configuration.java

@@ -302,7 +302,7 @@ public Builder setUsernamesAndPassword(String accountOneUsername, String account
             this.accountOneUsername = StringUtils.requireNotNullNorEmpty(accountOneUsername, "accountOneUsername must not be null nor empty");
             this.accountOnePassword = StringUtils.requireNotNullNorEmpty(accountOnePassword, "accountOnePassword must not be null nor empty");
             this.accountTwoUsername = StringUtils.requireNotNullNorEmpty(accountTwoUsername, "accountTwoUsername must not be null nor empty");
-            this.accountTwoPassword = StringUtils.requireNotNullNorEmpty(accountTwoPassword, "accountTwoPasswordmust not be null nor empty");
+            this.accountTwoPassword = StringUtils.requireNotNullNorEmpty(accountTwoPassword, "accountTwoPassword must not be null nor empty");
             this.accountThreeUsername = StringUtils.requireNotNullNorEmpty(accountThreeUsername, "accountThreeUsername must not be null nor empty");
             this.accountThreePassword = StringUtils.requireNotNullNorEmpty(accountThreePassword, "accountThreePassword must not be null nor empty");
             return this;
@@ -509,7 +509,7 @@ public static Configuration newConfiguration(String[] testPackages)
 
         String debugString = properties.getProperty("debug");
         if (debugString != null) {
-            LOGGER.warning("Usage of depreacted 'debug' option detected, please use 'debugger' instead");
+            LOGGER.warning("Usage of deprecated 'debug' option detected, please use 'debugger' instead");
             builder.setDebugger(debugString);
         }
         builder.setDebugger(properties.getProperty("debugger"));

smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java

@@ -289,7 +289,7 @@ private void runTests(Set<Class<? extends AbstractSmackIntTest>> classes)
             }
 
             if (config.isClassDisabled(testClass)) {
-                DisabledTestClass disabledTestClass = new DisabledTestClass(testClass, "Skipping test class " + testClassName + " because it is disalbed");
+                DisabledTestClass disabledTestClass = new DisabledTestClass(testClass, "Skipping test class " + testClassName + " because it is disabled");
                 testRunResult.disabledTestClasses.add(disabledTestClass);
                 continue;
             }
@@ -491,7 +491,7 @@ private void runConcreteTest(ConcreteTest concreteTest)
                 return;
             }
             Throwable nonFatalFailureReason;
-            // junit assert's throw an AssertionError if they fail, those should not be
+            // junit asserts throw an AssertionError if they fail, those should not be
             // thrown up, as it would be done by throwFatalException()
             if (cause instanceof AssertionError) {
                 nonFatalFailureReason = cause;
@@ -591,8 +591,8 @@ private static Exception throwFatalException(Throwable e) throws Error, NoRespon
             throw (InterruptedException) e;
         }
 
-        // We handle NullPointerException as a non fatal exception, as they are mostly caused by an invalid reply where
-        // a extension element is missing. Consider for example
+        // We handle NullPointerException as a non-fatal exception, as they are mostly caused by an invalid reply where
+        // an extension element is missing. Consider for example
         // assertEquals(StanzaError.Condition.foo, response.getError().getCondition())
         // Otherwise NPEs could be caused by an internal bug in Smack, e.g. missing null handling.
         if (e instanceof NullPointerException) {
@@ -610,9 +610,9 @@ private static Exception throwFatalException(Throwable e) throws Error, NoRespon
     public static final class TestRunResult {
 
         /**
-         * A short String of lowercase characters and numbers used to identify a integration test
+         * A short String of lowercase characters and numbers used to identify an integration test
          * run. We use lowercase characters because this string will eventually be part of the
-         * localpart of the used JIDs (and the localpart is case insensitive).
+         * localpart of the used JIDs (and the localpart is case-insensitive).
          */
         public final String testRunId = StringUtils.insecureRandomString(5).toLowerCase(Locale.US);
 

smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/package-info.java

@@ -249,7 +249,7 @@
  * the required XMPP feature. If it does not, simply throw a <code>TestNotPossibleException</code>.
  * </p>
  * <p>
- * Test methods must be <code>public</code>, take zero arguments i.e. declare no parameters and be annoated with
+ * Test methods must be <code>public</code>, take zero arguments i.e. declare no parameters and be annotated with
  * <code>@SmackIntegrationTest</code>. If the test method is not able to perform a test then it should throw a
  * <code>TestNotPossibleException</code>.
  * </p>
@@ -266,7 +266,7 @@
  * </p>
  * <h3>Low-Level Integration Tests</h3>
  * <p>
- * Classes that implement low-level integration tests need to sublcass
+ * Classes that implement low-level integration tests need to subclass
  * {@link org.igniterealtime.smack.inttest.AbstractSmackLowLevelIntegrationTest}. The test methods can declare as many
  * parameters as they need to, but every parameter must be of type <code>XMPPTCPConnection</code>. The framework will
  * automatically create, register and login the connections. After the test is finished, the connections will be