Fixes working with server-side readonly groups (shared groups in OF), handles 406 error while editing roster items.

6 files changed, 64 insertions, 22 deletions

diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPersistentPresence.java b/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPersistentPresence.java
index a77eb65..51961da 100644
--- a/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPersistentPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/gibberish/TestOperationSetPersistentPresence.java
@@ -280,10 +280,17 @@ public class TestOperationSetPersistentPresence
         opSetPersPresence1
             .addServerStoredGroupChangeListener(groupChangeCollector);
 
-        //create the group
-        opSetPersPresence1.removeServerStoredContactGroup(
-            opSetPersPresence1.getServerStoredContactListRoot()
-                .getGroup(testGroupName2));
+        try
+        {
+            // remove the group
+            opSetPersPresence1.removeServerStoredContactGroup(
+                opSetPersPresence1.getServerStoredContactListRoot()
+                    .getGroup(testGroupName2));
+        }
+        catch(OperationFailedException ex)
+        {
+            logger.error("error removing group", ex);
+        }
 
         groupChangeCollector.waitForEvent(10000);
 
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPersistentPresence.java b/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPersistentPresence.java
index ffd9f30..9478cca 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPersistentPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/icq/TestOperationSetPersistentPresence.java
@@ -346,10 +346,17 @@ public class TestOperationSetPersistentPresence
         opSetPersPresence
             .addServerStoredGroupChangeListener(groupChangeCollector);
 
-        //create the group
-        opSetPersPresence.removeServerStoredContactGroup(
-            opSetPersPresence.getServerStoredContactListRoot()
-                .getGroup(testGroupName2));
+        try
+        {
+            // remove the group
+            opSetPersPresence.removeServerStoredContactGroup(
+                opSetPersPresence.getServerStoredContactListRoot()
+                    .getGroup(testGroupName2));
+        }
+        catch(OperationFailedException ex)
+        {
+            logger.error("error removing group", ex);
+        }
 
         groupChangeCollector.waitForEvent(10000);
 
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPersistentPresence.java b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPersistentPresence.java
index 5d24a25..0286342 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPersistentPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/TestOperationSetPersistentPresence.java
@@ -276,9 +276,16 @@ public class TestOperationSetPersistentPresence
             .addServerStoredGroupChangeListener(groupChangeCollector);
 
         //create the group
-        opSetPersPresence1.removeServerStoredContactGroup(
-            opSetPersPresence1.getServerStoredContactListRoot()
-                .getGroup(testGroupName2));
+        try
+        {
+            opSetPersPresence1.removeServerStoredContactGroup(
+                opSetPersPresence1.getServerStoredContactListRoot()
+                    .getGroup(testGroupName2));
+        }
+        catch(OperationFailedException ex)
+        {
+            logger.error("error removing group", ex);
+        }
 
         groupChangeCollector.waitForEvent(10000);
 
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPersistentPresence.java b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPersistentPresence.java
index dee8605..82741ed 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPersistentPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/msn/TestOperationSetPersistentPresence.java
@@ -276,10 +276,17 @@ public class TestOperationSetPersistentPresence
         opSetPersPresence1
             .addServerStoredGroupChangeListener(groupChangeCollector);
 
-        //remove the group
-        opSetPersPresence1.removeServerStoredContactGroup(
-            opSetPersPresence1.getServerStoredContactListRoot()
-                .getGroup(testGroupName));
+        try
+        {
+            //remove the group
+            opSetPersPresence1.removeServerStoredContactGroup(
+                opSetPersPresence1.getServerStoredContactListRoot()
+                    .getGroup(testGroupName));
+        }
+        catch(OperationFailedException ex)
+        {
+            logger.error("error removing group", ex);
+        }
 
         groupChangeCollector.waitForEvent(10000);
 
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPersistentPresence.java b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPersistentPresence.java
index 7a3ad7f..df62131 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPersistentPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/TestOperationSetPersistentPresence.java
@@ -281,10 +281,17 @@ public class TestOperationSetPersistentPresence
         this.opSetPersPresence1
             .addServerStoredGroupChangeListener(groupChangeCollector);
 
-        //create the group
-        this.opSetPersPresence1.removeServerStoredContactGroup(
+        try
+        {
+            // remove the group
+            this.opSetPersPresence1.removeServerStoredContactGroup(
                 this.opSetPersPresence1.getServerStoredContactListRoot()
-                .getGroup(testGroupName2));
+                    .getGroup(testGroupName2));
+        }
+        catch(OperationFailedException ex)
+        {
+            logger.error("error removing group", ex);
+        }
 
         groupChangeCollector.waitForEvent(10000);
 
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPersistentPresence.java b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPersistentPresence.java
index 50b2b79..64ede09 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPersistentPresence.java
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/TestOperationSetPersistentPresence.java
@@ -274,10 +274,17 @@ public class TestOperationSetPersistentPresence
         opSetPersPresence1
             .addServerStoredGroupChangeListener(groupChangeCollector);
 
-        //remove the group
-        opSetPersPresence1.removeServerStoredContactGroup(
-            opSetPersPresence1.getServerStoredContactListRoot()
-                .getGroup(testGroupName));
+        try
+        {
+            //remove the group
+            opSetPersPresence1.removeServerStoredContactGroup(
+                opSetPersPresence1.getServerStoredContactListRoot()
+                    .getGroup(testGroupName));
+        }
+        catch(OperationFailedException ex)
+        {
+            logger.error("error removing group", ex);
+        }
 
         groupChangeCollector.waitForEvent(10000);