From 28195110c076da159e0cea03dd3443e840808fdb Mon Sep 17 00:00:00 2001
From: Stefan Hacker <dd0t@users.sourceforge.net>
Date: Sat, 23 Mar 2013 10:35:40 +0100
Subject: [PATCH] Expand unit test coverage for source plugin.

- Added testValidateChannelDB
- Fixed channel validation not considering deleted server
---
 modules/source/source.py      |  5 +++++
 modules/source/source_test.py | 29 +++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/modules/source/source.py b/modules/source/source.py
index 6602ffc..1c43721 100644
--- a/modules/source/source.py
+++ b/modules/source/source.py
@@ -136,6 +136,11 @@ class source(MumoModule):
                 # Channel no longer exists
                 log.debug("(%d) Channel %d no longer exists. Dropped.", sid, cid)
                 self.db.dropChannel(sid, cid)
+            except AttributeError:
+                # Server no longer exists
+                assert(current_mumble_server == None)
+                log.debug("(%d) Server for channel %d no longer exists. Dropped.", sid, cid)
+                self.db.dropChannel(sid, cid)
     
     def disconnected(self): pass
     
diff --git a/modules/source/source_test.py b/modules/source/source_test.py
index e27cd8d..fcd93bd 100644
--- a/modules/source/source_test.py
+++ b/modules/source/source_test.py
@@ -134,14 +134,18 @@ ACLS = MockACLHelper
 
 class MetaMock():
     def __init__(self):
-        self.s = ServerMock(1)
+        #TODO: Create range of server (or even cretae them on demand)
+        self.servers = {1:ServerMock(1),
+                        5:ServerMock(5),
+                        10:ServerMock(10)}
+        self.s = self.servers[1] # Shorthand
         
     def getServer(self, sid):
-        assert(sid == self.s.id())
-        return self.s
+        return self.servers.get(sid, None)
 
     def _reset(self):
-        self.s._reset()
+        for server in self.servers.itervalues():
+            server._reset()
 
 class ManagerMock():
     SERVERS_ALL = [-1]
@@ -417,6 +421,23 @@ class Test(unittest.TestCase):
         self.assertEqual(user_state.channel, TEAM_BLUE_SID)
         self.assertEqual(mumble_server.user_state[0], user_state)
         
+    def testValidateChannelDB(self):
+        self.resetState()
+        
+        self.s.db.registerChannel(5, 6, "7")
+        self.s.db.registerChannel(5, 7, "7", "8")
+        self.s.db.registerChannel(5, 8, "7", "8", 9)
+        self.s.db.registerChannel(6, 9, "8", "9", 10)
+        self.s.db.registerChannel(5, 10, "7", "123", 9)
+        
+        game = 'cstrike'; server = '[A123:123]'; team = 1
+        self.s.getOrCreateChannelFor(self.mserv, game, server, team)
+        self.s.validateChannelDB()
+        self.assertEqual(len(self.s.db.registeredChannels()), 3)
+        
+        
+        
+        
     def testSetACLsForGameChannel(self):
         self.resetState()