Skip to content

Commit

Permalink
More descriptive method names
Browse files Browse the repository at this point in the history
  • Loading branch information
Josef-Friedrich committed Dec 31, 2019
1 parent 965f623 commit c8c2524
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 36 deletions.
6 changes: 5 additions & 1 deletion mscxyz/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
from mscxyz.lyrics import MscoreLyricsInterface
from mscxyz.meta import Meta
from mscxyz.rename import rename_filename
from mscxyz.score_file_classes import MscoreXmlTree, list_scores
from mscxyz.score_file_classes import MscoreXmlTree, MscoreStyleInterface, \
list_scores
from mscxyz.utils import set_args, color
from mscxyz.settings import DefaultArguments
import lxml
Expand All @@ -19,6 +20,9 @@
__version__ = get_versions()['version']
del get_versions

MscoreStyleInterface
"""see submodule score_file_classes"""


def parse_config_ini(relpath: str = None) -> configparser.ConfigParser:
"""Parse the configuration file. The file format is INI. The default
Expand Down
10 changes: 1 addition & 9 deletions mscxyz/score_file_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,14 +341,6 @@ def _create(self, tag: str) -> lxml.etree.Element:
parent = element
return parent

def get(self, element_path: str) -> str:
"""
:param element_path: see
http:https://lxml.de/tutorial.html#elementpath
"""
element = self.style.find(element_path)
return element.text

def get_element(self, element_path: str,
create: bool = False) -> lxml.etree.Element:
"""
Expand Down Expand Up @@ -398,7 +390,7 @@ def set_attributes(self, element_path: str,
element.attrib[name] = str(value)
return element

def set(self, element_path: str, value: str):
def set_value(self, element_path: str, value: str):
"""
:param element_path: see
http:https://lxml.de/tutorial.html#elementpath
Expand Down
53 changes: 27 additions & 26 deletions test/test_score_file_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,11 @@ def test_attributes_style(self):
self.assertEqual(self.style.style.tag, 'Style')

def test_method_get(self):
self.assertEqual(self.style.get('staffUpperBorder'), '6.5')
self.assertEqual(self.style.get_value('staffUpperBorder'), '6.5')

def test_method_get_muliple_element_path(self):
self.assertEqual(self.style.get('page-layout/page-height'), '1584')
self.assertEqual(self.style.get_value('page-layout/page-height'),
'1584')

def test_method_get_element(self):
self.assertEqual(self.style.get_element('voltaY').tag, 'voltaY')
Expand All @@ -254,33 +255,33 @@ def test_method_get_element_create(self):
def test_method_get_value(self):
self.assertEqual(self.style.get_value('voltaY'), '-2')

def test_method_set(self):
self.style.set('staffUpperBorder', 99)
def test_method_set_value(self):
self.style.set_value('staffUpperBorder', 99)
self.style.save()
style2 = MscoreStyleInterface(self.style.abspath)
self.assertEqual(style2.get('staffUpperBorder'), '99')
self.assertEqual(style2.get_value('staffUpperBorder'), '99')

def test_method_set_create(self):
self.style.set('lol', 'lol')
def test_method_set_value_create(self):
self.style.set_value('lol', 'lol')
self.style.save()
style2 = MscoreStyleInterface(self.style.abspath)
self.assertEqual(style2.get('lol'), 'lol')
self.assertEqual(style2.get_value('lol'), 'lol')

def test_method_set_muliple_element_path(self):
self.style.set('page-layout/page-height', 99)
def test_method_set_value_muliple_element_path(self):
self.style.set_value('page-layout/page-height', 99)
self.style.save()
style2 = MscoreStyleInterface(self.style.abspath)
self.assertEqual(style2.get('page-layout/page-height'), '99')
self.assertEqual(style2.get_value('page-layout/page-height'), '99')

def test_method_set_muliple_element_path_multiple_times(self):
self.style.set('page-layout/page-height', 99)
self.style.set('page-layout/page-width', 100)
self.style.set('page-layout/page-depth', 101)
self.style.set_value('page-layout/page-height', 99)
self.style.set_value('page-layout/page-width', 100)
self.style.set_value('page-layout/page-depth', 101)
self.style.save()
style2 = MscoreStyleInterface(self.style.abspath)
self.assertEqual(style2.get('page-layout/page-depth'), '101')
self.assertEqual(style2.get('page-layout/page-height'), '99')
self.assertEqual(style2.get('page-layout/page-width'), '100')
self.assertEqual(style2.get_value('page-layout/page-depth'), '101')
self.assertEqual(style2.get_value('page-layout/page-height'), '99')
self.assertEqual(style2.get_value('page-layout/page-width'), '100')

def test_method_set_attributes(self):
dudes = MscoreStyleInterface(
Expand Down Expand Up @@ -320,19 +321,19 @@ def test_attributes_style(self):
self.assertEqual(self.style.style.tag, 'Style')

def test_method_get(self):
self.assertEqual(self.style.get('staffUpperBorder'), '6.5')
self.assertEqual(self.style.get_value('staffUpperBorder'), '6.5')

def test_method_set(self):
self.style.set('staffUpperBorder', 99)
self.style.set_value('staffUpperBorder', 99)
self.style.save()
style2 = MscoreStyleInterface(self.style.abspath)
self.assertEqual(style2.get('staffUpperBorder'), '99')
self.assertEqual(style2.get_value('staffUpperBorder'), '99')

def test_method_set_create(self):
self.style.set('lol', 'lol')
self.style.set_value('lol', 'lol')
self.style.save()
style2 = MscoreStyleInterface(self.style.abspath)
self.assertEqual(style2.get('lol'), 'lol')
self.assertEqual(style2.get_value('lol'), 'lol')


class TestClassMscoreStyleInterfaceWithoutTags(unittest.TestCase):
Expand All @@ -346,16 +347,16 @@ def test_load(self):
self.assertEqual(self.style.style.tag, 'Style')

def test_method_set(self):
self.style.set('staffUpperBorder', 99)
self.style.set_value('staffUpperBorder', 99)
self.style.save()
style2 = MscoreStyleInterface(self.style.abspath)
self.assertEqual(style2.get('staffUpperBorder'), '99')
self.assertEqual(style2.get_value('staffUpperBorder'), '99')

def test_method_set_element_path_multiple(self):
self.style.set('lol/troll', 99)
self.style.set_value('lol/troll', 99)
self.style.save()
style2 = MscoreStyleInterface(self.style.abspath)
self.assertEqual(style2.get('lol/troll'), '99')
self.assertEqual(style2.get_value('lol/troll'), '99')

def test_method_get_text_style_unkown(self):
unkown = self.style.get_text_style('Unkown')
Expand Down

0 comments on commit c8c2524

Please sign in to comment.