[sip-comm-cvs] CVS update: /sip-communicator/lib/installer-exclude/, /sip-communicator/src/net/java/sip/communicator/impl/protocol/jabber/, /sip-communicator/src/...

damencho at dev.java.net damencho at dev.java.net
Wed Apr 4 14:53:10 CEST 2007


User: damencho
Date: 2007/04/04 05:53:10

Removed:
   sip-communicator/lib/installer-exclude/retroweaver-rt-2.0Beta4.jar

Added:
   sip-communicator/lib/installer-exclude/smackx-jingle.jar
   sip-communicator/lib/installer-exclude/retroweaver-rt-2.0.jar
   sip-communicator/lib/installer-exclude/backport-util-concurrent.jar

Modified:
   sip-communicator/lib/installer-exclude/smackx.jar
   sip-communicator/lib/installer-exclude/smack.jar
   sip-communicator/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java
   sip-communicator/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java
   sip-communicator/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java
   sip-communicator/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java
   sip-communicator/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java
   sip-communicator/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java
   sip-communicator/build.xml
   sip-communicator/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPresence.java
   sip-communicator/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicInstantMessaging.java

Log:
 updated new smack 3.0 lib

File Changes:

Directory: /sip-communicator/lib/installer-exclude/
===================================================

File [added]: smackx-jingle.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/lib/installer-exclude/smackx-jingle.jar?rev=1.1&content-type=text/vnd.viewcvs-markup
File [changed]: smackx.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/lib/installer-exclude/smackx.jar?rev=1.2&content-type=text/vnd.viewcvs-markup
File [added]: retroweaver-rt-2.0.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/lib/installer-exclude/retroweaver-rt-2.0.jar?rev=1.1&content-type=text/vnd.viewcvs-markup
File [changed]: smack.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/lib/installer-exclude/smack.jar?rev=1.2&content-type=text/vnd.viewcvs-markup
File [added]: backport-util-concurrent.jar
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/lib/installer-exclude/backport-util-concurrent.jar?rev=1.1&content-type=text/vnd.viewcvs-markup
File [removed]: retroweaver-rt-2.0Beta4.jar

Directory: /sip-communicator/src/net/java/sip/communicator/impl/protocol/jabber/
================================================================================

File [changed]: OperationSetBasicInstantMessagingJabberImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java?r1=1.18&r2=1.19
Delta lines:  +16 -7
--------------------
--- OperationSetBasicInstantMessagingJabberImpl.java	28 Mar 2007 20:44:59 -0000	1.18
+++ OperationSetBasicInstantMessagingJabberImpl.java	4 Apr 2007 12:53:06 -0000	1.19
@@ -18,6 +18,7 @@
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.Message;
 import net.java.sip.communicator.service.protocol.event.*;
+import net.java.sip.communicator.service.protocol.event.MessageListener;
 import net.java.sip.communicator.service.protocol.jabberconstants.*;
 import net.java.sip.communicator.util.*;
 
@@ -89,7 +90,7 @@
         provider.addRegistrationStateChangeListener(new RegistrationStateListener());
 
         // register the KeepAlive Extension in the smack library
-        ProviderManager.addIQProvider(KeepAliveEventProvider.ELEMENT_NAME,
+        ProviderManager.getInstance().addIQProvider(KeepAliveEventProvider.ELEMENT_NAME,
                                              KeepAliveEventProvider.NAMESPACE,
                                              new KeepAliveEventProvider());
     }
@@ -198,11 +199,19 @@
         {
             assertConnected();
 
-            Chat chat =
-            jabberProvider.getConnection().
-                createChat(to.getAddress());
+            org.jivesoftware.smack.MessageListener msgListener = 
+                new org.jivesoftware.smack.MessageListener() {
+				public void processMessage(Chat arg0, org.jivesoftware.smack.packet.Message arg1) {
+				}
+            };
+
+            Chat chat = jabberProvider.getConnection().getChatManager().createChat(
+            		to.getAddress(), msgListener
+            );
+            
+            org.jivesoftware.smack.packet.Message msg = 
+            	new org.jivesoftware.smack.packet.Message();
 
-            org.jivesoftware.smack.packet.Message msg = chat.createMessage();
             msg.setBody(message.getContent());
             msg.addExtension(new Version());
 
@@ -350,7 +359,7 @@
             Contact sourceContact =
                 opSetPersPresence.findContactByID(fromUserID);
 
-            if(msg.getType() == org.jivesoftware.smack.packet.Message.Type.ERROR)
+            if(msg.getType() == org.jivesoftware.smack.packet.Message.Type.error)
             {
                 logger.info("Message error received from " + fromUserID);
 

File [changed]: ServerStoredContactListJabberImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/impl/protocol/jabber/ServerStoredContactListJabberImpl.java?r1=1.9&r2=1.10
Delta lines:  +8 -6
-------------------
--- ServerStoredContactListJabberImpl.java	9 Nov 2006 18:15:53 -0000	1.9
+++ ServerStoredContactListJabberImpl.java	4 Apr 2007 12:53:06 -0000	1.10
@@ -9,6 +9,7 @@
 import java.util.*;
 
 import org.jivesoftware.smack.*;
+import org.jivesoftware.smack.packet.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
@@ -626,7 +627,7 @@
         // first if unfiled exntries will move them in a group
         if(roster.getUnfiledEntryCount() > 0)
         {
-            Iterator iter = roster.getUnfiledEntries();
+            Iterator iter = roster.getUnfiledEntries().iterator();
             while (iter.hasNext())
             {
                 RosterEntry item = (RosterEntry) iter.next();
@@ -651,7 +652,7 @@
 
 
         // fill in root group
-        Iterator iter = roster.getGroups();
+        Iterator iter = roster.getGroups().iterator();
         while (iter.hasNext())
         {
             RosterGroup item = (RosterGroup) iter.next();
@@ -663,7 +664,8 @@
             {
                 // create the group as it doesn't exist
                 ContactGroupJabberImpl newGroup =
-                new ContactGroupJabberImpl(item, item.getEntries(), this, true);
+                new ContactGroupJabberImpl(
+                    item, item.getEntries().iterator(), this, true);
 
                 rootGroup.addSubGroup(newGroup);
 
@@ -778,7 +780,7 @@
                                           true);
 
                 boolean isUnfiledEntry = true;
-                Iterator groupIter = entry.getGroups();
+                Iterator groupIter = entry.getGroups().iterator();
                 while (groupIter.hasNext())
                 {
                     RosterGroup group = (RosterGroup) groupIter.next();
@@ -822,7 +824,7 @@
                 String contactID = (String) iter.next();
                 RosterEntry entry = roster.getEntry(contactID);
 
-                Iterator iter1 = entry.getGroups();
+                Iterator iter1 = entry.getGroups().iterator();
                 while (iter1.hasNext())
                 {
                     RosterGroup gr = (RosterGroup) iter1.next();
@@ -933,7 +935,7 @@
             }
         }
 
-        public void presenceChanged(String XMPPAddress)
+        public void presenceChanged(Presence presence)
         {}
     }
 }

File [changed]: ContactGroupJabberImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java?r1=1.1&r2=1.2
Delta lines:  +2 -2
-------------------
--- ContactGroupJabberImpl.java	21 Sep 2006 08:28:39 -0000	1.1
+++ ContactGroupJabberImpl.java	4 Apr 2007 12:53:06 -0000	1.2
@@ -441,7 +441,7 @@
 
         this.rosterGroup = source;
 
-        Iterator iter = source.getEntries();
+        Iterator iter = source.getEntries().iterator();
         while (iter.hasNext())
         {
             RosterEntry item = (RosterEntry) iter.next();
@@ -501,7 +501,7 @@
         // clear current buddies . new entries will be added
         buddies.clear();
 
-        Iterator iter = newGroup.getEntries();
+        Iterator iter = newGroup.getEntries().iterator();
         while (iter.hasNext())
         {
             RosterEntry item = (RosterEntry) iter.next();

File [changed]: ProtocolProviderServiceJabberImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java?r1=1.27&r2=1.28
Delta lines:  +28 -8
--------------------
--- ProtocolProviderServiceJabberImpl.java	10 Mar 2007 14:33:46 -0000	1.27
+++ ProtocolProviderServiceJabberImpl.java	4 Apr 2007 12:53:06 -0000	1.28
@@ -270,14 +270,19 @@
                     logger.error("Domain not resolved " + ex1.getMessage());
                 }
 
-                Roster.setDefaultSubscriptionMode(Roster.SUBSCRIPTION_MANUAL);
+                Roster.setDefaultSubscriptionMode(Roster.SubscriptionMode.manual);
 
                 try
                 {
-                    connection = new XMPPConnection(
+                    ConnectionConfiguration confConn = 
+                	new ConnectionConfiguration(
                         serverAddress,
                         Integer.parseInt(serverPort),
-                        serviceName);
+                			serviceName
+                    );
+                    connection = new XMPPConnection(confConn);
+                    
+                    connection.connect();
                 }
                 catch (XMPPException exc)
                 {
@@ -310,7 +315,7 @@
                     this.reconnecting = false;
 
                     connection.getRoster().
-                        setSubscriptionMode(Roster.SUBSCRIPTION_MANUAL);
+                        setSubscriptionMode(Roster.SubscriptionMode.manual);
 
                     fireRegistrationStateChanged(
                         getRegistrationState(),
@@ -352,7 +357,7 @@
         RegistrationState currRegState = getRegistrationState();
 
         if(connection != null)
-            connection.close();
+            connection.disconnect();
 
         if(fireEvent)
         {
@@ -490,7 +495,7 @@
     public void shutdown()
     {
         synchronized(initializationLock){
-            connection.close();
+            connection.disconnect();
             connection = null;
             isInitialized = false;
         }
@@ -628,6 +633,21 @@
                 reregister();
             else
                 reconnecting = false;
+        }
+
+        public void reconnectingIn(int i)
+        {
+            logger.info("reconnectingIn " + i);
+        }
+
+        public void reconnectionSuccessful()
+        {
+            logger.info("reconnectionSuccessful");
+        }
+
+        public void reconnectionFailed(Exception exception)
+        {
+            logger.info("reconnectionFailed ", exception);
         }
     }
 

File [changed]: OperationSetPersistentPresenceJabberImpl.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetPersistentPresenceJabberImpl.java?r1=1.11&r2=1.12
Delta lines:  +17 -27
---------------------
--- OperationSetPersistentPresenceJabberImpl.java	19 Oct 2006 14:25:48 -0000	1.11
+++ OperationSetPersistentPresenceJabberImpl.java	4 Apr 2007 12:53:06 -0000	1.12
@@ -78,8 +78,6 @@
         supportedPresenceStatusSet.add(JabberStatusEnum.AWAY);
         supportedPresenceStatusSet.add(JabberStatusEnum.DO_NOT_DISTURB);
         supportedPresenceStatusSet.add(JabberStatusEnum.FREE_FOR_CHAT);
-        supportedPresenceStatusSet.add(JabberStatusEnum.INVISIBLE);
-        supportedPresenceStatusSet.add(JabberStatusEnum.EXTENDED_AWAY);
         supportedPresenceStatusSet.add(JabberStatusEnum.OFFLINE);
         supportedPresenceStatusSet.add(JabberStatusEnum.AVAILABLE);
     }
@@ -91,17 +89,13 @@
     private static Map scToJabberModesMappings = new Hashtable();
     static{
         scToJabberModesMappings.put(JabberStatusEnum.AWAY,
-                                  Presence.Mode.AWAY);
+                                  Presence.Mode.away);
         scToJabberModesMappings.put(JabberStatusEnum.DO_NOT_DISTURB,
-                                  Presence.Mode.DO_NOT_DISTURB);
+                                  Presence.Mode.dnd);
         scToJabberModesMappings.put(JabberStatusEnum.FREE_FOR_CHAT,
-                                  Presence.Mode.CHAT);
-        scToJabberModesMappings.put(JabberStatusEnum.INVISIBLE,
-                                  Presence.Mode.INVISIBLE);
-        scToJabberModesMappings.put(JabberStatusEnum.EXTENDED_AWAY,
-                                  Presence.Mode.EXTENDED_AWAY);
+                                  Presence.Mode.chat);
         scToJabberModesMappings.put(JabberStatusEnum.AVAILABLE,
-                                  Presence.Mode.AVAILABLE);
+                                  Presence.Mode.available);
     }
 
     /**
@@ -414,12 +408,12 @@
         Presence presence = null;
         if(((JabberStatusEnum)status).equals(JabberStatusEnum.OFFLINE))
         {
-            presence = new Presence(Presence.Type.UNAVAILABLE);
+            presence = new Presence(Presence.Type.unavailable);
             jabberProvider.unregister();
         }
         else
         {
-            presence = new Presence(Presence.Type.AVAILABLE);
+            presence = new Presence(Presence.Type.available);
             presence.setMode(presenceStatusToJabberMode((JabberStatusEnum)status));
 
             presence.setStatus(statusMessage);
@@ -665,18 +659,14 @@
      */
     private JabberStatusEnum jabberStatusToPresenceStatus(Presence.Mode mode)
     {
-        if(mode.equals(Presence.Mode.AVAILABLE))
+        if(mode.equals(Presence.Mode.available))
             return JabberStatusEnum.AVAILABLE;
-        else if(mode.equals(Presence.Mode.AWAY))
+        else if(mode.equals(Presence.Mode.away))
             return JabberStatusEnum.AWAY;
-        else if(mode.equals(Presence.Mode.CHAT))
+        else if(mode.equals(Presence.Mode.chat))
             return JabberStatusEnum.FREE_FOR_CHAT;
-        else if(mode.equals(Presence.Mode.DO_NOT_DISTURB))
+        else if(mode.equals(Presence.Mode.dnd))
             return JabberStatusEnum.DO_NOT_DISTURB;
-        else if(mode.equals(Presence.Mode.EXTENDED_AWAY))
-            return JabberStatusEnum.EXTENDED_AWAY;
-        else if(mode.equals(Presence.Mode.INVISIBLE))
-            return JabberStatusEnum.INVISIBLE;
         else return JabberStatusEnum.OFFLINE;
     }
 
@@ -1011,11 +1001,11 @@
         public void entriesDeleted(Collection addresses)
         {}
 
-        public void presenceChanged(String XMPPAddress)
+        public void presenceChanged(Presence presence)
         {
             try
             {
-                String userID = StringUtils.parseBareAddress(XMPPAddress);
+                String userID = StringUtils.parseBareAddress(presence.getFrom());
 
                 logger.debug("Received a status update for buddy=" +
                              userID);
@@ -1071,7 +1061,7 @@
         {
             Presence presence = (Presence)packet;
 
-            if (presence != null && presence.getType() == Presence.Type.SUBSCRIBE)
+            if (presence != null && presence.getType() == Presence.Type.subscribe)
             {
                 logger.trace(presence.getFrom() + " wants to add you to its contact list");
                 // buddy want to add you to its roster
@@ -1086,21 +1076,21 @@
 
                 if(response != null && response.getResponseCode().equals(AuthorizationResponse.ACCEPT))
                 {
-                    Presence responsePacket = new Presence(Presence.Type.SUBSCRIBED);
+                    Presence responsePacket = new Presence(Presence.Type.subscribed);
                     responsePacket.setTo(fromID);
                     logger.info("Sending Accepted Subscription");
                     jabberProvider.getConnection().sendPacket(responsePacket);
                 }
                 else
                 {
-                    Presence responsePacket = new Presence(Presence.Type.UNSUBSCRIBED);
+                    Presence responsePacket = new Presence(Presence.Type.unsubscribed);
                     responsePacket.setTo(fromID);
                     logger.info("Sending Rejected Subscription");
                     jabberProvider.getConnection().sendPacket(responsePacket);
                 }
 
             }
-            else if (presence != null && presence.getType() == Presence.Type.UNSUBSCRIBED)
+            else if (presence != null && presence.getType() == Presence.Type.unsubscribed)
             {
                 logger.trace(presence.getFrom() + " does not allow your subscription");
                 ContactJabberImpl contact =
@@ -1115,7 +1105,7 @@
                     ssContactList.removeContact(contact);
                 }
             }
-            else if (presence != null && presence.getType() == Presence.Type.SUBSCRIBED)
+            else if (presence != null && presence.getType() == Presence.Type.subscribed)
             {
                 ContactJabberImpl contact =
                     ssContactList.findContactById(presence.getFrom());

Directory: /sip-communicator/src/net/java/sip/communicator/service/protocol/jabberconstants/
============================================================================================

File [changed]: JabberStatusEnum.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/src/net/java/sip/communicator/service/protocol/jabberconstants/JabberStatusEnum.java?r1=1.4&r2=1.5
Delta lines:  +0 -22
--------------------
--- JabberStatusEnum.java	3 Nov 2006 11:23:05 -0000	1.4
+++ JabberStatusEnum.java	4 Apr 2007 12:53:06 -0000	1.5
@@ -45,15 +45,6 @@
                 loadIcon("resources/images/jabber/jabber16x16-online.png"));
 
     /**
-     * The Invisible status. Indicates that the user has connectivity even
-     * though it may appear otherwise to others, to whom she would appear to be
-     * offline.
-     */
-    public static final JabberStatusEnum INVISIBLE
-        = new JabberStatusEnum(45, "Invisible",
-                loadIcon("resources/images/jabber/jabber16x16-invisible.png"));
-
-    /**
      * The Away  status. Indicates that the user has connectivity but might
      * not be able to immediately act upon initiation of communication.
      */
@@ -61,17 +52,6 @@
         = new JabberStatusEnum(40, "Away",
                 loadIcon("resources/images/jabber/jabber16x16-away.png"));
 
-
-    /**
-     * The Not Available status. Indicates that the user has connectivity
-     * but might not be able to immediately act (i.e. even less immediately than
-     * when in an Away status ;-P ) upon initiation of communication.
-     *
-     */
-    public static final JabberStatusEnum EXTENDED_AWAY
-        = new JabberStatusEnum(35, "Extended Away",
-                loadIcon("resources/images/jabber/jabber16x16-na.png"));
-
     /**
      * The DND status. Indicates that the user has connectivity but prefers
      * not to be contacted.
@@ -95,9 +75,7 @@
     static{
             jabberStatusSet.add(FREE_FOR_CHAT);
             jabberStatusSet.add(AVAILABLE);
-            jabberStatusSet.add(INVISIBLE);
             jabberStatusSet.add(AWAY);
-            jabberStatusSet.add(EXTENDED_AWAY);
             jabberStatusSet.add(DO_NOT_DISTURB);
             jabberStatusSet.add(OFFLINE);
     }

Directory: /sip-communicator/
=============================

File [changed]: build.xml
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/build.xml?r1=1.133&r2=1.134
Delta lines:  +9 -3
-------------------
--- build.xml	21 Mar 2007 13:39:32 -0000	1.133
+++ build.xml	4 Apr 2007 12:53:07 -0000	1.134
@@ -1147,7 +1147,7 @@
             <zipfileset src="${lib.noinst}/joscar-client.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/joscar-common.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/joscar-protocol.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0Beta4.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/jsocks-klea.jar" prefix=""/>
             <zipfileset dir="resources/images/icq"
                             prefix="resources/images/icq"/>
@@ -1164,7 +1164,7 @@
             <zipfileset src="${lib.noinst}/joscar-client.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/joscar-common.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/joscar-protocol.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0Beta4.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/jsocks-klea.jar" prefix=""/>
         </jar>
     </target>
@@ -1188,6 +1188,9 @@
                 prefix="net/java/sip/communicator/impl/protocol/jabber"/>
             <zipfileset src="${lib.noinst}/smack.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/smackx.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/smackx-jingle.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/backport-util-concurrent.jar" prefix=""/>
             <zipfileset dir="resources/images/jabber"
                             prefix="resources/images/jabber"/>
         </jar>
@@ -1203,6 +1206,9 @@
                 prefix="net/java/sip/communicator/slick/protocol/jabber"/>
             <zipfileset src="${lib.noinst}/smack.jar" prefix=""/>
             <zipfileset src="${lib.noinst}/smackx.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/smackx-jingle.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/retroweaver-rt-2.0.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/backport-util-concurrent.jar" prefix=""/>
         </jar>
     </target>
 

Directory: /sip-communicator/test/net/java/sip/communicator/slick/protocol/jabber/
==================================================================================

File [changed]: TestOperationSetPresence.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPresence.java?r1=1.6&r2=1.7
Delta lines:  +0 -32
--------------------
--- TestOperationSetPresence.java	21 Mar 2007 16:10:12 -0000	1.6
+++ TestOperationSetPresence.java	4 Apr 2007 12:53:07 -0000	1.7
@@ -188,17 +188,6 @@
     }
 
     /**
-     * Verify that changing state to NOT_AVAILABLE works as supposed to and that it
-     * generates the corresponding event.
-     * @throws Exception in case a failure occurs while the operation set
-     * is switching to the new state.
-     */
-    public void testChangingStateToNotAvailable() throws Exception
-    {
-        subtestStateTransition(JabberStatusEnum.EXTENDED_AWAY);
-    }
-
-    /**
      * Verify that changing state to DND works as supposed to and that it
      * generates the corresponding event.
      * @throws Exception in case a failure occurs while the operation set
@@ -210,17 +199,6 @@
     }
 
     /**
-     * Verify that changing state to INVISIBLE works as supposed to and that it
-     * generates the corresponding event.
-     * @throws Exception in case a failure occurs while the operation set
-     * is switching to the new state.
-     */
-    public void testChangingStateToInvisible() throws Exception
-    {
-        subtestStateTransition(JabberStatusEnum.INVISIBLE);
-    }
-
-    /**
      * Verify that changing state to FREE_FOR_CHAT works as supposed to and that it
      * generates the corresponding event.
      * @throws Exception in case a failure occurs while the operation set
@@ -357,11 +335,6 @@
         subtestQueryContactStatus(JabberStatusEnum.AWAY,
                                   JabberStatusEnum.AWAY);
 
-        // --- NA ---
-        logger.debug("Will Query an NA contact.");
-        subtestQueryContactStatus(JabberStatusEnum.EXTENDED_AWAY,
-                                  JabberStatusEnum.EXTENDED_AWAY);
-
         // --- DND ---
         logger.debug("Will Query a DND contact.");
         subtestQueryContactStatus(JabberStatusEnum.DO_NOT_DISTURB,
@@ -371,11 +344,6 @@
         logger.debug("Will Query a Free For Chat contact.");
         subtestQueryContactStatus(JabberStatusEnum.FREE_FOR_CHAT,
                                   JabberStatusEnum.FREE_FOR_CHAT);
-
-        // --- INVISIBLE ---
-        logger.debug("Will Query an Invisible contact.");
-        subtestQueryContactStatus(JabberStatusEnum.INVISIBLE,
-                                  JabberStatusEnum.INVISIBLE);
 
         // --- Online ---
         logger.debug("Will Query an Online contact.");

File [changed]: TestOperationSetBasicInstantMessaging.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetBasicInstantMessaging.java?r1=1.5&r2=1.6
Delta lines:  +2 -1
-------------------
--- TestOperationSetBasicInstantMessaging.java	23 Mar 2007 11:39:47 -0000	1.5
+++ TestOperationSetBasicInstantMessaging.java	4 Apr 2007 12:53:07 -0000	1.6
@@ -190,9 +190,10 @@
             // the contact already exist its OK
         }
 
+        logger.info("will wait till the list prepare is completed");
         synchronized(o)
         {
-            o.wait(2000);
+            o.wait(4000);
         }
     }
 




---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe at sip-communicator.dev.java.net
For additional commands, e-mail: cvs-help at sip-communicator.dev.java.net





More information about the commits mailing list