1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
|
# Copyright 2009-2011 Canonical Ltd. This software is licensed under the
# GNU Affero General Public License version 3 (see the file LICENSE).
"""Tests for the tales formatters."""
__metaclass__ = type
from difflib import unified_diff
from storm.store import Store
from testtools.matchers import Equals
from zope.component import queryAdapter
from zope.security.proxy import removeSecurityProxy
from zope.traversing.interfaces import IPathAdapter
from lp.services.webapp.publisher import canonical_url
from lp.testing import (
login,
person_logged_in,
test_tales,
TestCaseWithFactory,
)
from lp.testing.layers import LaunchpadFunctionalLayer
class TestPreviewDiffFormatter(TestCaseWithFactory):
"""Test the PreviewDiffFormatterAPI class."""
layer = LaunchpadFunctionalLayer
def _createPreviewDiff(self, line_count=0, added=None, removed=None,
conflicts=None, diffstat=None):
# Login an admin to avoid the launchpad.Edit requirements.
login('admin@canonical.com')
# Create a dummy preview diff, and make sure the branches have the
# correct last scanned ids to ensure that the new diff is not stale.
bmp = self.factory.makeBranchMergeProposal()
if line_count:
content = ''.join(unified_diff('', 'random content'))
else:
content = ''
preview = bmp.updatePreviewDiff(
content, u'rev-a', u'rev-b', conflicts=conflicts)
bmp.source_branch.last_scanned_id = preview.source_revision_id
bmp.target_branch.last_scanned_id = preview.target_revision_id
# Update the values directly sidestepping the security.
naked_diff = removeSecurityProxy(preview)
naked_diff.diff_lines_count = line_count
naked_diff.added_lines_count = added
naked_diff.removed_lines_count = removed
naked_diff.diffstat = diffstat
# In order to get the canonical url of the librarian file, we need to
# commit.
# transaction.commit()
# Make sure that the preview diff is in the db for the test.
# Storm bug: 324724
Store.of(bmp).flush()
return preview
def _createStalePreviewDiff(self, line_count=0, added=None, removed=None,
conflicts=None, diffstat=None):
preview = self._createPreviewDiff(
line_count, added, removed, conflicts, diffstat)
preview.branch_merge_proposal.source_branch.last_scanned_id = 'other'
return preview
def test_creation_method(self):
# Just confirm that our helpers do what they say.
preview = self._createPreviewDiff(
12, 45, 23, u'conflicts', {'filename': (3, 2)})
self.assertEqual(12, preview.diff_lines_count)
self.assertEqual(45, preview.added_lines_count)
self.assertEqual(23, preview.removed_lines_count)
self.assertEqual(False, preview.stale)
self.assertEqual(True, self._createStalePreviewDiff().stale)
self.assertEqual(u'conflicts', preview.conflicts)
self.assertEqual({'filename': (3, 2)}, preview.diffstat)
def test_fmt_no_diff(self):
# If there is no diff, there is no link.
preview = self._createPreviewDiff(0)
self.assertEqual(
'<span class="empty-diff">0 lines</span>',
test_tales('preview/fmt:link', preview=preview))
def test_fmt_lines_no_add_or_remove(self):
# If the lines added and removed are None, they are now shown.
preview = self._createPreviewDiff(10, added=None, removed=None)
self.assertEqual(
'<a href="%s/+files/preview.diff" class="diff-link">'
'10 lines</a>'
% canonical_url(preview),
test_tales('preview/fmt:link', preview=preview))
def test_fmt_lines_some_added_no_removed(self):
# If the added and removed values are not None, they are shown.
preview = self._createPreviewDiff(10, added=4, removed=0)
self.assertEqual(
'<a href="%s/+files/preview.diff" class="diff-link">'
'10 lines (+4/-0)</a>'
% canonical_url(preview),
test_tales('preview/fmt:link', preview=preview))
def test_fmt_lines_files_modified(self):
# If the diffstat has been set, the number of entries in the dict
# defines the number of files modified.
preview = self._createPreviewDiff(
10, added=4, removed=0, diffstat={
'file1': (1, 0),
'file2': (3, 0)})
self.assertEqual(
'<a href="%s/+files/preview.diff" class="diff-link">'
'10 lines (+4/-0) 2 files modified</a>'
% canonical_url(preview),
test_tales('preview/fmt:link', preview=preview))
def test_fmt_lines_one_file_modified(self):
# If only one file has been modified, a singular value is used.
preview = self._createPreviewDiff(
10, added=4, removed=0, diffstat={
'file': (3, 0)})
self.assertEqual(
'<a href="%s/+files/preview.diff" class="diff-link">'
'10 lines (+4/-0) 1 file modified</a>'
% canonical_url(preview),
test_tales('preview/fmt:link', preview=preview))
def test_fmt_simple_conflicts(self):
# Conflicts are indicated using text in the link.
preview = self._createPreviewDiff(10, 2, 3, u'conflicts')
self.assertEqual(
'<a href="%s/+files/preview.diff" class="diff-link">'
'10 lines (+2/-3) (has conflicts)</a>'
% canonical_url(preview),
test_tales('preview/fmt:link', preview=preview))
def test_fmt_stale_empty_diff(self):
# If there is no diff, there is no link.
preview = self._createStalePreviewDiff(0)
self.assertEqual(
'<span class="empty-diff">0 lines</span>',
test_tales('preview/fmt:link', preview=preview))
def test_fmt_stale_non_empty_diff(self):
# If there is no diff, there is no link.
diffstat = dict(
(self.factory.getUniqueString(), (2, 3)) for x in range(23))
preview = self._createStalePreviewDiff(
500, 89, 340, diffstat=diffstat)
self.assertEqual(
'<a href="%s/+files/preview.diff" class="diff-link">'
'500 lines (+89/-340) 23 files modified</a>'
% canonical_url(preview),
test_tales('preview/fmt:link', preview=preview))
def test_fmt_stale_non_empty_diff_with_conflicts(self):
# If there is no diff, there is no link.
diffstat = dict(
(self.factory.getUniqueString(), (2, 3)) for x in range(23))
preview = self._createStalePreviewDiff(
500, 89, 340, u'conflicts', diffstat=diffstat)
self.assertEqual(
'<a href="%s/+files/preview.diff" class="diff-link">'
'500 lines (+89/-340) 23 files modified (has conflicts)</a>'
% canonical_url(preview),
test_tales('preview/fmt:link', preview=preview))
class TestDiffFormatter(TestCaseWithFactory):
"""Test the DiffFormatterAPI class."""
layer = LaunchpadFunctionalLayer
def test_url(self):
diff = self.factory.makeDiff()
self.assertEqual(
diff.diff_text.getURL(), test_tales('diff/fmt:url', diff=diff))
class TestSourcePackageRecipeBuild(TestCaseWithFactory):
"""Test the formatter for SourcePackageRecipeBuilds."""
layer = LaunchpadFunctionalLayer
def test_link(self):
eric = self.factory.makePerson(name='eric')
ppa = self.factory.makeArchive(owner=eric, name='ppa')
build = self.factory.makeSourcePackageRecipeBuild(
archive=ppa)
adapter = queryAdapter(build, IPathAdapter, 'fmt')
self.assertThat(
adapter.link(None),
Equals(
'<a href="%s">%s recipe build</a> [eric/ppa]'
% (canonical_url(build, path_only_if_possible=True),
build.recipe.base_branch.unique_name)))
def test_link_no_recipe(self):
eric = self.factory.makePerson(name='eric')
ppa = self.factory.makeArchive(owner=eric, name='ppa')
build = self.factory.makeSourcePackageRecipeBuild(
archive=ppa)
with person_logged_in(build.recipe.owner):
build.recipe.destroySelf()
adapter = queryAdapter(build, IPathAdapter, 'fmt')
self.assertThat(
adapter.link(None),
Equals(
'<a href="%s">build for deleted recipe</a> [eric/ppa]'
% (canonical_url(build, path_only_if_possible=True), )))
def test_link_no_permission(self):
eric = self.factory.makePerson(name='eric')
ppa = self.factory.makeArchive(owner=eric, name='ppa', private=True)
build = self.factory.makeSourcePackageRecipeBuild(archive=ppa)
adapter = queryAdapter(build, IPathAdapter, 'fmt')
self.assertThat(adapter.link(None), Equals('private job'))
|