From 991e86a8cb0c9efcdc32b689fae2d02f494f3f73 Mon Sep 17 00:00:00 2001
From: James Lu <GLolol1@hotmail.com>
Date: Fri, 3 Jul 2015 17:05:44 -0700
Subject: [PATCH] unittests! wow!

---
 tests/test_utils.py | 62 +++++++++++++++++++++++++++++++++++++++++++++
 utils.py            |  7 ++---
 2 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_utils.py

diff --git a/tests/test_utils.py b/tests/test_utils.py
new file mode 100644
index 0000000..7a9c86b
--- /dev/null
+++ b/tests/test_utils.py
@@ -0,0 +1,62 @@
+import sys
+import os
+sys.path.append(os.getcwd())
+import unittest
+
+import utils
+
+def dummyf():
+    pass
+
+class TestUtils(unittest.TestCase):
+    def testTS6UIDGenerator(self):
+        uidgen = utils.TS6UIDGenerator('9PY')
+        self.assertEqual(uidgen.next_uid(), '9PYAAAAAA')
+        self.assertEqual(uidgen.next_uid(), '9PYAAAAAB')
+
+    def test_add_cmd(self):
+        # Without name specified, add_cmd adds a command with the same name
+        # as the function
+        utils.add_cmd(dummyf)
+        utils.add_cmd(dummyf, 'TEST')
+        # All command names should be automatically lowercased.
+        self.assertIn('dummyf', utils.bot_commands)
+        self.assertIn('test', utils.bot_commands)
+        self.assertNotIn('TEST', utils.bot_commands)
+
+    def test_add_hook(self):
+        utils.add_hook(dummyf, 'JOIN')
+        self.assertIn('join', utils.command_hooks)
+        # Again, automatically lowercased.
+        self.assertNotIn('Join', utils.command_hooks)
+        self.assertIn(dummyf, utils.command_hooks['join'])
+
+    def testIsNick(self):
+        self.assertFalse(utils.isNick('abcdefgh', nicklen=3))
+        self.assertTrue(utils.isNick('aBcdefgh', nicklen=30))
+        self.assertTrue(utils.isNick('abcdefgh1'))
+        self.assertTrue(utils.isNick('ABC-def'))
+        self.assertFalse(utils.isNick('-_-'))
+        self.assertFalse(utils.isNick(''))
+        self.assertFalse(utils.isNick(' i lost the game'))
+        self.assertFalse(utils.isNick(':aw4t*9e4t84a3t90$&*6'))
+        self.assertFalse(utils.isNick('9PYAAAAAB'))
+        self.assertTrue(utils.isNick('_9PYAAAAAB\\'))
+
+    def testIsChannel(self):
+        self.assertFalse(utils.isChannel(''))
+        self.assertFalse(utils.isChannel('lol'))
+        self.assertTrue(utils.isChannel('#channel'))
+        self.assertTrue(utils.isChannel('##ABCD'))
+
+    def testIsServerName(self):
+        self.assertFalse(utils.isServerName('s'))
+        self.assertFalse(utils.isServerName('s.'))
+        self.assertFalse(utils.isServerName('.s.s.s'))
+        self.assertTrue(utils.isServerName('Hello.world'))
+        self.assertFalse(utils.isServerName(''))
+        self.assertTrue(utils.isServerName('pylink.overdrive.pw'))
+        self.assertFalse(utils.isServerName(' i lost the game'))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/utils.py b/utils.py
index 4b5621c..783328b 100644
--- a/utils.py
+++ b/utils.py
@@ -75,11 +75,12 @@ def isNick(s, nicklen=None):
 def isChannel(s):
     return s.startswith('#')
 
-def _isASCIIPrintable(s):
-    return all(char in string.printable for char in s)
+def _isASCII(s):
+    chars = string.ascii_letters + string.digits + string.punctuation
+    return all(char in chars for char in s)
 
 def isServerName(s):
-    return _isASCIIPrintable(s) and '.' in s and not s.startswith('.') \
+    return _isASCII(s) and '.' in s and not s.startswith('.') \
         and not s.endswith('.')
 
 def parseModes(args):