mercurial: tests/test-match.py@4dd07bf84608 (annotated)

33582 44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	1	from __future__ import absolute_import
44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	2
44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	3	import unittest
44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	4
44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	5	import silenttestrunner
44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	6
44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	7	from mercurial import (
44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	8	match as matchmod,
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	9	util,
33582 44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	10	)
44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	11
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	12	class BaseMatcherTests(unittest.TestCase):
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	13
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	14	def testVisitdir(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	15	m = matchmod.basematcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	16	self.assertTrue(m.visitdir(b'.'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	17	self.assertTrue(m.visitdir(b'dir'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	18
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	19	def testVisitchildrenset(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	20	m = matchmod.basematcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	21	self.assertEqual(m.visitchildrenset(b'.'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	22	self.assertEqual(m.visitchildrenset(b'dir'), b'this')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	23
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	24	class AlwaysMatcherTests(unittest.TestCase):
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	25
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	26	def testVisitdir(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	27	m = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	28	self.assertEqual(m.visitdir(b'.'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	29	self.assertEqual(m.visitdir(b'dir'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	30
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	31	def testVisitchildrenset(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	32	m = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	33	self.assertEqual(m.visitchildrenset(b'.'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	34	self.assertEqual(m.visitchildrenset(b'dir'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	35
33582 44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	36	class NeverMatcherTests(unittest.TestCase):
44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	37
44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	38	def testVisitdir(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	39	m = matchmod.nevermatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	40	self.assertFalse(m.visitdir(b'.'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	41	self.assertFalse(m.visitdir(b'dir'))
33582 44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	42
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	43	def testVisitchildrenset(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	44	m = matchmod.nevermatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	45	self.assertEqual(m.visitchildrenset(b'.'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	46	self.assertEqual(m.visitchildrenset(b'dir'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	47
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	48	class PredicateMatcherTests(unittest.TestCase):
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	49	# predicatematcher does not currently define either of these methods, so
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	50	# this is equivalent to BaseMatcherTests.
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	51
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	52	def testVisitdir(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	53	m = matchmod.predicatematcher(b'', b'', lambda *a: False)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	54	self.assertTrue(m.visitdir(b'.'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	55	self.assertTrue(m.visitdir(b'dir'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	56
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	57	def testVisitchildrenset(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	58	m = matchmod.predicatematcher(b'', b'', lambda *a: False)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	59	self.assertEqual(m.visitchildrenset(b'.'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	60	self.assertEqual(m.visitchildrenset(b'dir'), b'this')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	61
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	62	class PatternMatcherTests(unittest.TestCase):
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	63
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	64	def testVisitdirPrefix(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	65	m = matchmod.match(b'x', b'', patterns=[b'path:dir/subdir'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	66	assert isinstance(m, matchmod.patternmatcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	67	self.assertTrue(m.visitdir(b'.'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	68	self.assertTrue(m.visitdir(b'dir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	69	self.assertEqual(m.visitdir(b'dir/subdir'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	70	# OPT: This should probably be 'all' if its parent is?
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	71	self.assertTrue(m.visitdir(b'dir/subdir/x'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	72	self.assertFalse(m.visitdir(b'folder'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	73
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	74	def testVisitchildrensetPrefix(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	75	m = matchmod.match(b'x', b'', patterns=[b'path:dir/subdir'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	76	assert isinstance(m, matchmod.patternmatcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	77	self.assertEqual(m.visitchildrenset(b'.'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	78	self.assertEqual(m.visitchildrenset(b'dir'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	79	self.assertEqual(m.visitchildrenset(b'dir/subdir'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	80	# OPT: This should probably be 'all' if its parent is?
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	81	self.assertEqual(m.visitchildrenset(b'dir/subdir/x'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	82	self.assertEqual(m.visitchildrenset(b'folder'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	83
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	84	def testVisitdirRootfilesin(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	85	m = matchmod.match(b'x', b'', patterns=[b'rootfilesin:dir/subdir'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	86	assert isinstance(m, matchmod.patternmatcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	87	self.assertTrue(m.visitdir(b'.'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	88	self.assertFalse(m.visitdir(b'dir/subdir/x'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	89	self.assertFalse(m.visitdir(b'folder'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	90	# FIXME: These should probably be True.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	91	self.assertFalse(m.visitdir(b'dir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	92	self.assertFalse(m.visitdir(b'dir/subdir'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	93
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	94	def testVisitchildrensetRootfilesin(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	95	m = matchmod.match(b'x', b'', patterns=[b'rootfilesin:dir/subdir'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	96	assert isinstance(m, matchmod.patternmatcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	97	self.assertEqual(m.visitchildrenset(b'.'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	98	self.assertEqual(m.visitchildrenset(b'dir/subdir/x'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	99	self.assertEqual(m.visitchildrenset(b'folder'), set())
38958 b9f94d67ea73 match: add missing "return set()", add FIXME to test to doc a bug Kyle Lippincott <spectral@google.com> parents: 38955 diff changeset	100	# FIXME: These should probably be {'subdir'} and 'this', respectively,
b9f94d67ea73 match: add missing "return set()", add FIXME to test to doc a bug Kyle Lippincott <spectral@google.com> parents: 38955 diff changeset	101	# or at least 'this' and 'this'.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	102	self.assertEqual(m.visitchildrenset(b'dir'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	103	self.assertEqual(m.visitchildrenset(b'dir/subdir'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	104
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	105	def testVisitdirGlob(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	106	m = matchmod.match(b'x', b'', patterns=[b'glob:dir/z*'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	107	assert isinstance(m, matchmod.patternmatcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	108	self.assertTrue(m.visitdir(b'.'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	109	self.assertTrue(m.visitdir(b'dir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	110	self.assertFalse(m.visitdir(b'folder'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	111	# OPT: these should probably be False.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	112	self.assertTrue(m.visitdir(b'dir/subdir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	113	self.assertTrue(m.visitdir(b'dir/subdir/x'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	114
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	115	def testVisitchildrensetGlob(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	116	m = matchmod.match(b'x', b'', patterns=[b'glob:dir/z*'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	117	assert isinstance(m, matchmod.patternmatcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	118	self.assertEqual(m.visitchildrenset(b'.'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	119	self.assertEqual(m.visitchildrenset(b'folder'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	120	self.assertEqual(m.visitchildrenset(b'dir'), b'this')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	121	# OPT: these should probably be set().
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	122	self.assertEqual(m.visitchildrenset(b'dir/subdir'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	123	self.assertEqual(m.visitchildrenset(b'dir/subdir/x'), b'this')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	124
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	125	class IncludeMatcherTests(unittest.TestCase):
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	126
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	127	def testVisitdirPrefix(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	128	m = matchmod.match(b'x', b'', include=[b'path:dir/subdir'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	129	assert isinstance(m, matchmod.includematcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	130	self.assertTrue(m.visitdir(b'.'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	131	self.assertTrue(m.visitdir(b'dir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	132	self.assertEqual(m.visitdir(b'dir/subdir'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	133	# OPT: This should probably be 'all' if its parent is?
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	134	self.assertTrue(m.visitdir(b'dir/subdir/x'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	135	self.assertFalse(m.visitdir(b'folder'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	136
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	137	def testVisitchildrensetPrefix(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	138	m = matchmod.match(b'x', b'', include=[b'path:dir/subdir'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	139	assert isinstance(m, matchmod.includematcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	140	self.assertEqual(m.visitchildrenset(b'.'), {b'dir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	141	self.assertEqual(m.visitchildrenset(b'dir'), {b'subdir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	142	self.assertEqual(m.visitchildrenset(b'dir/subdir'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	143	# OPT: This should probably be 'all' if its parent is?
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	144	self.assertEqual(m.visitchildrenset(b'dir/subdir/x'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	145	self.assertEqual(m.visitchildrenset(b'folder'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	146
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	147	def testVisitdirRootfilesin(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	148	m = matchmod.match(b'x', b'', include=[b'rootfilesin:dir/subdir'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	149	assert isinstance(m, matchmod.includematcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	150	self.assertTrue(m.visitdir(b'.'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	151	self.assertTrue(m.visitdir(b'dir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	152	self.assertTrue(m.visitdir(b'dir/subdir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	153	self.assertFalse(m.visitdir(b'dir/subdir/x'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	154	self.assertFalse(m.visitdir(b'folder'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	155
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	156	def testVisitchildrensetRootfilesin(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	157	m = matchmod.match(b'x', b'', include=[b'rootfilesin:dir/subdir'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	158	assert isinstance(m, matchmod.includematcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	159	self.assertEqual(m.visitchildrenset(b'.'), {b'dir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	160	self.assertEqual(m.visitchildrenset(b'dir'), {b'subdir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	161	self.assertEqual(m.visitchildrenset(b'dir/subdir'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	162	self.assertEqual(m.visitchildrenset(b'dir/subdir/x'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	163	self.assertEqual(m.visitchildrenset(b'folder'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	164
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	165	def testVisitdirGlob(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	166	m = matchmod.match(b'x', b'', include=[b'glob:dir/z*'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	167	assert isinstance(m, matchmod.includematcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	168	self.assertTrue(m.visitdir(b'.'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	169	self.assertTrue(m.visitdir(b'dir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	170	self.assertFalse(m.visitdir(b'folder'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	171	# OPT: these should probably be False.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	172	self.assertTrue(m.visitdir(b'dir/subdir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	173	self.assertTrue(m.visitdir(b'dir/subdir/x'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	174
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	175	def testVisitchildrensetGlob(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	176	m = matchmod.match(b'x', b'', include=[b'glob:dir/z*'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	177	assert isinstance(m, matchmod.includematcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	178	self.assertEqual(m.visitchildrenset(b'.'), {b'dir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	179	self.assertEqual(m.visitchildrenset(b'folder'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	180	self.assertEqual(m.visitchildrenset(b'dir'), b'this')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	181	# OPT: these should probably be set().
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	182	self.assertEqual(m.visitchildrenset(b'dir/subdir'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	183	self.assertEqual(m.visitchildrenset(b'dir/subdir/x'), b'this')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	184
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	185	class ExactMatcherTests(unittest.TestCase):
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	186
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	187	def testVisitdir(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	188	m = matchmod.match(b'x', b'', patterns=[b'dir/subdir/foo.txt'],
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	189	exact=True)
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	190	assert isinstance(m, matchmod.exactmatcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	191	self.assertTrue(m.visitdir(b'.'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	192	self.assertTrue(m.visitdir(b'dir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	193	self.assertTrue(m.visitdir(b'dir/subdir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	194	self.assertFalse(m.visitdir(b'dir/subdir/foo.txt'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	195	self.assertFalse(m.visitdir(b'dir/foo'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	196	self.assertFalse(m.visitdir(b'dir/subdir/x'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	197	self.assertFalse(m.visitdir(b'folder'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	198
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	199	def testVisitchildrenset(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	200	m = matchmod.match(b'x', b'', patterns=[b'dir/subdir/foo.txt'],
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	201	exact=True)
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	202	assert isinstance(m, matchmod.exactmatcher)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	203	self.assertEqual(m.visitchildrenset(b'.'), {b'dir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	204	self.assertEqual(m.visitchildrenset(b'dir'), {b'subdir'})
39261 c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	205	self.assertEqual(m.visitchildrenset(b'dir/subdir'), {b'foo.txt'})
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	206	self.assertEqual(m.visitchildrenset(b'dir/subdir/x'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	207	self.assertEqual(m.visitchildrenset(b'dir/subdir/foo.txt'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	208	self.assertEqual(m.visitchildrenset(b'folder'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	209
39261 c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	210	def testVisitchildrensetFilesAndDirs(self):
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	211	m = matchmod.match(b'x', b'', patterns=[b'rootfile.txt',
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	212	b'a/file1.txt',
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	213	b'a/b/file2.txt',
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	214	# no file in a/b/c
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	215	b'a/b/c/d/file4.txt'],
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	216	exact=True)
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	217	assert isinstance(m, matchmod.exactmatcher)
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	218	self.assertEqual(m.visitchildrenset(b'.'), {b'a', b'rootfile.txt'})
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	219	self.assertEqual(m.visitchildrenset(b'a'), {b'b', b'file1.txt'})
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	220	self.assertEqual(m.visitchildrenset(b'a/b'), {b'c', b'file2.txt'})
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	221	self.assertEqual(m.visitchildrenset(b'a/b/c'), {b'd'})
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	222	self.assertEqual(m.visitchildrenset(b'a/b/c/d'), {b'file4.txt'})
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	223	self.assertEqual(m.visitchildrenset(b'a/b/c/d/e'), set())
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	224	self.assertEqual(m.visitchildrenset(b'folder'), set())
c9a3f7f5c023 match: make exactmatcher.visitchildrenset return file children as well Kyle Lippincott <spectral@google.com> parents: 38963 diff changeset	225
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	226	class DifferenceMatcherTests(unittest.TestCase):
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	227
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	228	def testVisitdirM2always(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	229	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	230	m2 = matchmod.alwaysmatcher(b'', b'')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	231	dm = matchmod.differencematcher(m1, m2)
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	232	# dm should be equivalent to a nevermatcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	233	self.assertFalse(dm.visitdir(b'.'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	234	self.assertFalse(dm.visitdir(b'dir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	235	self.assertFalse(dm.visitdir(b'dir/subdir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	236	self.assertFalse(dm.visitdir(b'dir/subdir/z'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	237	self.assertFalse(dm.visitdir(b'dir/foo'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	238	self.assertFalse(dm.visitdir(b'dir/subdir/x'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	239	self.assertFalse(dm.visitdir(b'folder'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	240
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	241	def testVisitchildrensetM2always(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	242	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	243	m2 = matchmod.alwaysmatcher(b'', b'')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	244	dm = matchmod.differencematcher(m1, m2)
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	245	# dm should be equivalent to a nevermatcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	246	self.assertEqual(dm.visitchildrenset(b'.'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	247	self.assertEqual(dm.visitchildrenset(b'dir'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	248	self.assertEqual(dm.visitchildrenset(b'dir/subdir'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	249	self.assertEqual(dm.visitchildrenset(b'dir/subdir/z'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	250	self.assertEqual(dm.visitchildrenset(b'dir/foo'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	251	self.assertEqual(dm.visitchildrenset(b'dir/subdir/x'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	252	self.assertEqual(dm.visitchildrenset(b'folder'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	253
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	254	def testVisitdirM2never(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	255	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	256	m2 = matchmod.nevermatcher(b'', b'')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	257	dm = matchmod.differencematcher(m1, m2)
41528 b7a0efb3c370 match: teach diffmatcher.visitdir() to return 'all' if possible Pulkit Goyal <pulkit@yandex-team.ru> parents: 39261 diff changeset	258	# dm should be equivalent to a alwaysmatcher.
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	259	#
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	260	# We're testing Equal-to-True instead of just 'assertTrue' since
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	261	# assertTrue does NOT verify that it's a bool, just that it's truthy.
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	262	# While we may want to eventually make these return 'all', they should
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	263	# not currently do so.
41530 4dd07bf84608 tests: fix test-match.py on Python3 Augie Fackler <augie@google.com> parents: 41528 diff changeset	264	self.assertEqual(dm.visitdir(b'.'), b'all')
4dd07bf84608 tests: fix test-match.py on Python3 Augie Fackler <augie@google.com> parents: 41528 diff changeset	265	self.assertEqual(dm.visitdir(b'dir'), b'all')
4dd07bf84608 tests: fix test-match.py on Python3 Augie Fackler <augie@google.com> parents: 41528 diff changeset	266	self.assertEqual(dm.visitdir(b'dir/subdir'), b'all')
4dd07bf84608 tests: fix test-match.py on Python3 Augie Fackler <augie@google.com> parents: 41528 diff changeset	267	self.assertEqual(dm.visitdir(b'dir/subdir/z'), b'all')
4dd07bf84608 tests: fix test-match.py on Python3 Augie Fackler <augie@google.com> parents: 41528 diff changeset	268	self.assertEqual(dm.visitdir(b'dir/foo'), b'all')
4dd07bf84608 tests: fix test-match.py on Python3 Augie Fackler <augie@google.com> parents: 41528 diff changeset	269	self.assertEqual(dm.visitdir(b'dir/subdir/x'), b'all')
4dd07bf84608 tests: fix test-match.py on Python3 Augie Fackler <augie@google.com> parents: 41528 diff changeset	270	self.assertEqual(dm.visitdir(b'folder'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	271
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	272	def testVisitchildrensetM2never(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	273	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	274	m2 = matchmod.nevermatcher(b'', b'')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	275	dm = matchmod.differencematcher(m1, m2)
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	276	# dm should be equivalent to a alwaysmatcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	277	self.assertEqual(dm.visitchildrenset(b'.'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	278	self.assertEqual(dm.visitchildrenset(b'dir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	279	self.assertEqual(dm.visitchildrenset(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	280	self.assertEqual(dm.visitchildrenset(b'dir/subdir/z'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	281	self.assertEqual(dm.visitchildrenset(b'dir/foo'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	282	self.assertEqual(dm.visitchildrenset(b'dir/subdir/x'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	283	self.assertEqual(dm.visitchildrenset(b'folder'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	284
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	285	def testVisitdirM2SubdirPrefix(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	286	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	287	m2 = matchmod.match(b'', b'', patterns=[b'path:dir/subdir'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	288	dm = matchmod.differencematcher(m1, m2)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	289	self.assertEqual(dm.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	290	self.assertEqual(dm.visitdir(b'dir'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	291	self.assertFalse(dm.visitdir(b'dir/subdir'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	292	# OPT: We should probably return False for these; we don't because
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	293	# patternmatcher.visitdir() (our m2) doesn't return 'all' for subdirs of
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	294	# an 'all' pattern, just True.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	295	self.assertEqual(dm.visitdir(b'dir/subdir/z'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	296	self.assertEqual(dm.visitdir(b'dir/subdir/x'), True)
41530 4dd07bf84608 tests: fix test-match.py on Python3 Augie Fackler <augie@google.com> parents: 41528 diff changeset	297	self.assertEqual(dm.visitdir(b'dir/foo'), b'all')
4dd07bf84608 tests: fix test-match.py on Python3 Augie Fackler <augie@google.com> parents: 41528 diff changeset	298	self.assertEqual(dm.visitdir(b'folder'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	299
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	300	def testVisitchildrensetM2SubdirPrefix(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	301	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	302	m2 = matchmod.match(b'', b'', patterns=[b'path:dir/subdir'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	303	dm = matchmod.differencematcher(m1, m2)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	304	self.assertEqual(dm.visitchildrenset(b'.'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	305	self.assertEqual(dm.visitchildrenset(b'dir'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	306	self.assertEqual(dm.visitchildrenset(b'dir/subdir'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	307	self.assertEqual(dm.visitchildrenset(b'dir/foo'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	308	self.assertEqual(dm.visitchildrenset(b'folder'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	309	# OPT: We should probably return set() for these; we don't because
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	310	# patternmatcher.visitdir() (our m2) doesn't return 'all' for subdirs of
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	311	# an 'all' pattern, just 'this'.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	312	self.assertEqual(dm.visitchildrenset(b'dir/subdir/z'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	313	self.assertEqual(dm.visitchildrenset(b'dir/subdir/x'), b'this')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	314
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	315	# We're using includematcher instead of patterns because it behaves slightly
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	316	# better (giving narrower results) than patternmatcher.
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	317	def testVisitdirIncludeIncludfe(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	318	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	319	m2 = matchmod.match(b'', b'', include=[b'rootfilesin:dir'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	320	dm = matchmod.differencematcher(m1, m2)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	321	self.assertEqual(dm.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	322	self.assertEqual(dm.visitdir(b'dir'), True)
41530 4dd07bf84608 tests: fix test-match.py on Python3 Augie Fackler <augie@google.com> parents: 41528 diff changeset	323	self.assertEqual(dm.visitdir(b'dir/subdir'), b'all')
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	324	self.assertFalse(dm.visitdir(b'dir/foo'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	325	self.assertFalse(dm.visitdir(b'folder'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	326	# OPT: We should probably return False for these; we don't because
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	327	# patternmatcher.visitdir() (our m2) doesn't return 'all' for subdirs of
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	328	# an 'all' pattern, just True.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	329	self.assertEqual(dm.visitdir(b'dir/subdir/z'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	330	self.assertEqual(dm.visitdir(b'dir/subdir/x'), True)
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	331
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	332	def testVisitchildrensetIncludeInclude(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	333	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	334	m2 = matchmod.match(b'', b'', include=[b'rootfilesin:dir'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	335	dm = matchmod.differencematcher(m1, m2)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	336	self.assertEqual(dm.visitchildrenset(b'.'), {b'dir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	337	self.assertEqual(dm.visitchildrenset(b'dir'), {b'subdir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	338	self.assertEqual(dm.visitchildrenset(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	339	self.assertEqual(dm.visitchildrenset(b'dir/foo'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	340	self.assertEqual(dm.visitchildrenset(b'folder'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	341	# OPT: We should probably return set() for these; we don't because
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	342	# patternmatcher.visitdir() (our m2) doesn't return 'all' for subdirs of
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	343	# an 'all' pattern, just 'this'.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	344	self.assertEqual(dm.visitchildrenset(b'dir/subdir/z'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	345	self.assertEqual(dm.visitchildrenset(b'dir/subdir/x'), b'this')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	346
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	347	class IntersectionMatcherTests(unittest.TestCase):
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	348
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	349	def testVisitdirM2always(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	350	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	351	m2 = matchmod.alwaysmatcher(b'', b'')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	352	im = matchmod.intersectmatchers(m1, m2)
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	353	# im should be equivalent to a alwaysmatcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	354	self.assertEqual(im.visitdir(b'.'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	355	self.assertEqual(im.visitdir(b'dir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	356	self.assertEqual(im.visitdir(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	357	self.assertEqual(im.visitdir(b'dir/subdir/z'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	358	self.assertEqual(im.visitdir(b'dir/foo'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	359	self.assertEqual(im.visitdir(b'dir/subdir/x'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	360	self.assertEqual(im.visitdir(b'folder'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	361
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	362	def testVisitchildrensetM2always(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	363	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	364	m2 = matchmod.alwaysmatcher(b'', b'')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	365	im = matchmod.intersectmatchers(m1, m2)
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	366	# im should be equivalent to a alwaysmatcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	367	self.assertEqual(im.visitchildrenset(b'.'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	368	self.assertEqual(im.visitchildrenset(b'dir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	369	self.assertEqual(im.visitchildrenset(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	370	self.assertEqual(im.visitchildrenset(b'dir/subdir/z'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	371	self.assertEqual(im.visitchildrenset(b'dir/foo'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	372	self.assertEqual(im.visitchildrenset(b'dir/subdir/x'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	373	self.assertEqual(im.visitchildrenset(b'folder'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	374
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	375	def testVisitdirM2never(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	376	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	377	m2 = matchmod.nevermatcher(b'', b'')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	378	im = matchmod.intersectmatchers(m1, m2)
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	379	# im should be equivalent to a nevermatcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	380	self.assertFalse(im.visitdir(b'.'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	381	self.assertFalse(im.visitdir(b'dir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	382	self.assertFalse(im.visitdir(b'dir/subdir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	383	self.assertFalse(im.visitdir(b'dir/subdir/z'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	384	self.assertFalse(im.visitdir(b'dir/foo'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	385	self.assertFalse(im.visitdir(b'dir/subdir/x'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	386	self.assertFalse(im.visitdir(b'folder'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	387
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	388	def testVisitchildrensetM2never(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	389	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	390	m2 = matchmod.nevermatcher(b'', b'')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	391	im = matchmod.intersectmatchers(m1, m2)
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	392	# im should be equivalent to a nevermqtcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	393	self.assertEqual(im.visitchildrenset(b'.'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	394	self.assertEqual(im.visitchildrenset(b'dir'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	395	self.assertEqual(im.visitchildrenset(b'dir/subdir'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	396	self.assertEqual(im.visitchildrenset(b'dir/subdir/z'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	397	self.assertEqual(im.visitchildrenset(b'dir/foo'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	398	self.assertEqual(im.visitchildrenset(b'dir/subdir/x'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	399	self.assertEqual(im.visitchildrenset(b'folder'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	400
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	401	def testVisitdirM2SubdirPrefix(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	402	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	403	m2 = matchmod.match(b'', b'', patterns=[b'path:dir/subdir'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	404	im = matchmod.intersectmatchers(m1, m2)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	405	self.assertEqual(im.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	406	self.assertEqual(im.visitdir(b'dir'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	407	self.assertEqual(im.visitdir(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	408	self.assertFalse(im.visitdir(b'dir/foo'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	409	self.assertFalse(im.visitdir(b'folder'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	410	# OPT: We should probably return 'all' for these; we don't because
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	411	# patternmatcher.visitdir() (our m2) doesn't return 'all' for subdirs of
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	412	# an 'all' pattern, just True.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	413	self.assertEqual(im.visitdir(b'dir/subdir/z'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	414	self.assertEqual(im.visitdir(b'dir/subdir/x'), True)
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	415
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	416	def testVisitchildrensetM2SubdirPrefix(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	417	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	418	m2 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	419	im = matchmod.intersectmatchers(m1, m2)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	420	self.assertEqual(im.visitchildrenset(b'.'), {b'dir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	421	self.assertEqual(im.visitchildrenset(b'dir'), {b'subdir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	422	self.assertEqual(im.visitchildrenset(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	423	self.assertEqual(im.visitchildrenset(b'dir/foo'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	424	self.assertEqual(im.visitchildrenset(b'folder'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	425	# OPT: We should probably return 'all' for these
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	426	self.assertEqual(im.visitchildrenset(b'dir/subdir/z'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	427	self.assertEqual(im.visitchildrenset(b'dir/subdir/x'), b'this')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	428
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	429	# We're using includematcher instead of patterns because it behaves slightly
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	430	# better (giving narrower results) than patternmatcher.
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	431	def testVisitdirIncludeIncludfe(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	432	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	433	m2 = matchmod.match(b'', b'', include=[b'rootfilesin:dir'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	434	im = matchmod.intersectmatchers(m1, m2)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	435	self.assertEqual(im.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	436	self.assertEqual(im.visitdir(b'dir'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	437	self.assertFalse(im.visitdir(b'dir/subdir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	438	self.assertFalse(im.visitdir(b'dir/foo'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	439	self.assertFalse(im.visitdir(b'folder'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	440	self.assertFalse(im.visitdir(b'dir/subdir/z'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	441	self.assertFalse(im.visitdir(b'dir/subdir/x'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	442
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	443	def testVisitchildrensetIncludeInclude(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	444	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	445	m2 = matchmod.match(b'', b'', include=[b'rootfilesin:dir'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	446	im = matchmod.intersectmatchers(m1, m2)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	447	self.assertEqual(im.visitchildrenset(b'.'), {b'dir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	448	self.assertEqual(im.visitchildrenset(b'dir'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	449	self.assertEqual(im.visitchildrenset(b'dir/subdir'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	450	self.assertEqual(im.visitchildrenset(b'dir/foo'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	451	self.assertEqual(im.visitchildrenset(b'folder'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	452	self.assertEqual(im.visitchildrenset(b'dir/subdir/z'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	453	self.assertEqual(im.visitchildrenset(b'dir/subdir/x'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	454
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	455	# We're using includematcher instead of patterns because it behaves slightly
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	456	# better (giving narrower results) than patternmatcher.
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	457	def testVisitdirIncludeInclude2(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	458	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	459	m2 = matchmod.match(b'', b'', include=[b'path:folder'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	460	im = matchmod.intersectmatchers(m1, m2)
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	461	# FIXME: is True correct here?
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	462	self.assertEqual(im.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	463	self.assertFalse(im.visitdir(b'dir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	464	self.assertFalse(im.visitdir(b'dir/subdir'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	465	self.assertFalse(im.visitdir(b'dir/foo'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	466	self.assertFalse(im.visitdir(b'folder'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	467	self.assertFalse(im.visitdir(b'dir/subdir/z'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	468	self.assertFalse(im.visitdir(b'dir/subdir/x'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	469
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	470	def testVisitchildrensetIncludeInclude2(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	471	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	472	m2 = matchmod.match(b'', b'', include=[b'path:folder'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	473	im = matchmod.intersectmatchers(m1, m2)
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	474	# FIXME: is set() correct here?
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	475	self.assertEqual(im.visitchildrenset(b'.'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	476	self.assertEqual(im.visitchildrenset(b'dir'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	477	self.assertEqual(im.visitchildrenset(b'dir/subdir'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	478	self.assertEqual(im.visitchildrenset(b'dir/foo'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	479	self.assertEqual(im.visitchildrenset(b'folder'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	480	self.assertEqual(im.visitchildrenset(b'dir/subdir/z'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	481	self.assertEqual(im.visitchildrenset(b'dir/subdir/x'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	482
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	483	# We're using includematcher instead of patterns because it behaves slightly
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	484	# better (giving narrower results) than patternmatcher.
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	485	def testVisitdirIncludeInclude3(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	486	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir/x'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	487	m2 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	488	im = matchmod.intersectmatchers(m1, m2)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	489	self.assertEqual(im.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	490	self.assertEqual(im.visitdir(b'dir'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	491	self.assertEqual(im.visitdir(b'dir/subdir'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	492	self.assertFalse(im.visitdir(b'dir/foo'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	493	self.assertFalse(im.visitdir(b'folder'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	494	self.assertFalse(im.visitdir(b'dir/subdir/z'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	495	# OPT: this should probably be 'all' not True.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	496	self.assertEqual(im.visitdir(b'dir/subdir/x'), True)
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	497
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	498	def testVisitchildrensetIncludeInclude3(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	499	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir/x'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	500	m2 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	501	im = matchmod.intersectmatchers(m1, m2)
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	502	self.assertEqual(im.visitchildrenset(b'.'), {b'dir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	503	self.assertEqual(im.visitchildrenset(b'dir'), {b'subdir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	504	self.assertEqual(im.visitchildrenset(b'dir/subdir'), {b'x'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	505	self.assertEqual(im.visitchildrenset(b'dir/foo'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	506	self.assertEqual(im.visitchildrenset(b'folder'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	507	self.assertEqual(im.visitchildrenset(b'dir/subdir/z'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	508	# OPT: this should probably be 'all' not 'this'.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	509	self.assertEqual(im.visitchildrenset(b'dir/subdir/x'), b'this')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	510
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	511	# We're using includematcher instead of patterns because it behaves slightly
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	512	# better (giving narrower results) than patternmatcher.
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	513	def testVisitdirIncludeInclude4(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	514	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir/x'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	515	m2 = matchmod.match(b'', b'', include=[b'path:dir/subdir/z'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	516	im = matchmod.intersectmatchers(m1, m2)
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	517	# OPT: these next three could probably be False as well.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	518	self.assertEqual(im.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	519	self.assertEqual(im.visitdir(b'dir'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	520	self.assertEqual(im.visitdir(b'dir/subdir'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	521	self.assertFalse(im.visitdir(b'dir/foo'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	522	self.assertFalse(im.visitdir(b'folder'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	523	self.assertFalse(im.visitdir(b'dir/subdir/z'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	524	self.assertFalse(im.visitdir(b'dir/subdir/x'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	525
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	526	def testVisitchildrensetIncludeInclude4(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	527	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir/x'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	528	m2 = matchmod.match(b'', b'', include=[b'path:dir/subdir/z'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	529	im = matchmod.intersectmatchers(m1, m2)
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	530	# OPT: these next two could probably be set() as well.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	531	self.assertEqual(im.visitchildrenset(b'.'), {b'dir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	532	self.assertEqual(im.visitchildrenset(b'dir'), {b'subdir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	533	self.assertEqual(im.visitchildrenset(b'dir/subdir'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	534	self.assertEqual(im.visitchildrenset(b'dir/foo'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	535	self.assertEqual(im.visitchildrenset(b'folder'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	536	self.assertEqual(im.visitchildrenset(b'dir/subdir/z'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	537	self.assertEqual(im.visitchildrenset(b'dir/subdir/x'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	538
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	539	class UnionMatcherTests(unittest.TestCase):
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	540
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	541	def testVisitdirM2always(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	542	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	543	m2 = matchmod.alwaysmatcher(b'', b'')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	544	um = matchmod.unionmatcher([m1, m2])
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	545	# um should be equivalent to a alwaysmatcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	546	self.assertEqual(um.visitdir(b'.'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	547	self.assertEqual(um.visitdir(b'dir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	548	self.assertEqual(um.visitdir(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	549	self.assertEqual(um.visitdir(b'dir/subdir/z'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	550	self.assertEqual(um.visitdir(b'dir/foo'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	551	self.assertEqual(um.visitdir(b'dir/subdir/x'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	552	self.assertEqual(um.visitdir(b'folder'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	553
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	554	def testVisitchildrensetM2always(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	555	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	556	m2 = matchmod.alwaysmatcher(b'', b'')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	557	um = matchmod.unionmatcher([m1, m2])
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	558	# um should be equivalent to a alwaysmatcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	559	self.assertEqual(um.visitchildrenset(b'.'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	560	self.assertEqual(um.visitchildrenset(b'dir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	561	self.assertEqual(um.visitchildrenset(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	562	self.assertEqual(um.visitchildrenset(b'dir/subdir/z'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	563	self.assertEqual(um.visitchildrenset(b'dir/foo'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	564	self.assertEqual(um.visitchildrenset(b'dir/subdir/x'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	565	self.assertEqual(um.visitchildrenset(b'folder'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	566
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	567	def testVisitdirM1never(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	568	m1 = matchmod.nevermatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	569	m2 = matchmod.alwaysmatcher(b'', b'')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	570	um = matchmod.unionmatcher([m1, m2])
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	571	# um should be equivalent to a alwaysmatcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	572	self.assertEqual(um.visitdir(b'.'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	573	self.assertEqual(um.visitdir(b'dir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	574	self.assertEqual(um.visitdir(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	575	self.assertEqual(um.visitdir(b'dir/subdir/z'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	576	self.assertEqual(um.visitdir(b'dir/foo'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	577	self.assertEqual(um.visitdir(b'dir/subdir/x'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	578	self.assertEqual(um.visitdir(b'folder'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	579
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	580	def testVisitchildrensetM1never(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	581	m1 = matchmod.nevermatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	582	m2 = matchmod.alwaysmatcher(b'', b'')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	583	um = matchmod.unionmatcher([m1, m2])
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	584	# um should be equivalent to a alwaysmatcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	585	self.assertEqual(um.visitchildrenset(b'.'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	586	self.assertEqual(um.visitchildrenset(b'dir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	587	self.assertEqual(um.visitchildrenset(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	588	self.assertEqual(um.visitchildrenset(b'dir/subdir/z'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	589	self.assertEqual(um.visitchildrenset(b'dir/foo'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	590	self.assertEqual(um.visitchildrenset(b'dir/subdir/x'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	591	self.assertEqual(um.visitchildrenset(b'folder'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	592
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	593	def testVisitdirM2never(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	594	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	595	m2 = matchmod.nevermatcher(b'', b'')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	596	um = matchmod.unionmatcher([m1, m2])
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	597	# um should be equivalent to a alwaysmatcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	598	self.assertEqual(um.visitdir(b'.'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	599	self.assertEqual(um.visitdir(b'dir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	600	self.assertEqual(um.visitdir(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	601	self.assertEqual(um.visitdir(b'dir/subdir/z'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	602	self.assertEqual(um.visitdir(b'dir/foo'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	603	self.assertEqual(um.visitdir(b'dir/subdir/x'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	604	self.assertEqual(um.visitdir(b'folder'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	605
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	606	def testVisitchildrensetM2never(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	607	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	608	m2 = matchmod.nevermatcher(b'', b'')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	609	um = matchmod.unionmatcher([m1, m2])
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	610	# um should be equivalent to a alwaysmatcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	611	self.assertEqual(um.visitchildrenset(b'.'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	612	self.assertEqual(um.visitchildrenset(b'dir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	613	self.assertEqual(um.visitchildrenset(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	614	self.assertEqual(um.visitchildrenset(b'dir/subdir/z'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	615	self.assertEqual(um.visitchildrenset(b'dir/foo'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	616	self.assertEqual(um.visitchildrenset(b'dir/subdir/x'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	617	self.assertEqual(um.visitchildrenset(b'folder'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	618
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	619	def testVisitdirM2SubdirPrefix(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	620	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	621	m2 = matchmod.match(b'', b'', patterns=[b'path:dir/subdir'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	622	um = matchmod.unionmatcher([m1, m2])
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	623	self.assertEqual(um.visitdir(b'.'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	624	self.assertEqual(um.visitdir(b'dir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	625	self.assertEqual(um.visitdir(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	626	self.assertEqual(um.visitdir(b'dir/foo'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	627	self.assertEqual(um.visitdir(b'folder'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	628	self.assertEqual(um.visitdir(b'dir/subdir/z'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	629	self.assertEqual(um.visitdir(b'dir/subdir/x'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	630
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	631	def testVisitchildrensetM2SubdirPrefix(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	632	m1 = matchmod.alwaysmatcher(b'', b'')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	633	m2 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	634	um = matchmod.unionmatcher([m1, m2])
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	635	self.assertEqual(um.visitchildrenset(b'.'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	636	self.assertEqual(um.visitchildrenset(b'dir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	637	self.assertEqual(um.visitchildrenset(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	638	self.assertEqual(um.visitchildrenset(b'dir/foo'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	639	self.assertEqual(um.visitchildrenset(b'folder'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	640	self.assertEqual(um.visitchildrenset(b'dir/subdir/z'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	641	self.assertEqual(um.visitchildrenset(b'dir/subdir/x'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	642
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	643	# We're using includematcher instead of patterns because it behaves slightly
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	644	# better (giving narrower results) than patternmatcher.
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	645	def testVisitdirIncludeIncludfe(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	646	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	647	m2 = matchmod.match(b'', b'', include=[b'rootfilesin:dir'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	648	um = matchmod.unionmatcher([m1, m2])
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	649	self.assertEqual(um.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	650	self.assertEqual(um.visitdir(b'dir'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	651	self.assertEqual(um.visitdir(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	652	self.assertFalse(um.visitdir(b'dir/foo'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	653	self.assertFalse(um.visitdir(b'folder'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	654	# OPT: These two should probably be 'all' not True.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	655	self.assertEqual(um.visitdir(b'dir/subdir/z'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	656	self.assertEqual(um.visitdir(b'dir/subdir/x'), True)
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	657
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	658	def testVisitchildrensetIncludeInclude(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	659	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	660	m2 = matchmod.match(b'', b'', include=[b'rootfilesin:dir'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	661	um = matchmod.unionmatcher([m1, m2])
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	662	self.assertEqual(um.visitchildrenset(b'.'), {b'dir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	663	self.assertEqual(um.visitchildrenset(b'dir'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	664	self.assertEqual(um.visitchildrenset(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	665	self.assertEqual(um.visitchildrenset(b'dir/foo'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	666	self.assertEqual(um.visitchildrenset(b'folder'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	667	# OPT: These next two could be 'all' instead of 'this'.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	668	self.assertEqual(um.visitchildrenset(b'dir/subdir/z'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	669	self.assertEqual(um.visitchildrenset(b'dir/subdir/x'), b'this')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	670
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	671	# We're using includematcher instead of patterns because it behaves slightly
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	672	# better (giving narrower results) than patternmatcher.
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	673	def testVisitdirIncludeInclude2(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	674	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	675	m2 = matchmod.match(b'', b'', include=[b'path:folder'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	676	um = matchmod.unionmatcher([m1, m2])
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	677	self.assertEqual(um.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	678	self.assertEqual(um.visitdir(b'dir'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	679	self.assertEqual(um.visitdir(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	680	self.assertFalse(um.visitdir(b'dir/foo'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	681	self.assertEqual(um.visitdir(b'folder'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	682	# OPT: These should probably be 'all' not True.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	683	self.assertEqual(um.visitdir(b'dir/subdir/z'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	684	self.assertEqual(um.visitdir(b'dir/subdir/x'), True)
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	685
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	686	def testVisitchildrensetIncludeInclude2(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	687	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	688	m2 = matchmod.match(b'', b'', include=[b'path:folder'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	689	um = matchmod.unionmatcher([m1, m2])
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	690	self.assertEqual(um.visitchildrenset(b'.'), {b'folder', b'dir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	691	self.assertEqual(um.visitchildrenset(b'dir'), {b'subdir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	692	self.assertEqual(um.visitchildrenset(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	693	self.assertEqual(um.visitchildrenset(b'dir/foo'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	694	self.assertEqual(um.visitchildrenset(b'folder'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	695	# OPT: These next two could be 'all' instead of 'this'.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	696	self.assertEqual(um.visitchildrenset(b'dir/subdir/z'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	697	self.assertEqual(um.visitchildrenset(b'dir/subdir/x'), b'this')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	698
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	699	# We're using includematcher instead of patterns because it behaves slightly
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	700	# better (giving narrower results) than patternmatcher.
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	701	def testVisitdirIncludeInclude3(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	702	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir/x'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	703	m2 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	704	um = matchmod.unionmatcher([m1, m2])
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	705	self.assertEqual(um.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	706	self.assertEqual(um.visitdir(b'dir'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	707	self.assertEqual(um.visitdir(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	708	self.assertFalse(um.visitdir(b'dir/foo'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	709	self.assertFalse(um.visitdir(b'folder'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	710	self.assertEqual(um.visitdir(b'dir/subdir/x'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	711	# OPT: this should probably be 'all' not True.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	712	self.assertEqual(um.visitdir(b'dir/subdir/z'), True)
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	713
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	714	def testVisitchildrensetIncludeInclude3(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	715	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir/x'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	716	m2 = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	717	um = matchmod.unionmatcher([m1, m2])
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	718	self.assertEqual(um.visitchildrenset(b'.'), {b'dir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	719	self.assertEqual(um.visitchildrenset(b'dir'), {b'subdir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	720	self.assertEqual(um.visitchildrenset(b'dir/subdir'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	721	self.assertEqual(um.visitchildrenset(b'dir/foo'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	722	self.assertEqual(um.visitchildrenset(b'folder'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	723	self.assertEqual(um.visitchildrenset(b'dir/subdir/x'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	724	# OPT: this should probably be 'all' not 'this'.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	725	self.assertEqual(um.visitchildrenset(b'dir/subdir/z'), b'this')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	726
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	727	# We're using includematcher instead of patterns because it behaves slightly
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	728	# better (giving narrower results) than patternmatcher.
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	729	def testVisitdirIncludeInclude4(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	730	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir/x'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	731	m2 = matchmod.match(b'', b'', include=[b'path:dir/subdir/z'])
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	732	um = matchmod.unionmatcher([m1, m2])
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	733	# OPT: these next three could probably be False as well.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	734	self.assertEqual(um.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	735	self.assertEqual(um.visitdir(b'dir'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	736	self.assertEqual(um.visitdir(b'dir/subdir'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	737	self.assertFalse(um.visitdir(b'dir/foo'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	738	self.assertFalse(um.visitdir(b'folder'))
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	739	self.assertEqual(um.visitdir(b'dir/subdir/z'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	740	self.assertEqual(um.visitdir(b'dir/subdir/x'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	741
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	742	def testVisitchildrensetIncludeInclude4(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	743	m1 = matchmod.match(b'', b'', include=[b'path:dir/subdir/x'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	744	m2 = matchmod.match(b'', b'', include=[b'path:dir/subdir/z'])
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	745	um = matchmod.unionmatcher([m1, m2])
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	746	self.assertEqual(um.visitchildrenset(b'.'), {b'dir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	747	self.assertEqual(um.visitchildrenset(b'dir'), {b'subdir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	748	self.assertEqual(um.visitchildrenset(b'dir/subdir'), {b'x', b'z'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	749	self.assertEqual(um.visitchildrenset(b'dir/foo'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	750	self.assertEqual(um.visitchildrenset(b'folder'), set())
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	751	self.assertEqual(um.visitchildrenset(b'dir/subdir/z'), b'all')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	752	self.assertEqual(um.visitchildrenset(b'dir/subdir/x'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	753
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	754	class SubdirMatcherTests(unittest.TestCase):
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	755
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	756	def testVisitdir(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	757	m = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	758	sm = matchmod.subdirmatcher(b'dir', m)
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	759
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	760	self.assertEqual(sm.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	761	self.assertEqual(sm.visitdir(b'subdir'), b'all')
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	762	# OPT: These next two should probably be 'all' not True.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	763	self.assertEqual(sm.visitdir(b'subdir/x'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	764	self.assertEqual(sm.visitdir(b'subdir/z'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	765	self.assertFalse(sm.visitdir(b'foo'))
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	766
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	767	def testVisitchildrenset(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	768	m = matchmod.match(b'', b'', include=[b'path:dir/subdir'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	769	sm = matchmod.subdirmatcher(b'dir', m)
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	770
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	771	self.assertEqual(sm.visitchildrenset(b'.'), {b'subdir'})
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	772	self.assertEqual(sm.visitchildrenset(b'subdir'), b'all')
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	773	# OPT: These next two should probably be 'all' not 'this'.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	774	self.assertEqual(sm.visitchildrenset(b'subdir/x'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	775	self.assertEqual(sm.visitchildrenset(b'subdir/z'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	776	self.assertEqual(sm.visitchildrenset(b'foo'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	777
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	778	class PrefixdirMatcherTests(unittest.TestCase):
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	779
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	780	def testVisitdir(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	781	m = matchmod.match(util.localpath(b'root/d'), b'e/f',
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	782	[b'../a.txt', b'b.txt'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	783	pm = matchmod.prefixdirmatcher(b'root', b'd/e/f', b'd', m)
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	784
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	785	# `m` elides 'd' because it's part of the root, and the rest of the
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	786	# patterns are relative.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	787	self.assertEqual(bool(m(b'a.txt')), False)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	788	self.assertEqual(bool(m(b'b.txt')), False)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	789	self.assertEqual(bool(m(b'e/a.txt')), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	790	self.assertEqual(bool(m(b'e/b.txt')), False)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	791	self.assertEqual(bool(m(b'e/f/b.txt')), True)
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	792
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	793	# The prefix matcher re-adds 'd' to the paths, so they need to be
987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	794	# specified when using the prefixdirmatcher.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	795	self.assertEqual(bool(pm(b'a.txt')), False)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	796	self.assertEqual(bool(pm(b'b.txt')), False)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	797	self.assertEqual(bool(pm(b'd/e/a.txt')), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	798	self.assertEqual(bool(pm(b'd/e/b.txt')), False)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	799	self.assertEqual(bool(pm(b'd/e/f/b.txt')), True)
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	800
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	801	self.assertEqual(m.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	802	self.assertEqual(m.visitdir(b'e'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	803	self.assertEqual(m.visitdir(b'e/f'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	804	self.assertEqual(m.visitdir(b'e/f/g'), False)
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	805
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	806	self.assertEqual(pm.visitdir(b'.'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	807	self.assertEqual(pm.visitdir(b'd'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	808	self.assertEqual(pm.visitdir(b'd/e'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	809	self.assertEqual(pm.visitdir(b'd/e/f'), True)
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	810	self.assertEqual(pm.visitdir(b'd/e/f/g'), False)
38953 987d3a4b989f match: add tests for visitdir functionality spectral <spectral@google.com> parents: 33582 diff changeset	811
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	812	def testVisitchildrenset(self):
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	813	m = matchmod.match(util.localpath(b'root/d'), b'e/f',
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	814	[b'../a.txt', b'b.txt'])
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	815	pm = matchmod.prefixdirmatcher(b'root', b'd/e/f', b'd', m)
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	816
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	817	# OPT: visitchildrenset could possibly return {'e'} and {'f'} for these
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	818	# next two, respectively; patternmatcher does not have this
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	819	# optimization.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	820	self.assertEqual(m.visitchildrenset(b'.'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	821	self.assertEqual(m.visitchildrenset(b'e'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	822	self.assertEqual(m.visitchildrenset(b'e/f'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	823	self.assertEqual(m.visitchildrenset(b'e/f/g'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	824
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	825	# OPT: visitchildrenset could possibly return {'d'}, {'e'}, and {'f'}
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	826	# for these next three, respectively; patternmatcher does not have this
081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	827	# optimization.
38963 467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	828	self.assertEqual(pm.visitchildrenset(b'.'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	829	self.assertEqual(pm.visitchildrenset(b'd'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	830	self.assertEqual(pm.visitchildrenset(b'd/e'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	831	self.assertEqual(pm.visitchildrenset(b'd/e/f'), b'this')
467b5c1df72d tests: make all the string constants in test-match.py be bytes Augie Fackler <augie@google.com> parents: 38958 diff changeset	832	self.assertEqual(pm.visitchildrenset(b'd/e/f/g'), set())
38955 081cc9a95b65 match: add visitchildrenset complement to visitdir spectral <spectral@google.com> parents: 38953 diff changeset	833
33582 44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	834	if __name__ == '__main__':
44bc181b9835 match: override visitdir() in nevermatcher to return False Martin von Zweigbergk <martinvonz@google.com> parents: diff changeset	835	silenttestrunner.main(__name__)

author	Augie Fackler <augie@google.com>
	Mon, 04 Feb 2019 17:06:22 -0500
changeset 41530	4dd07bf84608
parent 41528	b7a0efb3c370
child 41621	0dc3ed4e712c
permissions	-rw-r--r--