- add test cases for overlapping mappings

Author: jceb

Makefile

@@ -62,7 +62,7 @@ docs: documentation
 # generate a test coverage report for all python files
 coverage:
 	@echo ">>> Coverage depends on the package python-nose and python-coverage, make sure they are installed!"
-	cd tests && nosetests --with-coverage --cover-html .
+	cd tests && nosetests2 --with-coverage --cover-html .
 
 # run a static code checker
 lint:

doc/orgguide.txt

@@ -1358,6 +1358,7 @@ LINKS                                                           *orgguide-links*
 CHANGELOG                                                   *orgguide-changelog*
 
 0.5.0-0
+- add test cases for overlapping mappings
 - add three dots after folded text, like in orgmode
 - improve highlighting of org-mode properties (closes issue #130)
 - implement global visibility as it works in Emacs org-mode (closes issue #119)

tests/run_tests.py

@@ -17,6 +17,7 @@
 import test_plugin_show_hide
 import test_plugin_tags_properties
 import test_plugin_todo
+import test_plugin_mappings
 
 import unittest
 
@@ -42,6 +43,7 @@
 	tests.addTests(test_plugin_show_hide.suite())
 	tests.addTests(test_plugin_tags_properties.suite())
 	tests.addTests(test_plugin_todo.suite())
+	tests.addTests(test_plugin_mappings.suite())
 
 	runner = unittest.TextTestRunner()
 	runner.run(tests)

tests/test_plugin_mappings.py

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+
+
+import sys
+sys.path.append(u'../ftplugin')
+
+import unittest
+import orgmode.settings
+from orgmode.exceptions import PluginError
+from orgmode._vim import ORGMODE
+from orgmode.keybinding import MODE_ALL, Plug
+
+import vim
+
+ORG_PLUGINS = ['ShowHide', '|', 'Navigator', 'EditStructure', '|', 'Hyperlinks', '|', 'Todo', 'TagsProperties', 'Date', 'Agenda', 'Misc', '|', 'Export']
+
+
+class MappingTestCase(unittest.TestCase):
+	u"""Tests all plugins for overlapping mappings."""
+	def test_non_overlapping_plug_mappings(self):
+		def find_overlapping_mappings(kb, all_keybindings):
+			for tkb in all_keybindings:
+				if kb.mode == tkb.mode or MODE_ALL in (kb.mode, tkb.mode):
+					if isinstance(kb._action, Plug) and isinstance(tkb._action, Plug):
+						akb = kb.action
+						atkb = tkb.action
+						if (akb.startswith(atkb) or atkb.startswith(akb)) and akb != atkb:
+							print u'ERROR: Found overlapping mapping: %s (%s), %s (%s)' % (kb.key, akb, tkb.key, atkb)
+							return True
+
+			if all_keybindings:
+				return find_overlapping_mappings(all_keybindings[0], all_keybindings[1:])
+			return False
+
+		if self.keybindings:
+			self.assertFalse(find_overlapping_mappings(self.keybindings[0], self.keybindings[1:]))
+
+	def setUp(self):
+		self.keybindings = []
+
+		vim.EVALRESULTS = {
+				u'exists("g:org_debug")': 0,
+				u'exists("b:org_debug")': 0,
+				u'exists("*repeat#set()")': 0,
+				u'b:changedtick': 0,
+				u'exists("b:org_plugins")'.encode(u'utf-8'): 0,
+				u'exists("g:org_plugins")'.encode(u'utf-8'): 1,
+				u'g:org_plugins'.encode(u'utf-8'): ORG_PLUGINS,
+				}
+		for plugin in filter(lambda p: p != '|', ORG_PLUGINS):
+			try:
+				ORGMODE.register_plugin(plugin)
+			except PluginError:
+				pass
+			if plugin in ORGMODE._plugins:
+				self.keybindings.extend(ORGMODE._plugins[plugin].keybindings)
+
+
+def suite():
+	return unittest.TestLoader().loadTestsFromTestCase(MappingTestCase)
+
+# vi: noexpandtab