vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-29 07:22:07 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Florian Schmaus 2024-04-02 18:53:34 +02:00
commit e3d12eed94
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,7 +50,7 @@ public abstract class AbstractSmackLowLevelIntegrationTest extends AbstractSmack
* Get a connected connection. Note that this method will return a connection constructed via the default connection * 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 * 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 * 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. * <p> Please ensure that you invoke {@link #recycle(AbstractXMPPConnection connection)} once you are done with this connection.
* *

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

@ -302,7 +302,7 @@ public final class Configuration {
this.accountOneUsername = StringUtils.requireNotNullNorEmpty(accountOneUsername, "accountOneUsername must not be null nor empty"); 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.accountOnePassword = StringUtils.requireNotNullNorEmpty(accountOnePassword, "accountOnePassword must not be null nor empty");
this.accountTwoUsername = StringUtils.requireNotNullNorEmpty(accountTwoUsername, "accountTwoUsername 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.accountThreeUsername = StringUtils.requireNotNullNorEmpty(accountThreeUsername, "accountThreeUsername must not be null nor empty");
this.accountThreePassword = StringUtils.requireNotNullNorEmpty(accountThreePassword, "accountThreePassword must not be null nor empty"); this.accountThreePassword = StringUtils.requireNotNullNorEmpty(accountThreePassword, "accountThreePassword must not be null nor empty");
return this; return this;
@ -509,7 +509,7 @@ public final class Configuration {
String debugString = properties.getProperty("debug"); String debugString = properties.getProperty("debug");
if (debugString != null) { 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(debugString);
} }
builder.setDebugger(properties.getProperty("debugger")); builder.setDebugger(properties.getProperty("debugger"));

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

@ -289,7 +289,7 @@ public class SmackIntegrationTestFramework {
} }
if (config.isClassDisabled(testClass)) { 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); testRunResult.disabledTestClasses.add(disabledTestClass);
continue; continue;
} }
@ -491,7 +491,7 @@ public class SmackIntegrationTestFramework {
return; return;
} }
Throwable nonFatalFailureReason; 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() // thrown up, as it would be done by throwFatalException()
if (cause instanceof AssertionError) { if (cause instanceof AssertionError) {
nonFatalFailureReason = cause; nonFatalFailureReason = cause;
@ -591,8 +591,8 @@ public class SmackIntegrationTestFramework {
throw (InterruptedException) e; throw (InterruptedException) e;
} }
// We handle NullPointerException as a non fatal exception, as they are mostly caused by an invalid reply where // 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 // an extension element is missing. Consider for example
// assertEquals(StanzaError.Condition.foo, response.getError().getCondition()) // assertEquals(StanzaError.Condition.foo, response.getError().getCondition())
// Otherwise NPEs could be caused by an internal bug in Smack, e.g. missing null handling. // Otherwise NPEs could be caused by an internal bug in Smack, e.g. missing null handling.
if (e instanceof NullPointerException) { if (e instanceof NullPointerException) {
@ -610,9 +610,9 @@ public class SmackIntegrationTestFramework {
public static final class TestRunResult { 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 * 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); public final String testRunId = StringUtils.insecureRandomString(5).toLowerCase(Locale.US);

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

@ -249,7 +249,7 @@
* the required XMPP feature. If it does not, simply throw a <code>TestNotPossibleException</code>. * the required XMPP feature. If it does not, simply throw a <code>TestNotPossibleException</code>.
* </p> * </p>
* <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>@SmackIntegrationTest</code>. If the test method is not able to perform a test then it should throw a
* <code>TestNotPossibleException</code>. * <code>TestNotPossibleException</code>.
* </p> * </p>
@ -266,7 +266,7 @@
* </p> * </p>
* <h3>Low-Level Integration Tests</h3> * <h3>Low-Level Integration Tests</h3>
* <p> * <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 * {@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 * 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 * automatically create, register and login the connections. After the test is finished, the connections will be