Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-12-10 23:21:07 +01:00
Code Issues Releases Wiki Activity

Re-activate all ignored unit-tests

Browse source 
Make all unit tests functional again.
This commit is contained in:
Florian Schmaus 2014-03-10 21:48:46 +01:00
parent a6ed3b2514
commit 4fb5b85806
15 changed files with 112 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/src/main/java/org/jivesoftware/smack/ChatManager.java
View file

@ -43,17 +43,17 @@ import org.jivesoftware.smack.util.collections.ReferenceMap;
* @author Alexander Wenckus
*/
public class ChatManager {
/*
/**
* Sets the default behaviour for allowing 'normal' messages to be used in chats. As some clients don't set
* the message type to chat, the type normal has to be accepted to allow chats with these clients.
*/
private static boolean defaultIsNormalInclude = true;
/*
/**
* Sets the default behaviour for how to match chats when there is NO thread id in the incoming message.
*/
private static MatchMode defaultMatchMode = MatchMode.BARE_JID;
/**
* Defines the different modes under which a match will be attempted with an existing chat when
* the incoming message does not have a thread id.
@ -74,16 +74,16 @@ public class ChatManager {
BARE_JID;
}
/*
/**
* Determines whether incoming messages of type normal can create chats.
*/
private boolean normalIncluded = defaultIsNormalInclude;
/*
/**
* Determines how incoming message with no thread will be matched to existing chats.
*/
private MatchMode matchMode = defaultMatchMode;
/**
* Maps thread ID to chat.
*/

2
core/src/main/java/org/jivesoftware/smack/util/Base32Encoder.java
View file

@ -27,7 +27,7 @@ import java.io.IOException;
*
* @author Florian Schmaus
* Based on code by Brian Wellington (bwelling@xbill.org)
* @see <a href="http://en.wikipedia.org/wiki/Base32">Base32 Wikipedia entry<a>
* @see <a href="http://en.wikipedia.org/wiki/Base32">Base32 Wikipedia entry</a>
*
*/
public class Base32Encoder implements StringEncoder {

4
core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
View file

@ -525,7 +525,7 @@ public class PacketParserUtils {
*
* @param parser the XML parser, positioned at the start of the compression stanza.
* @return a collection of Stings with the methods included in the compression stanza.
* @throws Exception if an exception occurs while parsing the stanza.
* @throws XmlPullParserException if an exception occurs while parsing the stanza.
*/
public static Collection<String> parseCompressionMethods(XmlPullParser parser)
throws IOException, XmlPullParserException {
@ -662,7 +662,7 @@ public class PacketParserUtils {
*
* @param parser the XML parser.
* @return an stream error packet.
* @throws Exception if an exception occurs while parsing the packet.
* @throws XmlPullParserException if an exception occurs while parsing the packet.
*/
public static StreamError parseStreamError(XmlPullParser parser) throws IOException,
XmlPullParserException {