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
|
// Copyright (C) 2017 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.acceptance.rest.revision;
import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.acceptance.PushOneCommit.FILE_CONTENT;
import static com.google.gerrit.acceptance.PushOneCommit.FILE_NAME;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.common.ChangeInfo;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.util.Base64;
import org.junit.Test;
public class RevisionIT extends AbstractDaemonTest {
@Test
public void contentOfParent() throws Exception {
String parentContent = "parent content";
PushOneCommit.Result parent = createChange("Parent change", FILE_NAME, parentContent);
parent.assertOkStatus();
gApi.changes().id(parent.getChangeId()).current().review(ReviewInput.approve());
gApi.changes().id(parent.getChangeId()).current().submit();
PushOneCommit.Result child = createChange("Child change", FILE_NAME, FILE_CONTENT);
child.assertOkStatus();
assertContent(child, FILE_NAME, FILE_CONTENT);
RestResponse response =
adminRestSession.get(
"/changes/"
+ child.getChangeId()
+ "/revisions/current/files/"
+ FILE_NAME
+ "/content?parent=1");
response.assertOK();
assertThat(new String(Base64.decode(response.getEntityContent()), UTF_8))
.isEqualTo(parentContent);
}
@Test
public void contentOfInvalidParent() throws Exception {
String parentContent = "parent content";
PushOneCommit.Result parent = createChange("Parent change", FILE_NAME, parentContent);
parent.assertOkStatus();
gApi.changes().id(parent.getChangeId()).current().review(ReviewInput.approve());
gApi.changes().id(parent.getChangeId()).current().submit();
PushOneCommit.Result child = createChange("Child change", FILE_NAME, FILE_CONTENT);
child.assertOkStatus();
assertContent(child, FILE_NAME, FILE_CONTENT);
RestResponse response =
adminRestSession.get(
"/changes/"
+ child.getChangeId()
+ "/revisions/current/files/"
+ FILE_NAME
+ "/content?parent=10");
response.assertBadRequest();
assertThat(response.getEntityContent()).isEqualTo("invalid parent");
}
@Test
public void getReview() throws Exception {
PushOneCommit.Result r = createChange();
ObjectId ps1Commit = r.getCommit();
r = amendChange(r.getChangeId());
ObjectId ps2Commit = r.getCommit();
ChangeInfo info1 = checkRevisionReview(r, 1, ps1Commit);
assertThat(info1.currentRevision).isNull();
ChangeInfo info2 = checkRevisionReview(r, 2, ps2Commit);
assertThat(info2.currentRevision).isEqualTo(ps2Commit.name());
}
private ChangeInfo checkRevisionReview(
PushOneCommit.Result r, int psNum, ObjectId expectedRevision) throws Exception {
gApi.changes().id(r.getChangeId()).current().review(ReviewInput.approve());
RestResponse response =
adminRestSession.get("/changes/" + r.getChangeId() + "/revisions/" + psNum + "/review");
response.assertOK();
ChangeInfo info = newGson().fromJson(response.getReader(), ChangeInfo.class);
// Check for DETAILED_ACCOUNTS, DETAILED_LABELS, and specified revision.
assertThat(info.owner.name).isNotNull();
assertThat(info.labels.get("Code-Review").all).hasSize(1);
assertThat(info.revisions.keySet()).containsExactly(expectedRevision.name());
return info;
}
}
|
