~bzr-pqm/bzr/bzr.dev

974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
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
import os
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
18
from cStringIO import StringIO
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
19
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
20
from bzrlib.selftest import BzrTestBase, TestCaseInTempDir
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
21
from bzrlib.log import LogFormatter, show_log, LongLogFormatter
22
from bzrlib.branch import Branch
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
23
from bzrlib.errors import InvalidRevisionNumber
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
24
25
class _LogEntry(object):
26
    # should probably move into bzrlib.log?
27
    pass
28
29
30
class LogCatcher(LogFormatter):
31
    """Pull log messages into list rather than displaying them.
32
33
    For ease of testing we save log messages here rather than actually
34
    formatting them, so that we can precisely check the result without
35
    being too dependent on the exact formatting.
36
37
    We should also test the LogFormatter.
38
    """
39
    def __init__(self):
40
        super(LogCatcher, self).__init__(to_file=None)
41
        self.logs = []
42
        
43
        
44
    def show(self, revno, rev, delta):
45
        le = _LogEntry()
46
        le.revno = revno
47
        le.rev = rev
48
        le.delta = delta
49
        self.logs.append(le)
50
51
1141 by Martin Pool
- rename FunctionalTest to TestCaseInTempDir
52
class SimpleLogTest(TestCaseInTempDir):
1102 by Martin Pool
- merge test refactoring from robertc
53
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
54
    def checkDelta(self, delta, **kw):
55
        """Check the filenames touched by a delta are as expected."""
56
        for n in 'added', 'removed', 'renamed', 'modified', 'unchanged':
57
            expected = kw.get(n, [])
58
59
            # tests are written with unix paths; fix them up for windows
60
            if os.sep != '/':
61
                expected = [x.replace('/', os.sep) for x in expected]
62
63
            # strip out only the path components
64
            got = [x[0] for x in getattr(delta, n)]
65
            self.assertEquals(expected, got)
66
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
67
    def test_cur_revno(self):
1185.2.9 by Lalo Martins
getting rid of everything that calls the Branch constructor directly
68
        b = Branch.initialize('.')
974.1.54 by aaron.bentley at utoronto
Fixed the revno bug in log
69
70
        lf = LogCatcher()
71
        b.commit('empty commit')
72
        show_log(b, lf, verbose=True, start_revision=1, end_revision=1)
73
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
74
                          start_revision=2, end_revision=1) 
75
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
76
                          start_revision=1, end_revision=2) 
77
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
78
                          start_revision=0, end_revision=2) 
79
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
80
                          start_revision=1, end_revision=0) 
81
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
82
                          start_revision=-1, end_revision=1) 
83
        self.assertRaises(InvalidRevisionNumber, show_log, b, lf,
84
                          start_revision=1, end_revision=-1) 
85
1102 by Martin Pool
- merge test refactoring from robertc
86
    def test_simple_log(self):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
87
        eq = self.assertEquals
88
        
1185.2.9 by Lalo Martins
getting rid of everything that calls the Branch constructor directly
89
        b = Branch.initialize('.')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
90
91
        lf = LogCatcher()
92
        show_log(b, lf)
93
        # no entries yet
94
        eq(lf.logs, [])
95
96
97
        b.commit('empty commit')
98
        lf = LogCatcher()
99
        show_log(b, lf, verbose=True)
100
        eq(len(lf.logs), 1)
101
        eq(lf.logs[0].revno, 1)
102
        eq(lf.logs[0].rev.message, 'empty commit')
103
        d = lf.logs[0].delta
104
        self.log('log delta: %r' % d)
105
        self.checkDelta(d)
106
107
108
        self.build_tree(['hello'])
109
        b.add('hello')
110
        b.commit('add one file')
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
111
112
        lf = StringIO()
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
113
        # log using regular thing
1123 by Martin Pool
* move bzr-specific code from testsweet into bzrlib.selftest
114
        show_log(b, LongLogFormatter(lf))
115
        lf.seek(0)
116
        for l in lf.readlines():
117
            self.log(l)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
118
119
        # get log as data structure
120
        lf = LogCatcher()
121
        show_log(b, lf, verbose=True)
122
        eq(len(lf.logs), 2)
123
        self.log('log entries:')
124
        for logentry in lf.logs:
125
            self.log('%4d %s' % (logentry.revno, logentry.rev.message))
126
        
127
        # first one is most recent
128
        logentry = lf.logs[0]
129
        eq(logentry.revno, 2)
130
        eq(logentry.rev.message, 'add one file')
131
        d = logentry.delta
132
        self.log('log 2 delta: %r' % d)
133
        # self.checkDelta(d, added=['hello'])
134