33
33
# The order of 'path' here is important - do not let it
34
34
# be a sorted list.
35
# u'\xe5' == a with circle
36
# '\xc3\xae' == u'\xee' == i with hat
37
# So these are u'pathg' and 'idg' only with a circle and a hat. (shappo?)
35
38
example_conflicts = ConflictList([
36
MissingParent('Not deleting', 'pathg', 'idg'),
37
ContentsConflict('patha', 'ida'),
38
TextConflict('patha'),
39
PathConflict('pathb', 'pathc', 'idb'),
40
DuplicateID('Unversioned existing file', 'pathc', 'pathc2', 'idc', 'idc'),
41
DuplicateEntry('Moved existing file to', 'pathdd.moved', 'pathd', 'idd',
43
ParentLoop('Cancelled move', 'pathe', 'path2e', None, 'id2e'),
44
UnversionedParent('Versioned directory', 'pathf', 'idf'),
39
MissingParent('Not deleting', u'p\xe5thg', '\xc3\xaedg'),
40
ContentsConflict(u'p\xe5tha', None, '\xc3\xaeda'),
41
TextConflict(u'p\xe5tha'),
42
PathConflict(u'p\xe5thb', u'p\xe5thc', '\xc3\xaedb'),
43
DuplicateID('Unversioned existing file', u'p\xe5thc', u'p\xe5thc2',
44
'\xc3\xaedc', '\xc3\xaedc'),
45
DuplicateEntry('Moved existing file to', u'p\xe5thdd.moved', u'p\xe5thd',
47
ParentLoop('Cancelled move', u'p\xe5the', u'p\xe5th2e',
49
UnversionedParent('Versioned directory', u'p\xe5thf', '\xc3\xaedf'),
58
63
file('hello.OTHER', 'w').write('hello world3')
59
64
file('hello.sploo.BASE', 'w').write('yellow world')
60
65
file('hello.sploo.OTHER', 'w').write('yellow world2')
61
67
self.assertEqual(len(list(tree.list_files())), 6)
62
69
conflicts = tree.conflicts()
63
70
self.assertEqual(len(conflicts), 2)
64
71
self.assert_('hello' in conflicts[0].path)
89
96
# write and read our example stanza.
90
97
stanza_iter = example_conflicts.to_stanzas()
91
98
processed = ConflictList.from_stanzas(stanza_iter)
92
for o,p in zip(processed, example_conflicts):
99
for o, p in zip(processed, example_conflicts):
93
100
self.assertEqual(o, p)
102
self.assertIsInstance(o.path, unicode)
104
if o.file_id is not None:
105
self.assertIsInstance(o.file_id, str)
107
conflict_path = getattr(o, 'conflict_path', None)
108
if conflict_path is not None:
109
self.assertIsInstance(conflict_path, unicode)
111
conflict_file_id = getattr(o, 'conflict_file_id', None)
112
if conflict_file_id is not None:
113
self.assertIsInstance(conflict_file_id, str)
95
115
def test_stanzification(self):
96
116
for stanza in example_conflicts.to_stanzas():
98
self.assertStartsWith(stanza['file_id'], 'id')
101
self.assertStartsWith(stanza['path'], 'path')
103
self.assertStartsWith(stanza['conflict_file_id'], 'id')
104
self.assertStartsWith(stanza['conflict_file_path'], 'path')
117
if 'file_id' in stanza:
118
# In Stanza form, the file_id has to be unicode.
119
self.assertStartsWith(stanza['file_id'], u'\xeed')
120
self.assertStartsWith(stanza['path'], u'p\xe5th')
121
if 'conflict_path' in stanza:
122
self.assertStartsWith(stanza['conflict_path'], u'p\xe5th')
123
if 'conflict_file_id' in stanza:
124
self.assertStartsWith(stanza['conflict_file_id'], u'\xeed')