Merge changes from branch/gsoc10/xcap and patch sent to dev mailinglist with subject "XCAP tests" which represents the work of Grigorii Balutsel on the "XCAP Support" GSoC 2010 project into trunk.

1 files changed, 12 insertions, 1 deletions

diff --git a/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java b/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java
index 0e77da6..12993c4 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/SipProtocolProviderServiceLick.java
@@ -41,7 +41,7 @@ public class SipProtocolProviderServiceLick
      */
     public static final String DISABLE_ONLINE_TESTS_PROPERTY_NAME
         = "accounts.sip.DISABLE_ONLINE_TESTING";
-    
+
     /**
      * The name of the property the value of which is a formatted string that
      * contains the contact list that.
@@ -50,6 +50,11 @@ public class SipProtocolProviderServiceLick
         = "accounts.sip.CONTACT_LIST";
 
     /**
+     * The name of the property the value of which is XCAP server uri.
+     */
+    public static final String XCAP_SERVER_PROPERTY_NAME = "XCAP_SERVER";
+
+    /**
      * Initializes and registers all tests that we'll run as a part of this
      * slick.
      *
@@ -70,6 +75,9 @@ public class SipProtocolProviderServiceLick
 
         if (offlineMode != null && offlineMode.equalsIgnoreCase("true"))
             SipSlickFixture.onlineTestingDisabled = true;
+        
+        // xcap parsing tests
+        addTest(TestXCapParse.suite());
 
         //First test account installation so that the service that has
         //been installed by it gets tested by the rest of the tests.
@@ -93,6 +101,9 @@ public class SipProtocolProviderServiceLick
     
             // telephony
             addTestSuite(TestOperationSetBasicTelephonySipImpl.class);
+
+            // Server stored info
+            addTest(TestOperationSetServerStoredInfo.suite());
         }
 
         //This must remain after all other tests using the accounts