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
|
/*******************************************************************************
* Copyright (c) 2012, 2013 Tasktop Technologies and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Tasktop Technologies - initial API and implementation
*******************************************************************************/
package org.eclipse.mylyn.internal.gerrit.core.remote;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
import java.util.Collections;
import java.util.List;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jgit.api.CommitCommand;
import org.eclipse.mylyn.internal.gerrit.core.client.GerritChange;
import org.eclipse.mylyn.internal.gerrit.core.client.PatchSetContent;
import org.eclipse.mylyn.reviews.core.model.IComment;
import org.eclipse.mylyn.reviews.core.model.IFileItem;
import org.eclipse.mylyn.reviews.core.model.IFileVersion;
import org.eclipse.mylyn.reviews.core.model.IReview;
import org.eclipse.mylyn.reviews.core.model.IReviewItem;
import org.eclipse.mylyn.reviews.core.model.IReviewItemSet;
import org.eclipse.mylyn.reviews.core.spi.remote.emf.RemoteEmfConsumer;
import org.junit.Test;
import com.google.gerrit.common.data.PatchSetDetail;
import com.google.gerrit.reviewdb.ApprovalCategoryValue;
import com.google.gerrit.reviewdb.Change;
import com.google.gerrit.reviewdb.Patch;
import com.google.gerrit.reviewdb.PatchSet;
/**
* @author Miles Parker
*/
public class PatchSetRemoteFactoryTest extends GerritRemoteTest {
@Test
public void testPatchSetFiles() throws Exception {
CommitCommand command2 = reviewHarness.git.commit()
.setAmend(true)
.setAll(true)
.setMessage("Test Change " + reviewHarness.testIdent + " [2]\n\nChange-Id: " + reviewHarness.changeId);
reviewHarness.gerritHarness.project().addFile("testFile2.txt");
reviewHarness.gerritHarness.project().addFile("testFile3.txt");
reviewHarness.gerritHarness.project().commitAndPush(command2);
CommitCommand command3 = reviewHarness.git.commit()
.setAmend(true)
.setAll(true)
.setMessage("Test Change " + reviewHarness.testIdent + " [2]\n\nChange-Id: " + reviewHarness.changeId);
reviewHarness.gerritHarness.project().addFile("testFile2.txt", "testmod");
reviewHarness.gerritHarness.project().addFile("testFile4.txt");
reviewHarness.gerritHarness.project().addFile("testFile5.txt");
reviewHarness.gerritHarness.project().commitAndPush(command3);
reviewHarness.consumer.retrieve(false);
reviewHarness.listener.waitForResponse(2, 2);
assertThat(getReview().getSets().size(), is(3));
IReviewItemSet testPatchSet = getReview().getSets().get(2);
RemoteEmfConsumer<IReview, IReviewItemSet, String, PatchSetDetail, PatchSetDetail, String> itemSetConsumer = reviewHarness.provider.getReviewItemSetFactory()
.getConsumerForLocalKey(getReview(), "3");
TestRemoteObserver<IReview, IReviewItemSet, String, String> itemSetObserver = new TestRemoteObserver<IReview, IReviewItemSet, String, String>(
reviewHarness.provider.getReviewItemSetFactory());
itemSetConsumer.addObserver(itemSetObserver);
itemSetConsumer.retrieve(false);
itemSetObserver.waitForResponse(1, 0);
PatchSetDetail detail = itemSetConsumer.getRemoteObject();
assertThat(detail.getInfo().getKey().get(), is(3));
PatchSetContentIdRemoteFactory patchFactory = reviewHarness.provider.getReviewItemSetContentFactory();
List<IFileItem> fileItems = testPatchSet.getItems();
assertThat(fileItems.size(), is(0));
TestRemoteObserver<IReviewItemSet, List<IFileItem>, String, Long> patchSetListener = new TestRemoteObserver<IReviewItemSet, List<IFileItem>, String, Long>(
patchFactory);
RemoteEmfConsumer<IReviewItemSet, List<IFileItem>, String, PatchSetContent, String, Long> patchSetConsumer = patchFactory.getConsumerForRemoteKey(
testPatchSet, "3");
patchSetConsumer.addObserver(patchSetListener);
patchSetConsumer.retrieve(false);
patchSetListener.waitForResponse(1, 1);
assertThat(fileItems.size(), is(6));
for (IReviewItem fileItem : fileItems) {
assertThat(fileItem, instanceOf(IFileItem.class));
assertThat(fileItem.getAddedBy().getDisplayName(), is("tests"));
assertThat(fileItem.getCommittedBy().getDisplayName(), is("tests"));
}
IFileItem fileItem0 = fileItems.get(0);
assertThat(fileItem0.getName(), is("/COMMIT_MSG"));
IFileItem fileItem1 = fileItems.get(1);
assertThat(fileItem1.getName(), is("testFile1.txt"));
IFileItem fileItem2 = fileItems.get(2);
assertThat(fileItem2.getName(), is("testFile2.txt"));
IFileVersion base2 = fileItem2.getBase();
assertThat(base2.getAddedBy(), nullValue());
assertThat(base2.getCommittedBy(), nullValue());
assertThat(base2.getContent(), is(""));
assertThat(base2.getId(), is("base-" + reviewHarness.shortId + ",3,testFile2.txt"));
assertThat(base2.getName(), is("testFile2.txt"));
assertThat(base2.getPath(), nullValue());
assertThat(base2.getReference(), nullValue());
assertThat(base2.getDescription(), is("Base"));
IFileVersion target2 = fileItem2.getTarget();
assertThat(target2.getAddedBy().getDisplayName(), is("tests"));
assertThat(target2.getCommittedBy().getDisplayName(), is("tests"));
assertThat(target2.getContent(), is("testmod"));
assertThat(target2.getId(), is(reviewHarness.shortId + ",3,testFile2.txt"));
assertThat(target2.getName(), is("testFile2.txt"));
assertThat(target2.getPath(), is("testFile2.txt"));
assertThat(target2.getReference(), nullValue());
assertThat(target2.getDescription(), is("Patch Set 3"));
}
@Test
public void testPatchSetComments() throws Exception {
CommitCommand command2 = reviewHarness.git.commit()
.setAmend(true)
.setAll(true)
.setMessage("Test Change " + reviewHarness.testIdent + " [2]\n\nChange-Id: " + reviewHarness.changeId);
reviewHarness.gerritHarness.project().addFile("testComments.txt",
"line1\nline2\nline3\nline4\nline5\nline6\nline7\n");
reviewHarness.gerritHarness.project().commitAndPush(command2);
reviewHarness.consumer.retrieve(false);
reviewHarness.listener.waitForResponse(2, 2);
RemoteEmfConsumer<IReview, IReviewItemSet, String, PatchSetDetail, PatchSetDetail, String> itemSetConsumer = reviewHarness.provider.getReviewItemSetFactory()
.getConsumerForLocalKey(getReview(), "2");
TestRemoteObserver<IReview, IReviewItemSet, String, String> itemSetObserver = new TestRemoteObserver<IReview, IReviewItemSet, String, String>(
reviewHarness.provider.getReviewItemSetFactory());
itemSetConsumer.addObserver(itemSetObserver);
itemSetConsumer.retrieve(false);
itemSetObserver.waitForResponse(1, 0);
PatchSetDetail detail = itemSetConsumer.getRemoteObject();
assertThat(detail.getInfo().getKey().get(), is(2));
IReviewItemSet testPatchSet = getReview().getSets().get(1);
PatchSetContentIdRemoteFactory patchFactory = reviewHarness.provider.getReviewItemSetContentFactory();
TestRemoteObserver<IReviewItemSet, List<IFileItem>, String, Long> patchSetListener = new TestRemoteObserver<IReviewItemSet, List<IFileItem>, String, Long>(
patchFactory);
RemoteEmfConsumer<IReviewItemSet, List<IFileItem>, String, PatchSetContent, String, Long> patchSetConsumer = patchFactory.getConsumerForRemoteKey(
testPatchSet, "2");
patchSetConsumer.addObserver(patchSetListener);
patchSetConsumer.retrieve(false);
patchSetListener.waitForResponse(1, 1);
IFileItem commentFile = testPatchSet.getItems().get(1);
assertThat(commentFile.getName(), is("testComments.txt"));
assertThat(commentFile.getAllComments().size(), is(0));
String id = commentFile.getReference();
reviewHarness.client.saveDraft(Patch.Key.parse(id), "Line 2 Comment", 2, (short) 1, null,
new NullProgressMonitor());
patchSetConsumer.retrieve(false);
patchSetListener.waitForResponse(2, 2);
commentFile = testPatchSet.getItems().get(1);
List<IComment> allComments = commentFile.getAllComments();
assertThat(allComments.size(), is(1));
IComment fileComment = allComments.get(0);
assertThat(fileComment, notNullValue());
assertThat(fileComment.isDraft(), is(true));
assertThat(fileComment.getAuthor().getDisplayName(), is("tests"));
assertThat(fileComment.getDescription(), is("Line 2 Comment"));
reviewHarness.client.publishComments(reviewHarness.shortId, 2, "Submit Comments",
Collections.<ApprovalCategoryValue.Id> emptySet(), new NullProgressMonitor());
patchSetConsumer.retrieve(false);
patchSetListener.waitForResponse(3, 3);
allComments = commentFile.getAllComments();
assertThat(allComments.size(), is(1));
fileComment = allComments.get(0);
assertThat(fileComment, notNullValue());
assertThat(fileComment.isDraft(), is(false));
assertThat(fileComment.getAuthor().getDisplayName(), is("tests"));
assertThat(fileComment.getDescription(), is("Line 2 Comment"));
}
@Test
public void testLoadPatchSet() throws Exception {
// given
GerritChange change = reviewHarness.client.getChange(reviewHarness.shortId, new NullProgressMonitor());
List<PatchSetDetail> details = change.getPatchSetDetails();
assertThat(details, notNullValue());
assertThat(details.size(), is(1));
PatchSetDetail detail = details.get(0);
PatchSetContent content = new PatchSetContent((PatchSet) null, detail);
assertThat(content, notNullValue());
final Change.Id changeId = new Change.Id(reviewHarness.client.id(reviewHarness.shortId));
final PatchSet.Id patchSetId = new PatchSet.Id(changeId, 1);
final Patch.Key commitMsgPatchKey = new Patch.Key(patchSetId, "/COMMIT_MSG");
final Patch.Key testFilePatchKey = new Patch.Key(patchSetId, "testFile1.txt");
assertThat(content.getTargetDetail(), notNullValue());
assertThat(content.getPatchScript(commitMsgPatchKey), nullValue());
assertThat(content.getPatchScript(testFilePatchKey), nullValue());
// when
reviewHarness.client.loadPatchSetContent(content, new NullProgressMonitor());
// then
assertThat(content.getPatchScript(commitMsgPatchKey), notNullValue());
assertThat(content.getPatchScript(testFilePatchKey), notNullValue());
}
}
|
