Some work on integration test and correct parser element in provider

Author: adiaholic

smack-extensions/src/main/java/org/jivesoftware/smackx/caps2/element/Caps2Element.java

@@ -51,7 +51,7 @@ public String getElementName() {
     }
 
     @Override
-    public CharSequence toXML(XmlEnvironment xmlEnvironment) {
+    public XmlStringBuilder toXML(XmlEnvironment xmlEnvironment) {
         XmlStringBuilder xml = new XmlStringBuilder(this, xmlEnvironment);
         xml.rightAngleBracket();
 
@@ -88,7 +88,7 @@ public String getElementName() {
         }
 
         @Override
-        public CharSequence toXML(XmlEnvironment xmlEnvironment) {
+        public XmlStringBuilder toXML(XmlEnvironment xmlEnvironment) {
             XmlStringBuilder xml = new XmlStringBuilder(this, xmlEnvironment);
             xml.attribute("algo", algorithm);
             xml.rightAngleBracket();

smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.providers

@@ -542,7 +542,7 @@
 
     <!-- XEP-0390: Entity Capabilities 2.0 -->
     <extensionProvider>
-        <elementName>Caps2Element</elementName>
+        <elementName>c</elementName>
         <namespace>urn:xmpp:caps</namespace>
         <className>org.jivesoftware.smackx.caps2.provider.Caps2Provider</className>
     </extensionProvider>

smack-integration-test/src/main/java/org/jivesoftware/smackx/caps2/EntityCaps2IntegrationTest.java

@@ -24,7 +24,12 @@
 import org.jivesoftware.smack.SmackException.NoResponseException;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.SmackException.NotLoggedInException;
+import org.jivesoftware.smack.StanzaListener;
 import org.jivesoftware.smack.XMPPException.XMPPErrorException;
+import org.jivesoftware.smack.filter.StanzaFilter;
+import org.jivesoftware.smack.packet.Presence;
+import org.jivesoftware.smack.packet.Stanza;
+import org.jivesoftware.smackx.caps2.element.Caps2Element;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 
 import org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest;
@@ -33,21 +38,54 @@
 import org.igniterealtime.smack.inttest.annotations.BeforeClass;
 import org.igniterealtime.smack.inttest.annotations.SmackIntegrationTest;
 import org.igniterealtime.smack.inttest.util.IntegrationTestRosterUtil;
+import org.igniterealtime.smack.inttest.util.SimpleResultSyncPoint;
 
 public class EntityCaps2IntegrationTest extends AbstractSmackIntegrationTest {
 
     @SuppressWarnings("unused")
     private final Caps2Manager caps2Man1;
+
     @SuppressWarnings("unused")
-    private final ServiceDiscoveryManager sdm1;
+    private final ServiceDiscoveryManager sdm2;
 
     private final Set<String> dummyFeatures = new HashSet<>();
     private final AtomicInteger dummyFeatureId = new AtomicInteger();
 
     public EntityCaps2IntegrationTest(SmackIntegrationTestEnvironment environment) {
         super(environment);
         caps2Man1 = Caps2Manager.getInstanceFor(environment.conOne);
-        sdm1 = ServiceDiscoveryManager.getInstanceFor(conOne);
+        sdm2 = ServiceDiscoveryManager.getInstanceFor(conTwo);
+    }
+
+    @SmackIntegrationTest
+    public void getEntityCapability() throws Exception {
+        final SimpleResultSyncPoint entityCaps2Received = new SimpleResultSyncPoint();
+
+        StanzaListener stanzaListener = new StanzaListener() {
+            @Override
+            public void processStanza(Stanza packet) throws NotConnectedException, InterruptedException, NotLoggedInException {
+                Presence presence = (Presence) packet;
+                if (presence.hasExtension(Caps2Element.class)) {
+                    Logger.getAnonymousLogger().info("\n\n\n adiaholic caps2Element : " + packet.toXML());
+                    entityCaps2Received.signal();
+                }
+            }
+        };
+        conTwo.addStanzaListener(stanzaListener, new StanzaFilter() {
+            @Override
+            public boolean accept(Stanza stanza) {
+                if (stanza instanceof Presence) {
+                    return true;
+                }
+                return false;
+            }
+        });
+        try {
+            caps2Man1.publishEntityCapabilities();
+            entityCaps2Received.waitForResult(timeout);
+        } finally {
+            conTwo.removeStanzaListener(stanzaListener);
+        }
     }
 
     @BeforeClass
@@ -67,11 +105,4 @@ private String getNewDummyFeature() {
         Logger.getAnonymousLogger().warning("adiaholic: dummy feature created: " + dummyFeature);
         return dummyFeature;
     }
-
-    @SmackIntegrationTest
-    public void waitToPublishFeature() throws Exception {
-        Logger.getAnonymousLogger().warning("adiaholic: publishing feature");
-
-        Logger.getAnonymousLogger().warning("adiaholic: feature published");
-    }
 }