Author: mjakl
Date: Mon Jul 6 20:24:46 2009
New Revision: 791605
URL: http://svn.apache.org/viewvc?rev=791605&view=rev
Log:
Fixed the misunderstanding with namespaces for the pubsub related classes and
the ServerErrorResponses class (VYSPER-96)
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeTestCase.java
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubDeleteNodeTestCase.java
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java?rev=791605&r1=791604&r2=791605&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java
Mon Jul 6 20:24:46 2009
@@ -92,7 +92,7 @@
stanzaBuilder.addAttribute("from", serverJID.getFullQualifiedName());
stanzaBuilder.addAttribute("to", to.getFullQualifiedName());
stanzaBuilder.addAttribute("xml:lang", lang);
- stanzaBuilder.startInnerElement("event",
NamespaceURIs.XEP0060_PUBSUB_EVENT);
+ stanzaBuilder.startInnerElement("event");
stanzaBuilder.addNamespaceAttribute(NamespaceURIs.XEP0060_PUBSUB_EVENT);
stanzaBuilder.startInnerElement("items");
stanzaBuilder.addAttribute("node", nodeName);
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java?rev=791605&r1=791604&r2=791605&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/ErrorStanzaGenerator.java
Mon Jul 6 20:24:46 2009
@@ -27,6 +27,7 @@
import org.apache.vysper.xmpp.stanza.StanzaErrorCondition;
import org.apache.vysper.xmpp.stanza.StanzaErrorType;
import org.apache.vysper.xmpp.xmlfragment.Attribute;
+import org.apache.vysper.xmpp.xmlfragment.NamespaceAttribute;
import org.apache.vysper.xmpp.xmlfragment.XMLElement;
import org.apache.vysper.xmpp.xmlfragment.XMLFragment;
@@ -81,7 +82,7 @@
* @return the generated stanza.
*/
public Stanza generateNoSuchSubscriberErrorStanza(Entity sender, Entity
receiver, IQStanza stanza) {
- XMLElement notSubscribed = new XMLElement(NOT_SUBSCRIBED,
NamespaceURIs.XEP0060_PUBSUB_ERRORS, (Attribute[])null, (XMLFragment[])null);
+ XMLElement notSubscribed = createXMLElement(NOT_SUBSCRIBED,
NamespaceURIs.XEP0060_PUBSUB_ERRORS);
return
errorResponses.getStanzaError(StanzaErrorCondition.UNEXPECTED_REQUEST, stanza,
StanzaErrorType.CANCEL, null, null, notSubscribed);
}
@@ -95,7 +96,7 @@
* @return the generated stanza.
*/
public Stanza generateSubIDRequiredErrorStanza(Entity sender, Entity
receiver, IQStanza stanza) {
- XMLElement subidRequired = new XMLElement(SUBID_REQUIRED,
NamespaceURIs.XEP0060_PUBSUB_ERRORS, (Attribute[])null, (XMLFragment[])null);
+ XMLElement subidRequired = createXMLElement(SUBID_REQUIRED,
NamespaceURIs.XEP0060_PUBSUB_ERRORS);
return errorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST,
stanza, StanzaErrorType.MODIFY, null, null, subidRequired);
}
@@ -121,7 +122,7 @@
* @return the generated stanza.
*/
public Stanza generateSubIDNotValidErrorStanza(Entity sender, Entity
receiver, IQStanza stanza) {
- XMLElement invalidSubID = new XMLElement(INVALID_SUBID,
NamespaceURIs.XEP0060_PUBSUB_ERRORS, (Attribute[])null, (XMLFragment[])null);
+ XMLElement invalidSubID = createXMLElement(INVALID_SUBID,
NamespaceURIs.XEP0060_PUBSUB_ERRORS);
return
errorResponses.getStanzaError(StanzaErrorCondition.NOT_ACCEPTABLE, stanza,
StanzaErrorType.MODIFY, null, null, invalidSubID);
}
@@ -135,7 +136,7 @@
* @return the generated stanza.
*/
public Stanza generateJIDDontMatchErrorStanza(Entity sender, Entity
receiver, IQStanza stanza) {
- XMLElement invalidJID = new XMLElement(INVALID_JID,
NamespaceURIs.XEP0060_PUBSUB_ERRORS, (Attribute[])null, (XMLFragment[])null);
+ XMLElement invalidJID = createXMLElement(INVALID_JID,
NamespaceURIs.XEP0060_PUBSUB_ERRORS);
return errorResponses.getStanzaError(StanzaErrorCondition.BAD_REQUEST,
stanza, StanzaErrorType.MODIFY, null, null, invalidJID);
}
@@ -150,4 +151,18 @@
public Stanza generateDuplicateNodeErrorStanza(Entity sender, Entity
receiver, IQStanza stanza) {
return errorResponses.getStanzaError(StanzaErrorCondition.CONFLICT,
stanza, StanzaErrorType.CANCEL, null, null, null);
}
+
+
+ /**
+ * Creates a single element lying within a certain default namespace.
+ *
+ * @param elementName the name of the element
+ * @param namespace the default namespace
+ * @return the <elementName xmlns="namespace"/> element
+ */
+ private XMLElement createXMLElement(String elementName, String namespace) {
+ XMLElement element = new XMLElement(elementName, null, new Attribute[]
{new NamespaceAttribute(namespace)}, (XMLFragment[])null);
+ return element;
+ }
+
}
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java?rev=791605&r1=791604&r2=791605&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
Mon Jul 6 20:24:46 2009
@@ -84,7 +84,7 @@
String iqStanzaID = stanza.getAttributeValue("id");
StanzaBuilder sb = StanzaBuilder.createIQStanza(receiver, sender,
IQStanzaType.RESULT, iqStanzaID);
- sb.startInnerElement("pubsub", NamespaceURIs.XEP0060_PUBSUB);
+ sb.startInnerElement("pubsub");
sb.addNamespaceAttribute(NamespaceURIs.XEP0060_PUBSUB);
XMLElement publish =
stanza.getFirstInnerElement().getFirstInnerElement(); // pubsub/publish
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java?rev=791605&r1=791604&r2=791605&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
Mon Jul 6 20:24:46 2009
@@ -89,7 +89,7 @@
String iqStanzaID = stanza.getAttributeValue("id");
StanzaBuilder sb = StanzaBuilder.createIQStanza(receiver, sender,
IQStanzaType.RESULT, iqStanzaID);
- sb.startInnerElement("pubsub", NamespaceURIs.XEP0060_PUBSUB);
+ sb.startInnerElement("pubsub");
sb.addNamespaceAttribute(NamespaceURIs.XEP0060_PUBSUB);
XMLElement sub = stanza.getFirstInnerElement().getFirstInnerElement();
// pubsub/subscribe
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java?rev=791605&r1=791604&r2=791605&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
Mon Jul 6 20:24:46 2009
@@ -84,7 +84,7 @@
String iqStanzaID = stanza.getAttributeValue("id");
StanzaBuilder sb = StanzaBuilder.createIQStanza(receiver, sender,
IQStanzaType.RESULT, iqStanzaID);
- sb.startInnerElement("pubsub", NamespaceURIs.XEP0060_PUBSUB);
+ sb.startInnerElement("pubsub");
sb.addNamespaceAttribute(NamespaceURIs.XEP0060_PUBSUB);
XMLElement unsub =
stanza.getFirstInnerElement().getFirstInnerElement(); // pubsub/unsubscribe
Modified:
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java?rev=791605&r1=791604&r2=791605&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
(original)
+++
mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/server/response/ServerErrorResponses.java
Mon Jul 6 20:24:46 2009
@@ -119,8 +119,9 @@
.addAttribute("type", type.value());
// insert defined error condition relating to the stanza error type
- responseBuilder.startInnerElement(errorCondition.value(),
NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS)
- .endInnerElement();
+ responseBuilder.startInnerElement(errorCondition.value());
+
responseBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS);
+ responseBuilder.endInnerElement();
// optional error text
if (errorText != null && errorLang != null) {
Modified:
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeTestCase.java?rev=791605&r1=791604&r2=791605&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeTestCase.java
Mon Jul 6 20:24:46 2009
@@ -103,6 +103,6 @@
assertEquals("cancel", error.getAttributeValue("type"));
assertEquals("conflict", conflict.getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
conflict.getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
conflict.getVerifier().getUniqueXMLNSValue());
}
}
Modified:
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java?rev=791605&r1=791604&r2=791605&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishTestCase.java
Mon Jul 6 20:24:46 2009
@@ -111,7 +111,7 @@
XMLElement item = publish.getFirstInnerElement();
assertEquals("pubsub", pubsub.getName());
- assertEquals(NamespaceURIs.XEP0060_PUBSUB, pubsub.getNamespace());
+ assertEquals(NamespaceURIs.XEP0060_PUBSUB,
pubsub.getVerifier().getUniqueXMLNSValue());
assertEquals("publish", publish.getName());
assertEquals("item", item.getName());
assertNotNull(item.getAttributeValue("id")); // value unknown
@@ -139,7 +139,7 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(1, errorContent.size());
assertEquals("item-not-found", errorContent.get(0).getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getVerifier().getUniqueXMLNSValue());
}
@@ -163,7 +163,7 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(1, errorContent.size());
assertEquals("forbidden", errorContent.get(0).getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getVerifier().getUniqueXMLNSValue());
}
protected Entity createUser(String jid) throws BindException {
Modified:
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java?rev=791605&r1=791604&r2=791605&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeTestCase.java
Mon Jul 6 20:24:46 2009
@@ -120,10 +120,10 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(2, errorContent.size());
assertEquals("bad-request", errorContent.get(0).getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getVerifier().getUniqueXMLNSValue());
assertEquals("invalid-jid", errorContent.get(1).getName());
- assertEquals(NamespaceURIs.XEP0060_PUBSUB_ERRORS,
errorContent.get(1).getNamespace());
+ assertEquals(NamespaceURIs.XEP0060_PUBSUB_ERRORS,
errorContent.get(1).getVerifier().getUniqueXMLNSValue());
}
public void testSubscribeJIDMalformed() {
@@ -145,7 +145,7 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(1, errorContent.size());
assertEquals("jid-malformed", errorContent.get(0).getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getVerifier().getUniqueXMLNSValue());
}
public void testSubscribeNoSuchNode() throws Exception {
@@ -167,7 +167,7 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(1, errorContent.size());
assertEquals("item-not-found", errorContent.get(0).getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getVerifier().getUniqueXMLNSValue());
}
class DefaultSubscribeStanzaGenerator extends AbstractStanzaGenerator {
Modified:
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java?rev=791605&r1=791604&r2=791605&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeTestCase.java
Mon Jul 6 20:24:46 2009
@@ -145,10 +145,10 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(2, errorContent.size());
assertEquals("bad-request", errorContent.get(0).getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getVerifier().getUniqueXMLNSValue());
assertEquals("subid-required", errorContent.get(1).getName());
- assertEquals(NamespaceURIs.XEP0060_PUBSUB_ERRORS,
errorContent.get(1).getNamespace());
+ assertEquals(NamespaceURIs.XEP0060_PUBSUB_ERRORS,
errorContent.get(1).getVerifier().getUniqueXMLNSValue());
}
public void testUnsubscribeNoSuchSubscriber() {
@@ -171,10 +171,10 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(2, errorContent.size());
assertEquals("unexpected-request", errorContent.get(0).getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getVerifier().getUniqueXMLNSValue());
assertEquals("not-subscribed", errorContent.get(1).getName());
- assertEquals(NamespaceURIs.XEP0060_PUBSUB_ERRORS,
errorContent.get(1).getNamespace());
+ assertEquals(NamespaceURIs.XEP0060_PUBSUB_ERRORS,
errorContent.get(1).getVerifier().getUniqueXMLNSValue());
}
public void testUnsubscribeForbidden() throws Exception {
@@ -200,7 +200,7 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(1, errorContent.size());
assertEquals("forbidden", errorContent.get(0).getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getVerifier().getUniqueXMLNSValue());
}
public void testUnsubscribeNoSuchNode() {
@@ -222,7 +222,7 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(1, errorContent.size());
assertEquals("item-not-found", errorContent.get(0).getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getVerifier().getUniqueXMLNSValue());
}
public void testUnsubscribeBadSubID() {
@@ -249,10 +249,10 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(2, errorContent.size());
assertEquals("not-acceptable", errorContent.get(0).getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getVerifier().getUniqueXMLNSValue());
assertEquals("invalid-subid", errorContent.get(1).getName());
- assertEquals(NamespaceURIs.XEP0060_PUBSUB_ERRORS,
errorContent.get(1).getNamespace());
+ assertEquals(NamespaceURIs.XEP0060_PUBSUB_ERRORS,
errorContent.get(1).getVerifier().getUniqueXMLNSValue());
}
public void testUnsubscribeJIDMalformed() {
@@ -274,6 +274,6 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(1, errorContent.size());
assertEquals("jid-malformed", errorContent.get(0).getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getVerifier().getUniqueXMLNSValue());
}
}
Modified:
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubDeleteNodeTestCase.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubDeleteNodeTestCase.java?rev=791605&r1=791604&r2=791605&view=diff
==============================================================================
---
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubDeleteNodeTestCase.java
(original)
+++
mina/sandbox/vysper/trunk/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubDeleteNodeTestCase.java
Mon Jul 6 20:24:46 2009
@@ -116,11 +116,11 @@
XMLElement error = response.getInnerElementsNamed("error").get(0);
//jump directly to the error part
assertEquals("error", error.getName());
assertEquals("auth", error.getAttributeValue("type"));
-
+
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(1, errorContent.size());
assertEquals("forbidden", errorContent.get(0).getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getVerifier().getUniqueXMLNSValue());
LeafNode n = root.find(testNode);
assertNotNull(n); // still there
@@ -146,6 +146,6 @@
List<XMLElement> errorContent = error.getInnerElements();
assertEquals(1, errorContent.size());
assertEquals("item-not-found", errorContent.get(0).getName());
- assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getNamespace());
+ assertEquals(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS,
errorContent.get(0).getVerifier().getUniqueXMLNSValue());
}
}
