PacketFilter Remotion Test Case

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@7169 b35dd754-fafc-0310-a699-88a17e54d16e

test/org/jivesoftware/smack/PacketReaderTest.java

@@ -55,6 +55,7 @@ package org.jivesoftware.smack;
 import org.jivesoftware.smack.filter.FromMatchesFilter;
 import org.jivesoftware.smack.filter.PacketIDFilter;
 import org.jivesoftware.smack.filter.PacketTypeFilter;
+import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.test.SmackTestCase;
 
@@ -63,12 +64,40 @@ import java.util.Date;
 
 public class PacketReaderTest extends SmackTestCase {
 
+    private int counter;
+
+    private final Object mutex = new Object();
+
     /**
      * Constructor for PacketReaderTest.
+     *
      * @param arg0
      */
     public PacketReaderTest(String arg0) {
         super(arg0);
+        resetCounter();
+    }
+
+    // Counter management
+
+    private void resetCounter() {
+        synchronized (mutex) {
+            counter = 0;
+        }
+    }
+
+    public void incCounter() {
+        synchronized (mutex) {
+            counter++;
+        }
+    }
+
+    private int valCounter() {
+        int val;
+        synchronized (mutex) {
+            val = counter;
+        }
+        return val;
     }   
 
     /**
@@ -104,9 +133,10 @@ public class PacketReaderTest extends SmackTestCase {
      * Tests that PacketReader adds new listeners and also removes them correctly.
      */
     public void testRemoveListener() {
+
             PacketListener listener = new PacketListener() {
                 public void processPacket(Packet packet) {
-                //Ignore
+                    // Do nothing
                 }
             };
             // Keep number of current listeners
@@ -116,6 +146,11 @@ public class PacketReaderTest extends SmackTestCase {
             // Check that the listener was added
             assertEquals("Listener was not added", listenersSize + 1,
                     getConnection(0).packetReader.listeners.size());
+
+            Message msg = new Message(getConnection(0).getUser(), Message.Type.normal);
+
+            getConnection(1).sendPacket(msg);
+
             // Remove the listener
             getConnection(0).removePacketListener(listener);
             // Check that the number of listeners is correct (i.e. the listener was removed)
@@ -164,6 +199,69 @@ public class PacketReaderTest extends SmackTestCase {
         assertNotNull("No message was received", collector.nextResult(1000));
     }
 
+    /**
+      * Tests that PacketReader adds new listeners and also removes them correctly.
+      */
+     public void testFiltersRemotion() {
+
+         resetCounter();
+
+         int repeat=10;
+
+         for (int j = 0; j < repeat; j++) {
+
+             PacketListener listener = new PacketListener() {
+                 public void processPacket(Packet packet) {
+                     System.out.println("Packet Captured");
+                     incCounter();
+                 }              
+             };
+             PacketFilter pf = new PacketFilter() {
+                 public boolean accept(Packet packet) {
+                     System.out.println("Packet Filtered");
+                     incCounter();
+                     return true;
+                 }
+             };
+
+             getConnection(0).addPacketListener(listener,pf);
+             // Check that the listener was added
+
+             Message msg = new Message(getConnection(0).getUser(), Message.Type.normal);
+
+             getConnection(1).sendPacket(msg);
+
+             try {
+                 Thread.sleep(100);
+             }
+             catch (InterruptedException e) {
+                 e.printStackTrace();
+             }
+
+             // Remove the listener
+             getConnection(0).removePacketListener(listener);
+
+             try {
+                 Thread.sleep(200);
+             }
+             catch (InterruptedException e) {
+                 e.printStackTrace();
+             }
+
+             for (int i = 0; i < 10; i++)
+                 getConnection(1).sendPacket(msg);
+
+             try {
+                 Thread.sleep(100);
+             }
+             catch (InterruptedException e) {
+                 e.printStackTrace();
+             }
+         }
+         System.out.println(valCounter());
+         assertEquals(valCounter(),repeat*2);
+     }
+
     protected int getMaxConnections() {
         return 2;
     }