From f88a0a00908e7419daf5a7f975d179b4f72e205f Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <adamcik@samfundet.no>
Date: Wed, 20 Jul 2011 20:23:14 +0200
Subject: [PATCH] Migrate connection_test and support any number of blanks as
 empty command

---
 mopidy/frontends/mpd/protocol/empty.py        |  2 +-
 tests/frontends/mpd/connection_test.py        | 53 -------------------
 .../frontends/mpd/protocol/connection_test.py | 43 +++++++++++++++
 3 files changed, 44 insertions(+), 54 deletions(-)
 delete mode 100644 tests/frontends/mpd/connection_test.py
 create mode 100644 tests/frontends/mpd/protocol/connection_test.py

diff --git a/mopidy/frontends/mpd/protocol/empty.py b/mopidy/frontends/mpd/protocol/empty.py
index 0e418551..33b3bd9f 100644
--- a/mopidy/frontends/mpd/protocol/empty.py
+++ b/mopidy/frontends/mpd/protocol/empty.py
@@ -1,6 +1,6 @@
 from mopidy.frontends.mpd.protocol import handle_request
 
-@handle_request(r'^$')
+@handle_request(r'^\s*$')
 def empty(context):
     """The original MPD server returns ``OK`` on an empty request."""
     pass
diff --git a/tests/frontends/mpd/connection_test.py b/tests/frontends/mpd/connection_test.py
deleted file mode 100644
index 82debabb..00000000
--- a/tests/frontends/mpd/connection_test.py
+++ /dev/null
@@ -1,53 +0,0 @@
-import mock
-import unittest
-
-from mopidy import settings
-from mopidy.backends.dummy import DummyBackend
-from mopidy.frontends.mpd import MpdSession
-from mopidy.frontends.mpd.dispatcher import MpdDispatcher
-from mopidy.mixers.dummy import DummyMixer
-
-class ConnectionHandlerTest(unittest.TestCase):
-    def setUp(self):
-        self.backend = DummyBackend.start().proxy()
-        self.mixer = DummyMixer.start().proxy()
-        self.session = mock.Mock(spec=MpdSession)
-        self.dispatcher = MpdDispatcher(session=self.session)
-
-    def tearDown(self):
-        self.backend.stop().get()
-        self.mixer.stop().get()
-        settings.runtime.clear()
-
-    def test_close_closes_the_client_connection(self):
-        result = self.dispatcher.handle_request(u'close')
-        self.assert_(self.session.close.called,
-            u'Should call close() on MpdSession')
-        self.assert_(u'OK' in result)
-
-    def test_empty_request(self):
-        result = self.dispatcher.handle_request(u'')
-        self.assert_(u'OK' in result)
-
-    def test_kill(self):
-        result = self.dispatcher.handle_request(u'kill')
-        self.assert_(u'ACK [4@0] {kill} you don\'t have permission for "kill"' in result)
-
-    def test_valid_password_is_accepted(self):
-        settings.MPD_SERVER_PASSWORD = u'topsecret'
-        result = self.dispatcher.handle_request(u'password "topsecret"')
-        self.assert_(u'OK' in result)
-
-    def test_invalid_password_is_not_accepted(self):
-        settings.MPD_SERVER_PASSWORD = u'topsecret'
-        result = self.dispatcher.handle_request(u'password "secret"')
-        self.assert_(u'ACK [3@0] {password} incorrect password' in result)
-
-    def test_any_password_is_not_accepted_when_password_check_turned_off(self):
-        settings.MPD_SERVER_PASSWORD = None
-        result = self.dispatcher.handle_request(u'password "secret"')
-        self.assert_(u'ACK [3@0] {password} incorrect password' in result)
-
-    def test_ping(self):
-        result = self.dispatcher.handle_request(u'ping')
-        self.assert_(u'OK' in result)
diff --git a/tests/frontends/mpd/protocol/connection_test.py b/tests/frontends/mpd/protocol/connection_test.py
new file mode 100644
index 00000000..33b5a1a2
--- /dev/null
+++ b/tests/frontends/mpd/protocol/connection_test.py
@@ -0,0 +1,43 @@
+from mock import patch
+
+from mopidy import settings
+
+from tests.frontends.mpd import protocol
+
+class ConnectionHandlerTest(protocol.BaseTestCase):
+    def test_close_closes_the_client_connection(self):
+        with patch.object(self.session, 'close') as close_mock:
+            response = self.sendRequest(u'close')
+            close_mock.assertEqualResponsecalled_once_with()
+        self.assertEqualResponse(u'OK')
+
+    def test_empty_request(self):
+        self.sendRequest(u'')
+        self.assertEqualResponse(u'OK')
+
+        self.sendRequest(u'  ')
+        self.assertEqualResponse(u'OK')
+
+    def test_kill(self):
+        self.sendRequest(u'kill')
+        self.assertEqualResponse(
+            u'ACK [4@0] {kill} you don\'t have permission for "kill"')
+
+    def test_valid_password_is_accepted(self):
+        settings.MPD_SERVER_PASSWORD = u'topsecret'
+        self.sendRequest(u'password "topsecret"')
+        self.assertEqualResponse(u'OK')
+
+    def test_invalid_password_is_not_accepted(self):
+        settings.MPD_SERVER_PASSWORD = u'topsecret'
+        self.sendRequest(u'password "secret"')
+        self.assertEqualResponse(u'ACK [3@0] {password} incorrect password')
+
+    def test_any_password_is_not_accepted_when_password_check_turned_off(self):
+        settings.MPD_SERVER_PASSWORD = None
+        self.sendRequest(u'password "secret"')
+        self.assertEqualResponse(u'ACK [3@0] {password} incorrect password')
+
+    def test_ping(self):
+        self.sendRequest(u'ping')
+        self.assertEqualResponse(u'OK')