/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1185.14.8 by Aaron Bentley
Added test_commit.py
1
# Copyright (C) 2005 by Canonical Ltd
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
18
import os
19
1534.10.4 by Aaron Bentley
Implemented conflict serialization
20
from bzrlib.tests import TestCaseWithTransport, TestCase
1185.14.8 by Aaron Bentley
Added test_commit.py
21
from bzrlib.branch import Branch
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
22
from bzrlib.conflicts import *
1185.35.1 by Aaron Bentley
Implemented conflicts.restore
23
from bzrlib.errors import NotConflicted
1185.14.8 by Aaron Bentley
Added test_commit.py
24
1534.10.4 by Aaron Bentley
Implemented conflict serialization
25
1185.14.8 by Aaron Bentley
Added test_commit.py
26
# TODO: Test commit with some added, and added-but-missing files
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
27
# RBC 20060124 is that not tested in test_commit.py ?
1185.14.8 by Aaron Bentley
Added test_commit.py
28
1534.10.22 by Aaron Bentley
Got ConflictList implemented
29
example_conflicts = ConflictList([ 
1534.10.19 by Aaron Bentley
Stanza conversion, cooking
30
    ContentsConflict('patha', 'ida'), 
31
    TextConflict('patha'),
32
    PathConflict('pathb', 'pathc', 'idb'),
33
    DuplicateID('Unversioned existing file', 'pathc', 'pathc2', 'idc', 'idc'),
34
    DuplicateEntry('Moved existing file to',  'pathdd.moved', 'pathd', 'idd', 
35
                   None),
36
    ParentLoop('Cancelled move', 'pathe', 'path2e', None, 'id2e'),
37
    UnversionedParent('Versioned directory', 'pathf', 'idf'),
38
    MissingParent('Not deleting', 'pathg', 'idg'),
1534.10.22 by Aaron Bentley
Got ConflictList implemented
39
])
1534.10.4 by Aaron Bentley
Implemented conflict serialization
40
41
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
42
class TestConflicts(TestCaseWithTransport):
1185.14.8 by Aaron Bentley
Added test_commit.py
43
44
    def test_conflicts(self):
45
        """Conflicts are detected properly"""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
46
        tree = self.make_branch_and_tree('.')
47
        b = tree.branch
1185.35.1 by Aaron Bentley
Implemented conflicts.restore
48
        file('hello', 'w').write('hello world4')
49
        file('hello.THIS', 'w').write('hello world2')
50
        file('hello.BASE', 'w').write('hello world1')
51
        file('hello.OTHER', 'w').write('hello world3')
1185.14.8 by Aaron Bentley
Added test_commit.py
52
        file('hello.sploo.BASE', 'w').write('yellow world')
1185.35.1 by Aaron Bentley
Implemented conflicts.restore
53
        file('hello.sploo.OTHER', 'w').write('yellow world2')
54
        self.assertEqual(len(list(tree.list_files())), 6)
1534.10.22 by Aaron Bentley
Got ConflictList implemented
55
        conflicts = tree.conflicts()
1185.14.8 by Aaron Bentley
Added test_commit.py
56
        self.assertEqual(len(conflicts), 2)
1534.10.20 by Aaron Bentley
Got all tests passing
57
        self.assert_('hello' in conflicts[0].path)
58
        self.assert_('hello.sploo' in conflicts[1].path)
1185.35.1 by Aaron Bentley
Implemented conflicts.restore
59
        restore('hello')
60
        restore('hello.sploo')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
61
        self.assertEqual(len(tree.conflicts()), 0)
1185.35.1 by Aaron Bentley
Implemented conflicts.restore
62
        self.assertFileEqual('hello world2', 'hello')
63
        assert not os.path.lexists('hello.sploo')
64
        self.assertRaises(NotConflicted, restore, 'hello')
65
        self.assertRaises(NotConflicted, restore, 'hello.sploo')
1534.10.4 by Aaron Bentley
Implemented conflict serialization
66
67
68
class TestConflictStanzas(TestCase):
69
    def test_stanza_roundtrip(self):
1534.10.23 by Aaron Bentley
Removed conflicts_to_stanzas and stanzas_to_conflicts
70
        stanza_iter = example_conflicts.to_stanzas()
71
        processed = ConflictList.from_stanzas(stanza_iter)
1534.10.4 by Aaron Bentley
Implemented conflict serialization
72
        for o,p in zip(processed, example_conflicts):
73
            self.assertEqual(o, p)
74
75
    def test_stanzification(self):
1534.10.23 by Aaron Bentley
Removed conflicts_to_stanzas and stanzas_to_conflicts
76
        for stanza in example_conflicts.to_stanzas():
1534.10.4 by Aaron Bentley
Implemented conflict serialization
77
            try:
78
                self.assertStartsWith(stanza['file_id'], 'id')
79
            except KeyError:
80
                pass
81
            self.assertStartsWith(stanza['path'], 'path')
82
            try:
83
                self.assertStartsWith(stanza['conflict_file_id'], 'id')
84
                self.assertStartsWith(stanza['conflict_file_path'], 'path')
85
            except KeyError:
86
                pass