X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tests%2Ftestirker.py;h=059f6bdfc4282aa03326a15aa969e44969de6998;hb=fbf251de0ad945d3b25bcd991af64f6836d3ece1;hp=fb7c49d73b99424daace12e4c58ce5e52662f9aa;hpb=b03b9dabdf89cce74ec66c9839c7c6512cf718c9;p=bzrirker.git

diff --git a/tests/testirker.py b/tests/testirker.py
index fb7c49d..059f6bd 100644
--- a/tests/testirker.py
+++ b/tests/testirker.py
@@ -6,7 +6,6 @@ from unittest import TestLoader
 
 from bzrlib import (
     config,
-    tests,
     )
 from bzrlib.bzrdir import BzrDir
 from bzrlib.tests import TestCaseInTempDir
@@ -16,13 +15,14 @@ from bzrlib.plugins.bzrirker.irkerhook import IrkerSender
 def test_suite():
     return TestLoader().loadTestsFromName(__name__)
 
-sample_config=("[DEFAULT]\n"
-        "irker_url=bzr://test.example.test/bzrirker\n"
+sample_config = ("[DEFAULT]\n"
         "irker_project=bzrirker\n"
         "irker_channels=irc://chat.example.test/commits\n")
 
-colour_config=("[DEFAULT]\n"
-        "irker_url=bzr://test.example.test/bzrirker\n"
+no_project_config = ("[DEFAULT]\n"
+        "irker_channels=irc://chat.example.test/commits\n")
+
+colour_config = ("[DEFAULT]\n"
         "irker_project=bzrirker\n"
         "irker_colours=mIRC\n"
         "irker_channels=irc://chat.example.test/commits\n")
@@ -30,18 +30,15 @@ colour_config=("[DEFAULT]\n"
 
 class TestConfigured(TestCaseInTempDir):
 
-    def test_url(self):
-        irker = self.get_irker()
-        self.assertEqual('bzr://test.example.test/bzrirker', irker.url())
-
-    def test_colours(self):
+    def test_no_colours(self):
         irker = self.get_irker()
         self.assertEqual({
             'bold': '', 'green': '', 'blue': '', 'red': '',
             'yellow': '', 'brown': '', 'magenta': '', 'cyan': '',
             'reset': ''}, irker.colours())
 
-        irker = self.get_irker(color_config)
+    def test_colours(self):
+        irker = self.get_irker(colour_config)
         self.assertEqual({
             'bold': '\x02', 'green': '\x0303', 'blue': '\x0302',
             'red': '\x0305', 'yellow': '\x0307', 'brown': '\x0305',
@@ -51,17 +48,27 @@ class TestConfigured(TestCaseInTempDir):
     def test_message(self):
         irker = self.get_irker()
         self.assertEqual(
-                '', irker._format())
-        irker = self.get_irker(color_config)
+                'bzrirker: Sample <john@example.test> work * 1 /  : foo bar ',
+                irker._format())
+
+    def test_no_project(self):
+        irker = self.get_irker(no_project_config)
         self.assertEqual(
-                '', irker._format())
+                'No Project name set: Sample <john@example.test>'
+                ' work * 1 /  : foo bar ',
+                irker._format())
 
+    def test_message_colour(self):
+        irker = self.get_irker(colour_config)
+        self.assertEqual(
+                '\x02bzrirker:\x0f \x0303Sample <john@example.test>\x0f'
+                ' work * \x021\x0f /  \x02\x0f: foo bar ', irker._format())
 
-    def get_irker(sef, text=sample_config):
+    def get_irker(self, text=sample_config):
         my_config = config.MemoryStack(text)
         self.branch = BzrDir.create_branch_convenience('.')
         tree = self.branch.bzrdir.open_workingtree()
-        tree.commit('foo bar baz\nfuzzy\nwuzzy', rev_id='A',
+        tree.commit('foo bar\nfuzzy\nwuzzy', rev_id='A',
                 allow_pointless=True,
                 timestamp=1,
                 timezone=0,
@@ -71,5 +78,3 @@ class TestConfigured(TestCaseInTempDir):
         # We're not calling send, so do the setup stuff here
         irker._setup_revision_and_revno()
         return irker
-        
-