svn commit: r942194 - in /mina/vysper/trunk: nbxml/src/test/java/org/apache/vysper/xml/sax/impl/ server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/

[ngn]

Author: ngn
Date: Fri May  7 20:00:28 2010
New Revision: 942194

URL: http://svn.apache.org/viewvc?rev=942194&view=rev
Log:
Fixing two broken tests (map order dependent test in nbxml, verify test no 
longer valid in MUC)

Modified:
    
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/AbstractAsyncXMLReaderTestCase.java
    
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java

Modified: 
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/AbstractAsyncXMLReaderTestCase.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/AbstractAsyncXMLReaderTestCase.java?rev=942194&r1=942193&r2=942194&view=diff
==============================================================================
--- 
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/AbstractAsyncXMLReaderTestCase.java
 (original)
+++ 
mina/vysper/trunk/nbxml/src/test/java/org/apache/vysper/xml/sax/impl/AbstractAsyncXMLReaderTestCase.java
 Fri May  7 20:00:28 2010
@@ -82,10 +82,13 @@ public abstract class AbstractAsyncXMLRe
                assertEquals("Attribute count", expectedAttrs.getLength(), 
actualAttrs.getLength());
                
                for(int i = 0; i<expectedAttrs.getLength(); i++) {
-                       assertEquals("Local name[" + i + "]", 
expectedAttrs.getLocalName(i), actualAttrs.getLocalName(i));
-                       assertEquals("Qname[" + i + "]", 
expectedAttrs.getQName(i), actualAttrs.getQName(i));
-                       assertEquals("URI[" + i + "]", expectedAttrs.getURI(i), 
actualAttrs.getURI(i));
-                       assertEquals("Value[" + i + "]", 
expectedAttrs.getValue(i), actualAttrs.getValue(i));
+                       int actualIndex = 
actualAttrs.getIndex(expectedAttrs.getQName(i));
+                       assertTrue("Actual attribute not found for QName " + 
expectedAttrs.getQName(i), actualIndex > -1);
+                       
+                       assertEquals("Local name[" + i + "]", 
expectedAttrs.getLocalName(i), actualAttrs.getLocalName(actualIndex));
+                       assertEquals("Qname[" + i + "]", 
expectedAttrs.getQName(i), actualAttrs.getQName(actualIndex));
+                       assertEquals("URI[" + i + "]", expectedAttrs.getURI(i), 
actualAttrs.getURI(actualIndex));
+                       assertEquals("Value[" + i + "]", 
expectedAttrs.getValue(i), actualAttrs.getValue(actualIndex));
                }
        }
        

Modified: 
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java?rev=942194&r1=942193&r2=942194&view=diff
==============================================================================
--- 
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java
 (original)
+++ 
mina/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java
 Fri May  7 20:00:28 2010
@@ -59,15 +59,6 @@ public class MUCPresenceHandlerVerifyTes
         assertTrue(presenceHandler.verify(builder.build()));
     }
 
-    public void testVerifyWithNonMUCNamespace() {
-        StanzaBuilder builder = StanzaBuilder.createPresenceStanza(FROM, TO, 
null, null, null, null);
-        builder.startInnerElement("x", "foo");
-        builder.endInnerElement();
-        
-        assertFalse(presenceHandler.verify(builder.build()));
-    }
-
-    
     public void testVerifyWithoutMUCNamespace() {
         StanzaBuilder builder = StanzaBuilder.createPresenceStanza(FROM, TO, 
null, null, null, null);