[core] Refactor -> replace some getter/setter pairs with attributes
Remove some set_* methods and replace them with a simple attribute. see #23
This commit is contained in:
parent
068968bbf5
commit
e59e969bdc
7 changed files with 16 additions and 21 deletions
|
@ -20,6 +20,8 @@ class TestGenericModules(unittest.TestCase):
|
|||
for mod in self.objects:
|
||||
widgets = self.objects[mod].widgets()
|
||||
for widget in widgets:
|
||||
widget.link_module(self.objects[mod])
|
||||
self.assertEquals(widget.module, mod)
|
||||
assertWidgetAttributes(self, widget)
|
||||
|
||||
def test_update(self):
|
||||
|
|
|
@ -26,16 +26,16 @@ class TestEngine(unittest.TestCase):
|
|||
self.assertFalse(self.engine.running())
|
||||
|
||||
def test_load_module(self):
|
||||
module = self.engine.load_module(self.testModule)
|
||||
module = self.engine._load_module(self.testModule)
|
||||
self.assertEquals(module.__module__, self.testModuleSpec)
|
||||
|
||||
def test_load_invalid_module(self):
|
||||
with self.assertRaises(ModuleLoadError):
|
||||
self.engine.load_module(self.invalidModule)
|
||||
self.engine._load_module(self.invalidModule)
|
||||
|
||||
def test_load_none(self):
|
||||
with self.assertRaises(ModuleLoadError):
|
||||
self.engine.load_module(None)
|
||||
self.engine._load_module(None)
|
||||
|
||||
def test_load_modules(self):
|
||||
modules = self.engine.load_modules(self.testModules)
|
||||
|
|
|
@ -44,17 +44,17 @@ class TestTheme(unittest.TestCase):
|
|||
self.assertEquals(self.theme.suffix(self.someWidget), self.defaultSuffix)
|
||||
|
||||
def test_widget_prefix(self):
|
||||
self.someWidget.attr_module = self.widgetTheme
|
||||
self.someWidget.module = self.widgetTheme
|
||||
self.assertEquals(self.theme.prefix(self.someWidget), self.widgetPrefix)
|
||||
|
||||
def test_widget_fg(self):
|
||||
self.assertEquals(self.theme.fg(self.someWidget), self.defaultColor)
|
||||
self.someWidget.attr_module = self.widgetTheme
|
||||
self.someWidget.module = self.widgetTheme
|
||||
self.assertEquals(self.theme.fg(self.someWidget), self.widgetColor)
|
||||
|
||||
def test_widget_bg(self):
|
||||
self.assertEquals(self.theme.bg(self.someWidget), self.defaultBgColor)
|
||||
self.someWidget.attr_module = self.widgetTheme
|
||||
self.someWidget.module = self.widgetTheme
|
||||
self.assertEquals(self.theme.bg(self.someWidget), self.widgetBgColor)
|
||||
|
||||
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
|
||||
|
|
|
@ -31,14 +31,11 @@ class MockOutput(object):
|
|||
class MockWidget(object):
|
||||
def __init__(self, text):
|
||||
self._text = text
|
||||
self.attr_module = None
|
||||
self.module = None
|
||||
|
||||
def update(self, widgets):
|
||||
pass
|
||||
|
||||
def module(self):
|
||||
return self.attr_module
|
||||
|
||||
def full_text(self):
|
||||
return self._text
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue