← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_matchers.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_matchers.py
18
18
 
19
19
from testtools.matchers import *
20
20
 
 
21
from bzrlib.smart.client import CallHookParams
 
22
 
21
23
from bzrlib.tests import (
 
24
    CapturedCall,
22
25
    TestCase,
23
26
    TestCaseWithTransport,
24
27
    )
116
119
        t = self.make_branch_and_tree('.')
117
120
        self.build_tree(['a', 'b/', 'b/c'])
118
121
        t.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
119
 
        self.assertThat(t, HasLayout(['', 'a', 'b', 'b/c']))
 
122
        self.assertThat(t, HasLayout(['', 'a', 'b/', 'b/c']))
120
123
        self.assertThat(t, HasLayout(
121
124
            [('', t.get_root_id()),
122
125
             ('a', 'a-id'),
123
 
             ('b', 'b-id'),
 
126
             ('b/', 'b-id'),
124
127
             ('b/c', 'c-id')]))
125
128
 
126
129
    def test_mismatch(self):
130
133
        mismatch = HasLayout(['a']).match(t)
131
134
        self.assertIsNot(None, mismatch)
132
135
        self.assertEquals(
133
 
            "[u'', u'a', u'b', u'b/c'] != ['a']",
134
 
            mismatch.describe())
 
136
            "['a'] != [u'', u'a', u'b/', u'b/c']",
 
137
            mismatch.describe())
 
138
 
 
139
    def test_no_dirs(self):
 
140
        # Some tree/repository formats do not support versioned directories
 
141
        t = self.make_branch_and_tree('.')
 
142
        t.has_versioned_directories = lambda: False
 
143
        self.build_tree(['a', 'b/', 'b/c'])
 
144
        t.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
 
145
        self.assertIs(None, HasLayout(['', 'a', 'b/', 'b/c']).match(t))
 
146
        self.assertIs(None, HasLayout(['', 'a', 'b/', 'b/c', 'd/']).match(t))
 
147
        mismatch = HasLayout([u'', u'a', u'd/']).match(t)
 
148
        self.assertIsNot(None, mismatch)
 
149
        self.assertEquals(
 
150
            "[u'', u'a'] != [u'', u'a', u'b/', u'b/c']",
 
151
            mismatch.describe())
 
152
 
 
153
 
 
154
class TestContainsNoVfsCalls(TestCase):
 
155
 
 
156
    def _make_call(self, method, args):
 
157
        return CapturedCall(CallHookParams(method, args, None, None, None), 0)
 
158
 
 
159
    def test__str__(self):
 
160
        self.assertEqual("ContainsNoVfsCalls()", str(ContainsNoVfsCalls()))
 
161
 
 
162
    def test_empty(self):
 
163
        self.assertIs(None, ContainsNoVfsCalls().match([]))
 
164
 
 
165
    def test_no_vfs_calls(self):
 
166
        calls = [self._make_call("Branch.get_config_file", [])]
 
167
        self.assertIs(None, ContainsNoVfsCalls().match(calls))
 
168
 
 
169
    def test_ignores_unknown(self):
 
170
        calls = [self._make_call("unknown", [])]
 
171
        self.assertIs(None, ContainsNoVfsCalls().match(calls))
 
172
 
 
173
    def test_match(self):
 
174
        calls = [self._make_call("append", ["file"]),
 
175
                 self._make_call("Branch.get_config_file", [])]
 
176
        mismatch = ContainsNoVfsCalls().match(calls)
 
177
        self.assertIsNot(None, mismatch)
 
178
        self.assertEquals([calls[0].call], mismatch.vfs_calls)
 
179
        self.assertEquals("no VFS calls expected, got: append('file')""",
 
180
                mismatch.describe())