mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-22 10:37:59 +01:00
SINT: MAM test does not require XEP-0441
The MAM integration test setup attepts to set MAM preferences (XEP-0441). When a server does not support this XEP, the setup phase errors out, preventing the tests from being executed. There is no functional reason why tests shouldn't be run when XEP-0441 is not supported: the tests can run against the default configuration of the MAM service. This commit ignores feature-not-implemented errors when MAM preferences are set. [Ignore only feature-not-implemented errors, log ignored errors) Modified-by: Florian Schmaus <flo@geekplace.eu>
This commit is contained in:
parent
e6433a6870
commit
252cea1149
1 changed files with 14 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* Copyright 2016 Fernando Ramirez, 2018-2020 Florian Schmaus
|
* Copyright 2016 Fernando Ramirez, 2018-2021 Florian Schmaus
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.TimeoutException;
|
import java.util.concurrent.TimeoutException;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import org.jivesoftware.smack.SmackException.NoResponseException;
|
import org.jivesoftware.smack.SmackException.NoResponseException;
|
||||||
import org.jivesoftware.smack.SmackException.NotConnectedException;
|
import org.jivesoftware.smack.SmackException.NotConnectedException;
|
||||||
|
@ -33,7 +34,7 @@ import org.jivesoftware.smack.filter.MessageWithBodiesFilter;
|
||||||
import org.jivesoftware.smack.packet.Message;
|
import org.jivesoftware.smack.packet.Message;
|
||||||
import org.jivesoftware.smack.packet.Stanza;
|
import org.jivesoftware.smack.packet.Stanza;
|
||||||
import org.jivesoftware.smack.packet.StanzaBuilder;
|
import org.jivesoftware.smack.packet.StanzaBuilder;
|
||||||
|
import org.jivesoftware.smack.packet.StanzaError;
|
||||||
import org.jivesoftware.smackx.mam.MamManager.MamQuery;
|
import org.jivesoftware.smackx.mam.MamManager.MamQuery;
|
||||||
import org.jivesoftware.smackx.mam.MamManager.MamQueryArgs;
|
import org.jivesoftware.smackx.mam.MamManager.MamQueryArgs;
|
||||||
|
|
||||||
|
@ -59,7 +60,17 @@ public class MamIntegrationTest extends AbstractSmackIntegrationTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Make sure MAM is archiving messages.
|
// Make sure MAM is archiving messages.
|
||||||
|
try {
|
||||||
mamManagerConTwo.enableMamForAllMessages();
|
mamManagerConTwo.enableMamForAllMessages();
|
||||||
|
} catch (XMPPErrorException e) {
|
||||||
|
// Note that we check for feature-not-implemented (and not service-unavailable), as the server understand
|
||||||
|
// the MAM namespace, but may not the <prefs/> IQ.
|
||||||
|
if (e.getStanzaError().getCondition() != StanzaError.Condition.feature_not_implemented) {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGGER.log(Level.INFO, conTwo.getXMPPServiceDomain() + " doesn't support XEP-0441: Message Archive Management Preferences", e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SmackIntegrationTest
|
@SmackIntegrationTest
|
||||||
|
|
Loading…
Reference in a new issue