DND support

- dnd_action field added darcs-hash:20060122145141-86b55-501a990f765fa66033bdbad9e8da1885a2ef05fe.gz
2006-01-22 15:51:41 +01:00
parent d782022182
commit f8ded9a3d5
11 changed files with 110 additions and 367 deletions
--- a/tests/jmc-test.xml
+++ b/tests/jmc-test.xml
@@ -1,7 +1,7 @@
 <config>
  <jabber>
     <server>127.0.0.1</server> 
-     <port>55555</port> 
+     <port>5347</port> 
     <secret>secret</secret>
     <service>jmc.localhost</service>
     <connectsleep>5</connectsleep>
--- a/tests/test_component.py
+++ b/tests/test_component.py
@@ -137,7 +137,7 @@ class MailComponent_TestCase_NoReg(unittest.TestCase):
                               "<field type=\"text-single\" label=\"Mailbox (IMAP)\" var=\"mailbox\">" + \
                               "<value>INBOX</value>" + \
                               "</field>" + \
-                               "<field type=\"list-single\" label=\"Action when state is 'Free For Chat'\" var=\"ffc_action\">" + \
+                               "<field type=\"list-single\" label=\"Action when state is 'Free For Chat'\" var=\"chat_action\">" + \
                               "<value>2</value>" + \
                               "<option label=\"Do nothing\">" + \
                               "<value>0</value>" + \
@@ -173,7 +173,19 @@ class MailComponent_TestCase_NoReg(unittest.TestCase):
                               "<value>2</value>" + \
                               "</option>" + \
                               "</field>" + \
-                               "<field type=\"list-single\" label=\"Action when state is 'Extended Away'\" var=\"ea_action\">" + \
+                               "<field type=\"list-single\" label=\"Action when state is 'Not Available'\" var=\"xa_action\">" + \
+                               "<value>1</value>" + \
+                               "<option label=\"Do nothing\">" + \
+                               "<value>0</value>" + \
+                               "</option>" + \
+                               "<option label=\"Send mail digest\">" + \
+                               "<value>1</value>" + \
+                               "</option>" + \
+                               "<option label=\"Retrieve mail\">" + \
+                               "<value>2</value>" + \
+                               "</option>" + \
+                               "</field>" + \
+                               "<field type=\"list-single\" label=\"Action when state is 'Do not Disturb'\" var=\"dnd_action\">" + \
                               "<value>1</value>" + \
                               "<option label=\"Do nothing\">" + \
                               "<value>0</value>" + \
@@ -252,7 +264,7 @@ class MailComponent_TestCase_NoReg(unittest.TestCase):
                                 "<field type='text-single' var='mailbox'>" + \
                                 "<value>INBOX</value>" + \
                                 "</field>" + \
-                                 "<field type='list-single' var='ffc_action'>" + \
+                                 "<field type='list-single' var='chat_action'>" + \
                                 "<value>2</value>" + \
                                 "</field>" + \
                                 "<field type='list-single' var='online_action'>" + \
@@ -261,7 +273,10 @@ class MailComponent_TestCase_NoReg(unittest.TestCase):
                                 "<field type='list-single' var='away_action'>" + \
                                 "<value>1</value>" + \
                                 "</field>" + \
-                                 "<field type='list-single' var='ea_action'>" + \
+                                 "<field type='list-single' var='xa_action'>" + \
+                                 "<value>1</value>" + \
+                                 "</field>" + \
+                                 "<field type='list-single' var='dnd_action'>" + \
                                 "<value>1</value>" + \
                                 "</field>" + \
                                 "<field type='list-single' var='offline_action'>" + \
--- a/tests/test_mailconnection_factory.py
+++ b/tests/test_mailconnection_factory.py
@@ -42,56 +42,60 @@ class MailConnectionFactory_TestCase(unittest.TestCase):
        self.assertEquals(mc, mc)

    def test_str_to_mail_connection_imap(self):
-	mc = str_to_mail_connection("imap#login#passwd#host#193#0#0#0#1#2#INBOX")
+	mc = str_to_mail_connection("imap#login#passwd#host#193#0#0#0#1#1#2#INBOX")
        self.assertEquals(mc.get_type(), "imap")
        self.assertEquals(mc.login, "login")
        self.assertEquals(mc.password, "passwd")
        self.assertEquals(mc.host, "host")
        self.assertEquals(mc.port, 193)
        self.assertEquals(mc.mailbox, "INBOX")
-        self.assertEquals(mc.ffc_action, mailconnection.DO_NOTHING)
+        self.assertEquals(mc.chat_action, mailconnection.DO_NOTHING)
        self.assertEquals(mc.online_action, mailconnection.DO_NOTHING)
        self.assertEquals(mc.away_action, mailconnection.DO_NOTHING)
-        self.assertEquals(mc.ea_action, mailconnection.DIGEST)
+        self.assertEquals(mc.xa_action, mailconnection.DIGEST)
+        self.assertEquals(mc.dnd_action, mailconnection.DIGEST)
        self.assertEquals(mc.offline_action, mailconnection.RETRIEVE)

    def test_str_to_mail_connection_imaps(self):
-	mc = str_to_mail_connection("imaps#login#passwd#host#993#0#0#0#1#2#INBOX.SubDir")
+	mc = str_to_mail_connection("imaps#login#passwd#host#993#0#0#0#1#1#2#INBOX.SubDir")
        self.assertEquals(mc.get_type(), "imaps")
        self.assertEquals(mc.login, "login")
        self.assertEquals(mc.password, "passwd")
        self.assertEquals(mc.host, "host")
        self.assertEquals(mc.port, 993)
        self.assertEquals(mc.mailbox, "INBOX.SubDir")
-        self.assertEquals(mc.ffc_action, mailconnection.DO_NOTHING)
+        self.assertEquals(mc.chat_action, mailconnection.DO_NOTHING)
        self.assertEquals(mc.online_action, mailconnection.DO_NOTHING)
        self.assertEquals(mc.away_action, mailconnection.DO_NOTHING)
-        self.assertEquals(mc.ea_action, mailconnection.DIGEST)
+        self.assertEquals(mc.xa_action, mailconnection.DIGEST)
+        self.assertEquals(mc.dnd_action, mailconnection.DIGEST)
        self.assertEquals(mc.offline_action, mailconnection.RETRIEVE)

    def test_str_to_mail_connection_pop3(self):
-	mc = str_to_mail_connection("pop3#login#passwd#host#110#0#0#0#1#2")
+	mc = str_to_mail_connection("pop3#login#passwd#host#110#0#0#0#1#1#2")
        self.assertEquals(mc.get_type(), "pop3")
        self.assertEquals(mc.login, "login")
        self.assertEquals(mc.password, "passwd")
        self.assertEquals(mc.host, "host")
        self.assertEquals(mc.port, 110)
-        self.assertEquals(mc.ffc_action, mailconnection.DO_NOTHING)
+        self.assertEquals(mc.chat_action, mailconnection.DO_NOTHING)
        self.assertEquals(mc.online_action, mailconnection.DO_NOTHING)
        self.assertEquals(mc.away_action, mailconnection.DO_NOTHING)
-        self.assertEquals(mc.ea_action, mailconnection.DIGEST)
+        self.assertEquals(mc.xa_action, mailconnection.DIGEST)
+        self.assertEquals(mc.dnd_action, mailconnection.DIGEST)
        self.assertEquals(mc.offline_action, mailconnection.RETRIEVE)

    def test_str_to_mail_connection_pop3s(self):
-	mc = str_to_mail_connection("pop3s#login#passwd#host#995#0#0#0#1#2")
+	mc = str_to_mail_connection("pop3s#login#passwd#host#995#0#0#0#1#1#2")
        self.assertEquals(mc.get_type(), "pop3s")
        self.assertEquals(mc.login, "login")
        self.assertEquals(mc.password, "passwd")
        self.assertEquals(mc.host, "host")
        self.assertEquals(mc.port, 995)
-        self.assertEquals(mc.ffc_action, mailconnection.DO_NOTHING)
+        self.assertEquals(mc.chat_action, mailconnection.DO_NOTHING)
        self.assertEquals(mc.online_action, mailconnection.DO_NOTHING)
        self.assertEquals(mc.away_action, mailconnection.DO_NOTHING)
-        self.assertEquals(mc.ea_action, mailconnection.DIGEST)
+        self.assertEquals(mc.xa_action, mailconnection.DIGEST)
+        self.assertEquals(mc.dnd_action, mailconnection.DIGEST)
        self.assertEquals(mc.offline_action, mailconnection.RETRIEVE)

--- a/tests/test_storage.py
+++ b/tests/test_storage.py
@@ -52,10 +52,11 @@ class DBMStorage_TestCase(unittest.TestCase):
                                        port = 993,
                                        ssl = True,
                                        mailbox = "INBOX.box1")
-        self._account1.ffc_action = mailconnection.DO_NOTHING
+        self._account1.chat_action = mailconnection.DO_NOTHING
        self._account1.onlline_action = mailconnection.DO_NOTHING
        self._account1.away_action = mailconnection.DO_NOTHING
-        self._account1.ea_action = mailconnection.DO_NOTHING
+        self._account1.xa_action = mailconnection.DO_NOTHING
+        self._account1.dnd_action = mailconnection.DO_NOTHING
        self._account1.offline_action = mailconnection.DO_NOTHING
        self._account2 = IMAPConnection(login = "login2",
                                        password = "password2",
@@ -63,10 +64,11 @@ class DBMStorage_TestCase(unittest.TestCase):
                                        port = 1993,
                                        ssl = False,
                                        mailbox = "INBOX.box2")
-        self._account2.ffc_action = mailconnection.DO_NOTHING
+        self._account2.chat_action = mailconnection.DO_NOTHING
        self._account2.onlline_action = mailconnection.DO_NOTHING
        self._account2.away_action = mailconnection.DO_NOTHING
-        self._account2.ea_action = mailconnection.DO_NOTHING
+        self._account2.xa_action = mailconnection.DO_NOTHING
+        self._account2.dnd_action = mailconnection.DO_NOTHING
        self._account2.offline_action = mailconnection.DO_NOTHING

    def tearDown(self):
--- a/tests/tmp.py
+++ b/tests/tmp.py
@@ -1,28 +0,0 @@
-import dummy_server
-
-server = dummy_server.DummyServer(("localhost", 1143))
-server.responses = ["* OK [CAPABILITY IMAP4 LOGIN-REFERRALS " + \
-                    "AUTH=PLAIN]\r\n", \
-                    lambda data: "* CAPABILITY IMAP4 " + \
-                    "LOGIN-REFERRALS AUTH=PLAIN\r\n" + \
-                    data.split()[0] + \
-                    " OK CAPABILITY completed\r\n", \
-                    lambda data: data.split()[0] + \
-                    " OK LOGIN completed\r\n", \
-                    lambda data: "* 42 EXISTS\r\n* 1 RECENT\r\n* OK" +\
-                    " [UNSEEN 9]\r\n* FLAGS (\Deleted \Seen\*)\r\n*" +\
-                    " OK [PERMANENTFLAGS (\Deleted \Seen\*)\r\n" + \
-                    data.split()[0] + \
-                    " OK [READ-WRITE] SELECT completed\r\n", \
-                    lambda data: "* 1 FETCH ((RFC822) {12}\r\nbody text\r\n)\r\n" + \
-                    data.split()[0] + " OK FETCH completed\r\n", \
-                    lambda data: "* 1 FETCH (FLAGS (\UNSEEN))\r\n" + \
-                    data.split()[0] + " OK STORE completed\r\n"]
-server.queries = ["CAPABILITY", \
-                  "LOGIN login \"pass\"", \
-                  "SELECT INBOX", \
-                  "FETCH 1 (RFC822)", \
-                  "STORE 1 FLAGS (UNSEEN)", \
-                  "LOGOUT"]
-server.serve()
-#server.verify_queries()
--- a/tests/tmp1
+++ b/tests/tmp1
@@ -1,121 +0,0 @@
-<iq from="jmc.localhost" to="test@localhost/test" type="result" id="aad9a">
-<query xmlns="jabber:iq:register">
-<x xmlns="jabber:x:data">
-<title>
-Jabber Mail connection registration</title>
-<instructions>
-Enter anything below</instructions>
-<field type="text-single" label="Connection name" var="name"/>
-<field type="text-single" label="Login" var="login"/>
-<field type="text-private" label="Password" var="password"/>
-<field type="text-single" label="Host" var="host"/>
-<field type="text-single" label="Port" var="port"/>
-<field type="list-single" label="Mailbox type" var="type">
-<option label="POP3">
-<value>
-pop3</value>
-</option>
-<option label="POP3S">
-<value>
-pop3s</value>
-</option>
-<option label="IMAP">
-<value>
-imap</value>
-</option>
-<option label="IMAPS">
-<value>
-imaps</value>
-</option>
-</field>
-<field type="text-single" label="Mailbox (IMAP)" var="mailbox">
-<value>
-INBOX</value>
-</field>
-<field type="list-single" label="Action when state is 'Free For Chat'" var="ffc_action">
-<value>
-2</value>
-<option label="Do nothing">
-<value>
-0</value>
-</option>
-<option label="Send mail digest">
-<value>
-1</value>
-</option>
-<option label="Retrieve mail">
-<value>
-2</value>
-</option>
-</field>
-<field type="list-single" label="Action when state is 'Online'" var="online_action">
-<value>
-2</value>
-<option label="Do nothing">
-<value>
-0</value>
-</option>
-<option label="Send mail digest">
-<value>
-1</value>
-</option>
-<option label="Retrieve mail">
-<value>
-2</value>
-</option>
-</field>
-<field type="list-single" label="Action when state is 'Away'" var="away_action">
-<value>
-1</value>
-<option label="Do nothing">
-<value>
-0</value>
-</option>
-<option label="Send mail digest">
-<value>
-1</value>
-</option>
-<option label="Retrieve mail">
-<value>
-2</value>
-</option>
-</field>
-<field type="list-single" label="Action when state is 'Extended Away'" var="ea_action">
-<value>
-1</value>
-<option label="Do nothing">
-<value>
-0</value>
-</option>
-<option label="Send mail digest">
-<value>
-1</value>
-</option>
-<option label="Retrieve mail">
-<value>
-2</value>
-</option>
-</field>
-<field type="list-single" label="Action when state is 'Offline'" var="offline_action">
-<value>
-0</value>
-<option label="Do nothing">
-<value>
-0</value>
-</option>
-<option label="Send mail digest">
-<value>
-1</value>
-</option>
-<option label="Retrieve mail">
-<value>
-2</value>
-</option>
-</field>
-<field type="text-single" label="Mail check interval (in minutes)" var="interval">
-<value>
-5</value>
-</field>
-</x>
-</query>
-</iq>
--- a/tests/tmp2
+++ b/tests/tmp2
@@ -1,121 +0,0 @@
-<iq from="jmc.localhost" to="test@localhost/test" type="result" id="aad9a">
-<query xmlns="jabber:iq:register">
-<x xmlns="jabber:x:data">
-<title>
-Jabber Mail connection registration</title>
-<instructions>
-Enter anything below</instructions>
-<field type="text-single" label="Connection name" var="name"/>
-<field type="text-single" label="Login" var="login"/>
-<field type="text-private" label="Password" var="password"/>
-<field type="text-single" label="Host" var="host"/>
-<field type="text-single" label="Port" var="port"/>
-<field type="list-single" label="Mailbox type" var="type">
-<option label="POP3">
-<value>
-pop3</value>
-</option>
-<option label="POP3S">
-<value>
-pop3s</value>
-</option>
-<option label="IMAP">
-<value>
-imap</value>
-</option>
-<option label="IMAPS">
-<value>
-imaps</value>
-</option>
-</field>
-<field type="text-single" label="Mailbox (IMAP)" var="mailbox">
-<value>
-INBOX</value>
-</field>
-<field type="list-single" label="Action when state is 'Free For Chat'" var="ffc_action">
-<value>
-2</value>
-<option label="Do nothing">
-<value>
-0</value>
-</option>
-<option label="Send mail digest">
-<value>
-1</value>
-</option>
-<option label="Retrieve mail">
-<value>
-2</value>
-</option>
-</field>
-<field type="list-single" label="Action when state is 'Online'" var="online_action">
-<value>
-2</value>
-<option label="Do nothing">
-<value>
-0</value>
-</option>
-<option label="Send mail digest">
-<value>
-1</value>
-</option>
-<option label="Retrieve mail">
-<value>
-2</value>
-</option>
-</field>
-<field type="list-single" label="Action when state is 'Away'" var="away_action">
-<value>
-1</value>
-<option label="Do nothing">
-<value>
-0</value>
-</option>
-<option label="Send mail digest">
-<value>
-1</value>
-</option>
-<option label="Retrieve mail">
-<value>
-2</value>
-</option>
-</field>
-<field type="list-single" label="Action when state is 'Extended Away'" var="ea_action">
-<value>
-1</value>
-<option label="Do nothing">
-<value>
-0</value>
-</option>
-<option label="Send mail digest">
-<value>
-1</value>
-</option>
-<option label="Retrieve mail">
-<value>
-2</value>
-</option>
-</field>
-<field type="list-single" label="Action when state is 'Offline'" var="offline_action">
-<value>
-0</value>
-<option label="Do nothing">
-<value>
-0</value>
-</option>
-<option label="Send mail digest">
-<value>
-1</value>
-</option>
-<option label="Retrieve mail">
-<value>
-2</value>
-</option>
-</field>
-<field type="text-single" label="Mail check interval (in minutes)" var="interval">
-<value>
-5</value>
-</field>
-</x>
-</query>
-</iq>