Skip to content

Commit

Permalink
Merge pull request #6 from mariabui/291_group
Browse files Browse the repository at this point in the history
topydo#291: Don't remove priority on "do"
  • Loading branch information
mariabui committed Apr 30, 2023
2 parents 98b6445 + b756325 commit 40ec806
Show file tree
Hide file tree
Showing 9 changed files with 640 additions and 15 deletions.
3 changes: 3 additions & 0 deletions test/data/ConfigTest4.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ ignore_weekends = junk
append_parent_projects = junk
append_parent_contexts = junk

[do]
keep_priority = junk

[colorscheme]
priority_colors = junk
project_color = junk
Expand Down
2 changes: 2 additions & 0 deletions test/data/keeppriority0.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[do]
keep_priority = 0
2 changes: 2 additions & 0 deletions test/data/keeppriority1.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[do]
keep_priority = 1
36 changes: 22 additions & 14 deletions test/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,63 +83,71 @@ def test_config13(self):
bool(int(config().defaults["dep"]["append_parent_contexts"])))

def test_config14(self):
""" Bad keep priority switch value. """
self.assertEqual(config('test/data/ConfigTest4.conf').keep_priority(),
bool(int(config().defaults['do']['keep_priority'])))

self.assertEqual(config('test/data/keeppriority1.conf').keep_priority(), True)
self.assertEqual(config('test/data/keeppriority0.conf').keep_priority(), False)

def test_config15(self):
""" Bad priority color value. """
self.assertEqual(config("test/data/ConfigTest4.conf").priority_color('A').color, 6)
self.assertEqual(config("test/data/ConfigTest4.conf").priority_color('B').color, 3)
self.assertEqual(config("test/data/ConfigTest4.conf").priority_color('C').color, 4)

def test_config15(self):
def test_config16(self):
""" Bad project color value. """
self.assertTrue(config("test/data/ConfigTest4.conf").project_color().is_neutral())

def test_config16(self):
def test_config17(self):
""" Bad context color value. """
self.assertTrue(config("test/data/ConfigTest4.conf").context_color().is_neutral())

def test_config17(self):
def test_config18(self):
""" Bad metadata color value. """
self.assertTrue(config("test/data/ConfigTest4.conf").metadata_color().is_neutral())

def test_config18(self):
def test_config19(self):
""" Bad link color value. """
self.assertTrue(config("test/data/ConfigTest4.conf").link_color().is_neutral())

# the test needs to be of the internal function _str_to_dict
def test_config19(self):
def test_config20(self):
""" No priority color value. """
self.assertEqual(config("test/data/ConfigTest4.conf").priority_color('A').color, 6)
self.assertEqual(config("test/data/ConfigTest4.conf").priority_color('B').color, 3)
self.assertEqual(config("test/data/ConfigTest4.conf").priority_color('C').color, 4)

def test_config20(self):
def test_config21(self):
""" No project color value. """
self.assertEqual(config("test/data/ConfigTest5.conf").project_color().color, 1)

def test_config21(self):
def test_config22(self):
""" No context color value. """
self.assertEqual(config("test/data/ConfigTest5.conf").context_color().color, 5)

def test_config22(self):
def test_config23(self):
""" No metadata color value. """
self.assertEqual(config("test/data/ConfigTest5.conf").metadata_color().color, 2)

def test_config23(self):
def test_config24(self):
""" No link color value. """
self.assertEqual(config("test/data/ConfigTest5.conf").link_color().color, 6)

def test_config24(self):
def test_config25(self):
""" No focus background color value. """
self.assertEqual(config("test/data/ConfigTest5.conf").focus_background_color().color, 7)

def test_config25(self):
def test_config26(self):
""" No mark background color value. """
self.assertEqual(config("test/data/ConfigTest5.conf").marked_background_color().color, 4)

def test_config26(self):
def test_config27(self):
self.assertTrue(config("test/data/ConfigTest4.conf").focus_background_color().is_neutral())
self.assertTrue(config("test/data/ConfigTest4.conf").marked_background_color().is_neutral())

def test_config27(self):
def test_config28(self):
""" column_keymap test. """
keymap, keystates = config("test/data/ConfigTest6.conf").column_keymap()

Expand All @@ -165,7 +173,7 @@ def test_config27(self):
self.assertNotIn('<Esc', keystates)
self.assertIn('<Esc>', keystates)

def test_config28(self):
def test_config29(self):
""" test duplicates. """
keymap, _ = config("test/data/ConfigTest7.conf").column_keymap()

Expand Down
Loading

0 comments on commit 40ec806

Please sign in to comment.