blob: 8bfe111ae43adb1236ae0e3353d8c6bdf49f465a (
plain) (
blame)
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
|
<html>
<head>
<title>Compare With Each Other</title>
<LINK REL=STYLESHEET HREF=../book.css CHARSET=ISO-8859-1 TYPE=text/css>
<meta NAME="keywords" content="">
<meta NAME="since" content="">
</head>
<body>
<h2>Compare With Each Other</h2>
<p>Since: <br>
Last Modified: $Date: 2007/09/05 19:30:00 $</p>
<h3>Compare a resource with other resource</h3>
<h5>The action</h5>
<ul>
<li>The action should appear only when there are 2 or 3 resources
selected.</li>
<li>If there are 3 resources selected you should be prompted to
select the common ancestor.</li>
</ul>
<h5>Look</h5>
<ul>
<li>Ensure that all titles and labels are ok (e.g. dialog title,
structure pane title, compare editor labels...).</li>
<li>Ensure that all buttons in the toolbar are properly enabled
(e.g. Copy All/Copy Current, Next/Prev Difference/Change).</li>
<li>Ensure that difference markers are properly display at start</li>
</ul>
<h5>Navigation</h5>
<ul>
<li>If you reach the first/last difference you should be prompted
to go to the end/start of the current element.</li>
<li>Ensure that you can correctly navigate through differences
using the difference markers on the right side of the editor.</li>
</ul>
<h5>Merging</h5>
<ul>
<li>Ensure that Copy All/Copy Current actions work as expected.</li>
<li>Ensure that when the Copy All action is used all difference
markers disappear.</li>
<li>Ensure that when the Copy Current action is used a proper
difference marker disappears.</li>
<li>Ensure you can Undo an action.</li>
</ul>
<h5>Saving</h5>
<ul>
<li>If you edit a local resource the dirty state indicator should
appear over the resource.</li>
<li>If you edit a local resource and the resource is also opened
in a different editor the dirty state should appear on that editor too.</li>
<li>If you edit both of the resources being compare (both are
local), changes should be saved to both of them.</li>
<li>If you edit a resource and close the editor you should be
prompted to save or abandon changes.</li>
<li>If you edit both of the resources and close the editor you
should be prompted to select which resources to save using the Save
Resources dialog.</li>
<li>Ensure you can Undo a change.</li>
<li>Ensure that changes are saved correctly to the underlying
resource.</li>
</ul>
<h5>Concurrent edition</h5>
<ul>
<li>Scenario 1
<ol>
<li>Compare two local resources using the Compare Editor.</li>
<li>Open one of them in the default editor (F3) and edit it.</li>
<li>Ensure that the resource gets the dirty state indicator over
both editors (i.e default and Compare).</li>
<li>If you save the resource in the default editor the dirty
state indicator should go off for both editors.</li>
<li>Ensure that changes are saved correctly to the underlying
resource.</li>
</ol>
</li>
<li>Scenario 2a
<ol>
<li>Compare two local resources using the Compare Editor.</li>
<li>Open one of them in the default editor (F3) and edit it.</li>
<li>Ensure that the resource gets the dirty state indicator over
both editors (i.e default and Compare).</li>
<li>If you close the default editor you should be prompted to
save changes, exiting without saving or cancel.</li>
<li>Select exit without saving (button named "No").</li>
<li>Ensure that the resource under the Compare Editor is still in
the dirty state.</li>
<li>Ensure that changes are the same as made using the default
editor.</li>
<li>Ensure that changes can be saved to the underlying resource
from the Compare Editor.</li>
<li>Ensure that changes are saved correctly to the underlying
resource.</li>
</ol>
</li>
<li>Scenario 2b
<ol>
<li>Compare two local resources using the Compare Editor.</li>
<li>Open one of them in the default editor (F3) and edit it.</li>
<li>Ensure that the resource gets the dirty state indicator over
both editors (i.e default and Compare).</li>
<li>If you close the default editor you should be prompted to
save changes, exiting without saving or cancel.</li>
<li>Select to save changes (button named "Yes").</li>
<li>Ensure that the dirty state indicator for the resource goes
off.</li>
<li>Ensure that changes are saved correctly to the underlying
resource.</li>
<li>Ensure you can Undo changes.</li>
</ol>
</li>
<li>Scenario 3
<ol>
<li>Compare two local resources using the Compare Editor.</li>
<li>Open both files in default editors (F3) and edit them.</li>
<li>Ensure that the resource gets the dirty state indicator over
all editors (i.e two default and Compare).</li>
<li>Ensure that changes made in one of editors are correctly
handled by others.</li>
<li>Ensure that changes are saved correctly to underlying
resources.</li>
<li>Ensure you can Undo changes.</li>
</ol>
</li>
</ul>
<h5>Common Ancestor</h5>
<ul>
<li>Ensure that a resource acting as a common ancestor is the one
selected in the dialog.</li>
<li>Ensure you can switch between Two- and Three-way compare when
a common ancestor is available.</li>
<li>Ensure you can show/hide the Common Ancestor Pane.</li>
</ul>
</body>
</html>
|
