From 94ab12b13cf407e5f3b9914862209d97f749c33b Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 30 Apr 2013 23:42:53 +0200 Subject: [PATCH] commands: Update override parsing tests --- tests/commands_test.py | 44 +++++++++++++++++++++++++++++++++++++ tests/config/config_test.py | 28 ----------------------- 2 files changed, 44 insertions(+), 28 deletions(-) create mode 100644 tests/commands_test.py diff --git a/tests/commands_test.py b/tests/commands_test.py new file mode 100644 index 00000000..35fd0de5 --- /dev/null +++ b/tests/commands_test.py @@ -0,0 +1,44 @@ +from __future__ import unicode_literals + +import argparse +import unittest + +from mopidy import commands + + +class ConfigOverrideTypeTest(unittest.TestCase): + def test_valid_override(self): + expected = (b'section', b'key', b'value') + self.assertEqual( + expected, commands.config_override_type(b'section/key=value')) + self.assertEqual( + expected, commands.config_override_type(b'section/key=value ')) + self.assertEqual( + expected, commands.config_override_type(b'section/key =value')) + self.assertEqual( + expected, commands.config_override_type(b'section /key=value')) + + def test_valid_override_is_bytes(self): + section, key, value = commands.config_override_type( + b'section/key=value') + self.assertIsInstance(section, bytes) + self.assertIsInstance(key, bytes) + self.assertIsInstance(value, bytes) + + def test_empty_override(self): + expected = ('section', 'key', '') + self.assertEqual( + expected, commands.config_override_type(b'section/key=')) + self.assertEqual( + expected, commands.config_override_type(b'section/key= ')) + + def test_invalid_override(self): + self.assertRaises( + argparse.ArgumentTypeError, + commands.config_override_type, b'section/key') + self.assertRaises( + argparse.ArgumentTypeError, + commands.config_override_type, b'section=') + self.assertRaises( + argparse.ArgumentTypeError, + commands.config_override_type, b'section') diff --git a/tests/config/config_test.py b/tests/config/config_test.py index a792839a..c40baa87 100644 --- a/tests/config/config_test.py +++ b/tests/config/config_test.py @@ -106,31 +106,3 @@ class ValidateTest(unittest.TestCase): self.assertEqual({'foo': {'bar': 'bad'}}, errors) # TODO: add more tests - - -class ParseOverrideTest(unittest.TestCase): - def test_valid_override(self): - expected = (b'section', b'key', b'value') - self.assertEqual(expected, config.parse_override(b'section/key=value')) - self.assertEqual( - expected, config.parse_override(b'section/key=value ')) - self.assertEqual( - expected, config.parse_override(b'section/key =value')) - self.assertEqual( - expected, config.parse_override(b'section /key=value')) - - def test_valid_override_is_bytes(self): - section, key, value = config.parse_override(b'section/key=value') - self.assertIsInstance(section, bytes) - self.assertIsInstance(key, bytes) - self.assertIsInstance(value, bytes) - - def test_empty_override(self): - expected = ('section', 'key', '') - self.assertEqual(expected, config.parse_override(b'section/key=')) - self.assertEqual(expected, config.parse_override(b'section/key= ')) - - def test_invalid_override(self): - self.assertRaises(ValueError, config.parse_override, b'section/key') - self.assertRaises(ValueError, config.parse_override, b'section=') - self.assertRaises(ValueError, config.parse_override, b'section')