retrieve contact list test

test/net/java/sip/communicator/slick/contactlist/MclSlickFixture.java

@@ -1,5 +1,7 @@
 package net.java.sip.communicator.slick.contactlist;
 
+import java.util.Hashtable;
+
 import org.osgi.framework.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.slick.contactlist.mockprovider.*;
@@ -22,7 +24,14 @@ public class MclSlickFixture
      * OSGI bus.
      */
     public MetaContactListService metaClService = null;
-
+    
+    /**
+     * The provider that we use to make a dummy server-stored contactlist 
+     * used for testing. The mockProvider is instantiated and registered
+     * by the metacontactlist slick activator. 
+     */
+    public static MockProvider mockProvider = null;
+    
     public MclSlickFixture(Object obj)
     {
     }

test/net/java/sip/communicator/slick/contactlist/MetaContactListServiceLick.java

@@ -102,6 +102,8 @@ private void initMockProvider(BundleContext context)
 
         logger.debug("Registerd a mock protocol provider!");
 
+        //store the created mock provider for later reference
+        MclSlickFixture.mockProvider = provider;
     }
 
     /**
@@ -128,7 +130,5 @@ private void fillMockContactList(MockProvider provider)
         group1.addContact( new MockContact("Toto", provider) );
 
         root.addSubGroup(group1);
-
-
     }
 }

test/net/java/sip/communicator/slick/contactlist/TestMetaContactList.java

@@ -1,7 +1,18 @@
 package net.java.sip.communicator.slick.contactlist;
 
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import junit.framework.*;
 import net.java.sip.communicator.service.contactlist.*;
+import net.java.sip.communicator.service.protocol.Contact;
+import net.java.sip.communicator.service.protocol.ContactGroup;
+import net.java.sip.communicator.service.protocol.OperationSetPersistentPresence;
+import net.java.sip.communicator.slick.contactlist.mockprovider.MockContactGroup;
+import net.java.sip.communicator.slick.protocol.icq.TestOperationSetPersistentPresence;
+import net.java.sip.communicator.util.Logger;
 
 /**
  * Test basic meta contact list functionality such as filling in the contact
@@ -16,6 +27,11 @@ public class TestMetaContactList
      */
     MclSlickFixture fixture = new MclSlickFixture(getClass().getName());
 
+    private static final Logger logger =
+        Logger.getLogger(TestOperationSetPersistentPresence.class);
+    
+    private OperationSetPersistentPresence opSetPersPresence;
+    
     /**
      * Creates a unit test with the specified name.
      * @param name the name of one of the test methods in this class.
@@ -34,6 +50,27 @@ protected void setUp() throws Exception
         super.setUp();
         fixture.setUp();
 
+        Map supportedOperationSets =
+            MclSlickFixture.mockProvider.getSupportedOperationSets();
+
+        if ( supportedOperationSets == null
+            || supportedOperationSets.size() < 1)
+            throw new NullPointerException(
+                "No OperationSet implementations are supported by "
+                +"this ICQ implementation. ");
+
+        //get the operation set presence here.
+        opSetPersPresence =
+            (OperationSetPersistentPresence)supportedOperationSets.get(
+                OperationSetPersistentPresence.class.getName());
+
+        //if still null then the implementation doesn't offer a presence
+        //operation set which is unacceptable for icq.
+        if (opSetPersPresence == null)
+            throw new NullPointerException(
+                "An implementation of the ICQ service must provide an "
+                + "implementation of at least the one of the Presence "
+                + "Operation Sets");
     }
 
     /**
@@ -52,8 +89,47 @@ protected void tearDown() throws Exception
      */
     public void testContactListRetrieving()
     {
-        MetaContactGroup listRoot = fixture.metaClService.getRoot();
+        ContactGroup root 
+            = opSetPersPresence.getServerStoredContactListRoot();
+    
+        logger.debug("============== Predefined contact List ==============");
+        
+        logger.debug("rootGroup="+root.getGroupName()
+                +" rootGroup.childContacts="+root.countContacts()
+                + "rootGroup.childGroups="+root.countSubGroups()
+                + "Printing rootGroupContents=\n"+root.toString());
+    
+        MetaContactGroup expectedRoot = fixture.metaClService.getRoot();
+
+        logger.debug("================ Meta Contact List =================");
+
+        logger.debug("rootGroup="+expectedRoot.getGroupName()
+                     +" rootGroup.childContacts="+expectedRoot.countChildContacts()
+                     + "rootGroup.childGroups="+expectedRoot.countSubgroups()
+                     + "Printing rootGroupContents=\n"+expectedRoot.toString());
+                
+        Iterator groups = root.subGroups();
+        while (groups.hasNext() ){
+            ContactGroup group = (ContactGroup)groups.next();
+
+            MetaContactGroup expectedGroup
+                = expectedRoot
+                    .getMetaContactSubgroup(group.getGroupName());
+
+            assertNotNull("Group " + group.getGroupName() + " was returned by "
+                          +"the server but was not in the expected contact list."
+                          , expectedGroup );
 
-        System.out.println("!!! Meta Contact List Root = " + listRoot);
+            Iterator contactsIter = group.contacts();
+            while (contactsIter.hasNext()){
+                String contactID = ((Contact)contactsIter.next()).getAddress();
+                MetaContact expectedContact 
+                    = expectedGroup.getMetaContact(contactID);
+                
+                assertNotNull("Contact " + contactID + " was returned by "
+                        +"the server but was not in the expected contact list."
+                        , expectedContact );
+            }
+        }
     }
 }