[formatting] reformat using "black -t py34"
getting rid of thinking about consistent formatting...
This commit is contained in:
tobi-wan-kenobi
parent
fa98bcbdd1
commit
30c1f712a6
119 changed files with 3961 additions and 3495 deletions
|
|
@ -5,76 +5,93 @@ import core.config
|
|||
import core.output
|
||||
import core.module
|
||||
|
||||
|
||||
class TestModule(core.module.Module):
|
||||
pass
|
||||
|
||||
|
||||
class i3(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.i3 = core.output.i3()
|
||||
widget = unittest.mock.MagicMock()
|
||||
widget.full_text.return_value = "test"
|
||||
self.someModule = TestModule(config=core.config.Config([]),
|
||||
widgets=[widget, widget, widget])
|
||||
self.paddedTheme = core.theme.Theme(raw_data = {
|
||||
'defaults': { 'padding': ' ' }
|
||||
})
|
||||
self.separator = '***';
|
||||
self.separatorTheme = core.theme.Theme(raw_data = {
|
||||
'defaults': { 'separator': self.separator, 'fg': 'red', 'bg': 'blue' }
|
||||
})
|
||||
self.someModule = TestModule(
|
||||
config=core.config.Config([]), widgets=[widget, widget, widget]
|
||||
)
|
||||
self.paddedTheme = core.theme.Theme(raw_data={"defaults": {"padding": " "}})
|
||||
self.separator = "***"
|
||||
self.separatorTheme = core.theme.Theme(
|
||||
raw_data={
|
||||
"defaults": {"separator": self.separator, "fg": "red", "bg": "blue"}
|
||||
}
|
||||
)
|
||||
self.someBlock = core.output.block(
|
||||
theme=self.separatorTheme,
|
||||
module=self.someModule,
|
||||
widget=self.someModule.widget()
|
||||
module=self.someModule,
|
||||
widget=self.someModule.widget(),
|
||||
)
|
||||
|
||||
def test_start(self):
|
||||
core.event.clear()
|
||||
|
||||
all_data = self.i3.start()
|
||||
data = all_data['blocks']
|
||||
self.assertEqual(1, data['version'], 'i3bar protocol version 1 expected')
|
||||
self.assertTrue(data['click_events'], 'click events should be enabled')
|
||||
self.assertEqual('\n[', all_data['suffix'])
|
||||
data = all_data["blocks"]
|
||||
self.assertEqual(1, data["version"], "i3bar protocol version 1 expected")
|
||||
self.assertTrue(data["click_events"], "click events should be enabled")
|
||||
self.assertEqual("\n[", all_data["suffix"])
|
||||
|
||||
def test_stop(self):
|
||||
self.assertEqual('\n]', self.i3.stop()['suffix'], 'wrong i3bar protocol during stop')
|
||||
self.assertEqual(
|
||||
"\n]", self.i3.stop()["suffix"], "wrong i3bar protocol during stop"
|
||||
)
|
||||
|
||||
def test_no_modules_by_default(self):
|
||||
self.assertEqual(0, len(self.i3.modules()), 'module list should be empty by default')
|
||||
self.assertEqual(
|
||||
0, len(self.i3.modules()), "module list should be empty by default"
|
||||
)
|
||||
|
||||
def test_register_single_module(self):
|
||||
self.i3.modules(self.someModule)
|
||||
self.assertEqual(1, len(self.i3.modules()), 'setting single module does not work')
|
||||
self.assertEqual(
|
||||
1, len(self.i3.modules()), "setting single module does not work"
|
||||
)
|
||||
|
||||
def test_register_multiple_modules(self):
|
||||
self.i3.modules([ self.someModule, self.someModule, self.someModule ])
|
||||
self.assertEqual(3, len(self.i3.modules()), 'setting module list does not work')
|
||||
self.i3.modules([self.someModule, self.someModule, self.someModule])
|
||||
self.assertEqual(3, len(self.i3.modules()), "setting module list does not work")
|
||||
|
||||
def test_draw_existing_module(self):
|
||||
self.i3.test_draw = unittest.mock.MagicMock(return_value={
|
||||
'blocks': { 'test': True }, 'suffix': 'end'
|
||||
})
|
||||
self.i3.draw('test_draw')
|
||||
self.i3.test_draw = unittest.mock.MagicMock(
|
||||
return_value={"blocks": {"test": True}, "suffix": "end"}
|
||||
)
|
||||
self.i3.draw("test_draw")
|
||||
self.i3.test_draw.assert_called_once_with()
|
||||
|
||||
def test_empty_status_line(self):
|
||||
data = self.i3.statusline()
|
||||
self.assertEqual([], data['blocks'], 'expected empty list of status line entries')
|
||||
self.assertEqual(',', data['suffix'], 'expected "," as suffix')
|
||||
self.assertEqual(
|
||||
[], data["blocks"], "expected empty list of status line entries"
|
||||
)
|
||||
self.assertEqual(",", data["suffix"], 'expected "," as suffix')
|
||||
|
||||
def test_statusline(self):
|
||||
self.i3.modules([ self.someModule, self.someModule, self.someModule ])
|
||||
self.i3.modules([self.someModule, self.someModule, self.someModule])
|
||||
self.i3.update()
|
||||
data = self.i3.statusline()
|
||||
self.assertEqual(len(self.someModule.widgets())*3, len(data['blocks']), 'wrong number of widgets')
|
||||
self.assertEqual(
|
||||
len(self.someModule.widgets()) * 3,
|
||||
len(data["blocks"]),
|
||||
"wrong number of widgets",
|
||||
)
|
||||
|
||||
def test_padding(self):
|
||||
self.i3.theme(self.paddedTheme)
|
||||
blk = core.output.block(self.i3.theme(), self.someModule, self.someModule.widget())
|
||||
blk.set('full_text', 'abc')
|
||||
result = blk.dict()['full_text']
|
||||
self.assertEqual(' abc ', result)
|
||||
blk = core.output.block(
|
||||
self.i3.theme(), self.someModule, self.someModule.widget()
|
||||
)
|
||||
blk.set("full_text", "abc")
|
||||
result = blk.dict()["full_text"]
|
||||
self.assertEqual(" abc ", result)
|
||||
|
||||
def test_no_separator(self):
|
||||
result = self.i3.__separator_block(self.someModule, self.someModule.widget())
|
||||
|
|
@ -84,9 +101,12 @@ class i3(unittest.TestCase):
|
|||
self.i3.theme(self.separatorTheme)
|
||||
result = self.i3.__separator_block(self.someModule, self.someModule.widget())
|
||||
self.assertEqual(1, len(result))
|
||||
self.assertEqual('***', result[0].dict()['full_text'])
|
||||
self.assertTrue(result[0].dict().get('_decorator', False))
|
||||
self.assertEqual(self.separatorTheme.get('bg', self.someModule.widget()), result[0].dict()['color'])
|
||||
self.assertEqual("***", result[0].dict()["full_text"])
|
||||
self.assertTrue(result[0].dict().get("_decorator", False))
|
||||
self.assertEqual(
|
||||
self.separatorTheme.get("bg", self.someModule.widget()),
|
||||
result[0].dict()["color"],
|
||||
)
|
||||
|
||||
def test_dump_json(self):
|
||||
obj = unittest.mock.MagicMock()
|
||||
|
|
@ -95,47 +115,48 @@ class i3(unittest.TestCase):
|
|||
obj.dict_assert_called_once_with()
|
||||
|
||||
def test_assign(self):
|
||||
src = {
|
||||
'a': 'x', 'b': 'y', 'c': 'z'
|
||||
}
|
||||
src = {"a": "x", "b": "y", "c": "z"}
|
||||
dst = {}
|
||||
|
||||
core.output.assign(src, dst, 'a')
|
||||
self.assertEqual(dst['a'], src['a'])
|
||||
core.output.assign(src, dst, "a")
|
||||
self.assertEqual(dst["a"], src["a"])
|
||||
|
||||
core.output.assign(src, dst, '123', 'b')
|
||||
self.assertEqual(dst['123'], src['b'])
|
||||
core.output.assign(src, dst, "123", "b")
|
||||
self.assertEqual(dst["123"], src["b"])
|
||||
|
||||
core.output.assign(src, dst, 'blub', default='def')
|
||||
self.assertEqual('def', dst['blub'])
|
||||
core.output.assign(src, dst, "blub", default="def")
|
||||
self.assertEqual("def", dst["blub"])
|
||||
|
||||
def test_pango_detection(self):
|
||||
self.assertFalse(self.someBlock.is_pango({}))
|
||||
self.assertTrue(self.someBlock.is_pango({ 'pango': {} }))
|
||||
self.assertTrue(self.someBlock.is_pango({"pango": {}}))
|
||||
|
||||
def test_pangoize(self):
|
||||
self.assertEqual('test', self.someBlock.pangoize('test'))
|
||||
self.assertFalse('markup' in self.someBlock.dict())
|
||||
self.assertEqual("test", self.someBlock.pangoize("test"))
|
||||
self.assertFalse("markup" in self.someBlock.dict())
|
||||
|
||||
pango = self.someBlock.pangoize({ 'pango': { 'attr': 'blub', 'x': 'y', 'full_text': 'test' } })
|
||||
pango = self.someBlock.pangoize(
|
||||
{"pango": {"attr": "blub", "x": "y", "full_text": "test"}}
|
||||
)
|
||||
self.assertTrue('attr="blub"' in pango)
|
||||
self.assertTrue('x="y"' in pango)
|
||||
self.assertTrue('<span ' in pango)
|
||||
self.assertTrue('>test</span>' in pango)
|
||||
self.assertEqual('pango', self.someBlock.dict()['markup'])
|
||||
self.assertTrue("<span " in pango)
|
||||
self.assertTrue(">test</span>" in pango)
|
||||
self.assertEqual("pango", self.someBlock.dict()["markup"])
|
||||
|
||||
def test_padding(self):
|
||||
self.someBlock.set('padding', '***')
|
||||
self.someBlock.set('full_text', 'test')
|
||||
self.someBlock.set("padding", "***")
|
||||
self.someBlock.set("full_text", "test")
|
||||
|
||||
self.assertEqual('***test***', self.someBlock.dict()['full_text'])
|
||||
self.assertEqual("***test***", self.someBlock.dict()["full_text"])
|
||||
|
||||
def test_pre_suffix(self):
|
||||
self.someBlock.set('padding', '*')
|
||||
self.someBlock.set('prefix', 'pre')
|
||||
self.someBlock.set('suffix', 'suf')
|
||||
self.someBlock.set('full_text', 'test')
|
||||
self.someBlock.set("padding", "*")
|
||||
self.someBlock.set("prefix", "pre")
|
||||
self.someBlock.set("suffix", "suf")
|
||||
self.someBlock.set("full_text", "test")
|
||||
|
||||
self.assertEqual("*pre*test*suf*", self.someBlock.dict()["full_text"])
|
||||
|
||||
self.assertEqual('*pre*test*suf*', self.someBlock.dict()['full_text'])
|
||||
|
||||
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue