You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2009/11/11 20:06:17 UTC
svn commit: r835014 - in /mina/sandbox/vysper/trunk/server:
core/src/main/java/org/apache/vysper/xmpp/stanza/
core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/
core/src/main/java/org/apache/vysper/xmpp/xmlfragment/
core/src/test/java/org/apac...
Author: ngn
Date: Wed Nov 11 19:06:17 2009
New Revision: 835014
URL: http://svn.apache.org/viewvc?rev=835014&view=rev
Log:
Removing extraneous constructors on XMLElement and Stanza which causes a lot of null castings
Added support for keeping the namespace URI and prefix on attributes, a step towards full namespace support
Added:
mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/xmlfragment/AttributeTestCase.java
Modified:
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/Attribute.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/FragmentFactory.java
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/AbstractInviteDecline.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/History.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Item.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Password.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/Stanza.java Wed Nov 11 19:06:17 2009
@@ -47,15 +47,6 @@
super(name, namespacePrefix, attributes, innerFragments);
}
- public Stanza(String name, String namespacePrefix, List<Attribute> attributes, XMLFragment[] innerFragments) {
- super(name, namespacePrefix, attributes, innerFragments);
- }
-
- public Stanza(String name, String namespacePrefix, Attribute[] attributes, List<XMLFragment> innerFragments) {
- super(name, namespacePrefix, attributes, innerFragments);
- }
-
-
public Entity getTo() {
return parseEntityAttribute("to");
}
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/stanza/dataforms/DataFormEncoder.java Wed Nov 11 19:06:17 2009
@@ -58,7 +58,7 @@
Field field = reportedIterator.next();
reportedFields.add(encodeField(field));
}
- XMLElement reportedElement = new XMLElement("reported", null, (Attribute[])null, reportedFields);
+ XMLElement reportedElement = new XMLElement("reported", null, null, reportedFields);
childElements.add(reportedElement);
// all item elements with their values
@@ -69,7 +69,7 @@
for (Field field : itemField) {
itemFields.add(encodeField(field));
}
- XMLElement itemElement = new XMLElement("item", null, (Attribute[])null, itemFields);
+ XMLElement itemElement = new XMLElement("item", null, null, itemFields);
childElements.add(itemElement);
}
}
@@ -108,7 +108,7 @@
if (field.getDesc() != null) {
descFragment.add(new XMLText(field.getDesc()));
}
- fieldElements.add(new XMLElement("desc", null, (Attribute[])null, descFragment));
+ fieldElements.add(new XMLElement("desc", null, null, descFragment));
if (field.isRequired()) {
fieldElements.add(createEmptyElement("required"));
@@ -141,6 +141,6 @@
}
protected XMLElement createTextOnlyElement(String elementName, String text) {
- return new XMLElement(elementName, null, (Attribute[])null, new XMLFragment[]{new XMLText(text)});
+ return new XMLElement(elementName, null, null, new XMLFragment[]{new XMLText(text)});
}
}
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/Attribute.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/Attribute.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/Attribute.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/Attribute.java Wed Nov 11 19:06:17 2009
@@ -25,16 +25,29 @@
* @author The Apache MINA Project (dev@mina.apache.org)
*/
public class Attribute {
+ private String namespaceUri;
+ private String namespacePrefix;
private String name;
private String value;
public Attribute(String name, String value) {
+ this(null, null, name, value);
+ }
+
+ public Attribute(String namespaceUri, String name, String value) {
+ this(namespaceUri, null, name, value);
+ }
+
+ public Attribute(String namespaceUri, String namespacePrefix, String name, String value) {
if (name == null) throw new IllegalArgumentException("name must not be null");
if (value == null) throw new IllegalArgumentException("value must not be null");
+ this.namespaceUri = namespaceUri;
+ this.namespacePrefix = namespacePrefix;
this.name = name;
this.value = value;
}
+
public String getName() {
return name;
}
@@ -43,6 +56,15 @@
return value;
}
+ public String getNamespaceUri() {
+ return namespaceUri;
+ }
+
+ public String getNamespacePrefix() {
+ return namespacePrefix;
+ }
+
+
@Override
public boolean equals(Object o) {
if (this == o) return true;
@@ -50,6 +72,7 @@
final Attribute attribute = (Attribute) o;
+ if (namespaceUri != null ? !namespaceUri.equals(attribute.namespaceUri) : attribute.namespaceUri != null) return false;
if (name != null ? !name.equals(attribute.name) : attribute.name != null) return false;
if (value != null ? !value.equals(attribute.value) : attribute.value != null) return false;
@@ -59,6 +82,7 @@
@Override
public int hashCode() {
int result;
+ result = (namespaceUri != null ? namespaceUri.hashCode() : 0);
result = (name != null ? name.hashCode() : 0);
result = 29 * result + (value != null ? value.hashCode() : 0);
return result;
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/FragmentFactory.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/FragmentFactory.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/FragmentFactory.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/FragmentFactory.java Wed Nov 11 19:06:17 2009
@@ -30,7 +30,7 @@
*/
public class FragmentFactory {
public static XMLElement createElementWithInnerText(String name, String text) {
- return new XMLElement(name, null, (List<Attribute>)null, asList(new XMLText(text)));
+ return new XMLElement(name, null, null, asList(new XMLText(text)));
}
public static List<XMLFragment> asList(XMLFragment xmlFragment) {
Modified: mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/xmlfragment/XMLElement.java Wed Nov 11 19:06:17 2009
@@ -52,14 +52,6 @@
this(name, namespacePrefix, FragmentFactory.asList(attributes), FragmentFactory.asList(innerFragments));
}
- public XMLElement(String name, String namespacePrefix, List<Attribute> attributes, XMLFragment[] innerFragments) {
- this(name, namespacePrefix, attributes, FragmentFactory.asList(innerFragments));
- }
-
- public XMLElement(String name, String namespacePrefix, Attribute[] attributes, List<XMLFragment> innerFragments) {
- this(name, namespacePrefix, FragmentFactory.asList(attributes), innerFragments);
- }
-
public XMLElement(String name, String namespacePrefix, List<Attribute> attributes, List<XMLFragment> innerFragments) {
this.namespacePrefix = namespacePrefix == null ? NamespaceAttribute.DEFAULT_NAMESPACE : namespacePrefix;
this.name = name;
Added: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/xmlfragment/AttributeTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/xmlfragment/AttributeTestCase.java?rev=835014&view=auto
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/xmlfragment/AttributeTestCase.java (added)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/xmlfragment/AttributeTestCase.java Wed Nov 11 19:06:17 2009
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.vysper.xmpp.xmlfragment;
+
+import junit.framework.TestCase;
+
+/**
+ */
+public class AttributeTestCase extends TestCase {
+
+
+
+ public void testEquals() {
+ Attribute att1 = new Attribute("foo", "bar");
+ Attribute att2 = new Attribute("foo", "bar");
+
+ assertTrue(att1.equals(att2));
+ assertTrue(att2.equals(att1));
+ }
+
+ public void testNotEquals() {
+ Attribute att1 = new Attribute("foo", "bar");
+ Attribute att2 = new Attribute("foo", "dummy");
+
+ assertFalse(att1.equals(att2));
+ assertFalse(att2.equals(att1));
+ }
+
+ public void testEqualsNamespaceUri() {
+ Attribute att1 = new Attribute("http://example.com", "foo", "bar");
+ Attribute att2 = new Attribute("http://example.com", "foo", "bar");
+
+ assertTrue(att1.equals(att2));
+ assertTrue(att2.equals(att1));
+ }
+
+ public void testEqualsDifferentNamespaceUri() {
+ Attribute att1 = new Attribute("http://example.com", "foo", "bar");
+ Attribute att2 = new Attribute("http://someother.com", "foo", "bar");
+
+ assertFalse(att1.equals(att2));
+ assertFalse(att2.equals(att1));
+ }
+
+ public void testEqualsNullNamespaceUri() {
+ Attribute att1 = new Attribute("http://example.com", "foo", "bar");
+ Attribute att2 = new Attribute("foo", "bar");
+
+ assertFalse(att1.equals(att2));
+ assertFalse(att2.equals(att1));
+ }
+
+ public void testEqualsNamespacePrefix() {
+ Attribute att1 = new Attribute("http://example.com", "pr1", "foo", "bar");
+ Attribute att2 = new Attribute("http://example.com", "pr2", "foo", "bar");
+
+ assertTrue(att1.equals(att2));
+ assertTrue(att2.equals(att1));
+ }
+
+}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/AbstractInviteDecline.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/AbstractInviteDecline.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/AbstractInviteDecline.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/AbstractInviteDecline.java Wed Nov 11 19:06:17 2009
@@ -34,7 +34,7 @@
public abstract class AbstractInviteDecline extends XMLElement {
public AbstractInviteDecline(String elmName, XMLElement elm) {
- super(elmName, null, elm.getAttributes(), elm.getInnerElements().toArray(new XMLElement[0]));
+ super(elmName, null, elm.getAttributes(), elm.getInnerFragments());
}
public AbstractInviteDecline(String elmName, Entity from, Entity to, String reason) {
@@ -53,7 +53,7 @@
private static List<XMLFragment> createFragments(String reason) {
List<XMLFragment> fragments = new ArrayList<XMLFragment>();
if(reason != null) {
- XMLElement reasonElm = new XMLElement("reason", null, (Attribute[])null, new XMLFragment[]{new XMLText(reason)});
+ XMLElement reasonElm = new XMLElement("reason", null, null, new XMLFragment[]{new XMLText(reason)});
fragments.add(reasonElm);
}
return fragments;
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Delay.java Wed Nov 11 19:06:17 2009
@@ -38,7 +38,7 @@
new NamespaceAttribute(NamespaceURIs.URN_XMPP_DELAY),
new Attribute("from", from.getFullQualifiedName()),
new Attribute("stamp", DateTimeProfile.getInstance().getDateTimeInUTC(timestamp.getTime()))
- ), (List<XMLFragment>)null);
+ ), null);
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/History.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/History.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/History.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/History.java Wed Nov 11 19:06:17 2009
@@ -58,11 +58,11 @@
}
public History(XMLElement elm) {
- super(ELEMENT_HISTORY, null, elm.getAttributes(), (List<XMLFragment>)null);
+ super(ELEMENT_HISTORY, null, elm.getAttributes(), null);
}
public History(Integer maxstanzas, Integer maxchars, Integer seconds, Calendar since) {
- super(ELEMENT_HISTORY, null, createAttributes(maxstanzas, maxchars, seconds, since), (List<XMLFragment>)null);
+ super(ELEMENT_HISTORY, null, createAttributes(maxstanzas, maxchars, seconds, since), null);
}
private static List<Attribute> createAttributes(Integer maxstanzas, Integer maxchars, Integer seconds, Calendar since) {
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Item.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Item.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Item.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Item.java Wed Nov 11 19:06:17 2009
@@ -40,13 +40,13 @@
public Item(Occupant occupant, boolean includeJid, boolean includeNick) {
super("item", null,
- createAttributes(occupant, includeJid, includeNick), (XMLFragment[])null);
+ createAttributes(occupant, includeJid, includeNick), null);
}
public Item(Entity jid, String nick, Affiliation affiliation, Role role) {
super("item", null,
- createAttributes(jid, nick, affiliation, role), (XMLFragment[])null);
+ createAttributes(jid, nick, affiliation, role), null);
}
private static List<Attribute> createAttributes(Occupant occupant, boolean includeJid, boolean includeNick) {
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Password.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Password.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Password.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/Password.java Wed Nov 11 19:06:17 2009
@@ -27,7 +27,7 @@
public class Password extends XMLElement {
public Password(String password) {
- super("password", null, (Attribute[])null, new XMLFragment[]{new XMLText(password)});
+ super("password", null, null, new XMLFragment[]{new XMLText(password)});
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java Wed Nov 11 19:06:17 2009
@@ -68,7 +68,7 @@
XMLText text = new XMLText(body);
XMLElement expectedBody = new XMLElement("body", null,
- (Attribute[]) null, new XMLFragment[] { text });
+ null, new XMLFragment[] { text });
assertMessageErrorStanza(errorStanza, ROOM1_JID, OCCUPANT1_JID, "modify",
expectedErrorName,expectedBody);
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java Wed Nov 11 19:06:17 2009
@@ -86,7 +86,7 @@
XMLText text = new XMLText(BODY);
XMLElement expectedBody = new XMLElement("body", null,
- (Attribute[]) null, new XMLFragment[] { text });
+ null, new XMLFragment[] { text });
assertMessageErrorStanza(errorStanza, ROOM1_JID, OCCUPANT1_JID, "modify",
"bad-request", expectedBody);
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java Wed Nov 11 19:06:17 2009
@@ -185,7 +185,7 @@
private void assertPresenceErrorStanza(Stanza response, Entity from, Entity to,
String type, String errorName) {
Attribute xmlns = new NamespaceAttribute(NamespaceURIs.XEP0045_MUC);
- XMLElement xElement = new XMLElement("x", null, Arrays.asList(xmlns), (XMLFragment[])null);
+ XMLElement xElement = new XMLElement("x", null, Arrays.asList(xmlns), null);
assertErrorStanza(response, "presence", from, to, type, errorName, xElement);
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java?rev=835014&r1=835013&r2=835014&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java Wed Nov 11 19:06:17 2009
@@ -57,7 +57,7 @@
Stanza error = sendMessage(OCCUPANT1_JID, ROOM2_JID, GROUPCHAT, null, null, SUBJECT);
assertMessageErrorStanza(error, ROOM2_JID, OCCUPANT1_JID, "auth", "forbidden",
- new XMLElement("subject", null, (Attribute[])null, new XMLFragment[]{new XMLText(SUBJECT)}));
+ new XMLElement("subject", null, null, new XMLFragment[]{new XMLText(SUBJECT)}));
assertNull(occupant1Queue.getNext());
assertNull(occupant2Queue.getNext());