mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2025-12-08 14:11:07 +01:00
Bump ErrorProne to 2.5.1 and refactor Providers a bit
This also resulted in a refactoring of the Providers and parsing Exceptions. NumberFormatException and ParseException can now be thrown directly, the wrapping in a SmackParsingException is down at a higher layer, i.e. in AbstractProvider.
This commit is contained in:
parent
1df0763f92
commit
a7b3303f3e
136 changed files with 574 additions and 551 deletions
|
|
@ -53,7 +53,7 @@ public class ConnectionConfigurationTest {
|
|||
|
||||
private static final class DummyConnectionConfiguration extends ConnectionConfiguration {
|
||||
|
||||
protected DummyConnectionConfiguration(Builder builder) {
|
||||
DummyConnectionConfiguration(Builder builder) {
|
||||
super(builder);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,17 +20,14 @@ import static org.junit.Assert.assertEquals;
|
|||
|
||||
import java.util.Map;
|
||||
|
||||
import org.jivesoftware.smack.packet.StanzaError.Condition;
|
||||
import org.jivesoftware.smack.packet.StanzaError.Type;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
public class XMPPErrorTest {
|
||||
@Test
|
||||
public void testConditionHasDefaultTypeMapping() throws NoSuchFieldException, IllegalAccessException {
|
||||
Map<Condition, Type> conditionToTypeMap = StanzaError.CONDITION_TO_TYPE;
|
||||
Map<StanzaError.Condition, StanzaError.Type> conditionToTypeMap = StanzaError.CONDITION_TO_TYPE;
|
||||
assertEquals("CONDITION_TO_TYPE map is likely out of sync with Condition enum",
|
||||
Condition.values().length,
|
||||
StanzaError.Condition.values().length,
|
||||
conditionToTypeMap.size());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,70 @@
|
|||
/**
|
||||
*
|
||||
* Copyright 2021 Florian Schmaus.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.jivesoftware.smack.provider;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.text.ParseException;
|
||||
|
||||
import org.jivesoftware.smack.packet.ExtensionElement;
|
||||
import org.jivesoftware.smack.packet.XmlEnvironment;
|
||||
import org.jivesoftware.smack.parsing.SmackParsingException;
|
||||
import org.jivesoftware.smack.test.util.SmackTestUtil;
|
||||
import org.jivesoftware.smack.xml.XmlPullParser;
|
||||
import org.jivesoftware.smack.xml.XmlPullParserException;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
public class AbstractProviderTest {
|
||||
|
||||
private static final ExtensionElementProvider<ExtensionElement> NUMBER_FORMAT_THROWING_PROVIDER = new ExtensionElementProvider<ExtensionElement>() {
|
||||
@Override
|
||||
public ExtensionElement parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)
|
||||
throws XmlPullParserException, IOException, SmackParsingException, ParseException {
|
||||
throw new NumberFormatException();
|
||||
}
|
||||
};
|
||||
|
||||
private static final String MESSAGE = "dummy message";
|
||||
private static final int VALUE = 14768234;
|
||||
private static final ExtensionElementProvider<ExtensionElement> PARSE_EXCEPTION_THROWING_PROVIDER = new ExtensionElementProvider<ExtensionElement>() {
|
||||
@Override
|
||||
public ExtensionElement parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment)
|
||||
throws XmlPullParserException, IOException, SmackParsingException, ParseException {
|
||||
throw new ParseException(MESSAGE, VALUE);
|
||||
}
|
||||
};
|
||||
|
||||
@Test
|
||||
public void testWrapsNumberFormatException() throws XmlPullParserException, IOException {
|
||||
XmlPullParser parser = SmackTestUtil.createDummyParser();
|
||||
assertThrows(AbstractProvider.NumberFormatParseException.class,
|
||||
() -> NUMBER_FORMAT_THROWING_PROVIDER.parse(parser));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWrapsParseException() throws XmlPullParserException, IOException {
|
||||
XmlPullParser parser = SmackTestUtil.createDummyParser();
|
||||
AbstractProvider.TextParseException testParseException = assertThrows(AbstractProvider.TextParseException.class,
|
||||
() -> PARSE_EXCEPTION_THROWING_PROVIDER.parse(parser));
|
||||
ParseException parseException = testParseException.getParseException();
|
||||
assertEquals(MESSAGE, parseException.getMessage());
|
||||
assertEquals(VALUE, parseException.getErrorOffset());
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue