opendev/gerrit
Code Issues Proposed changes

Merge "Merge branch 'stable-2.13'"

Browse Source
This commit is contained in:
ekempin 2017-02-07 13:31:20 +00:00 committed by Gerrit Code Review
commit a00f42a52f
1 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/AbstractPushForReview.java
View File

@ -760,9 +760,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
@Test
public void createNewChangeForAllNotInTarget() throws Exception {
ProjectConfig config = projectCache.checkedGet(project).getConfig();
config.getProject().setCreateNewChangeForAllNotInTarget(InheritableBoolean.TRUE);
saveProjectConfig(project, config);
enableCreateNewChangeForAllNotInTarget();
PushOneCommit push =
pushFactory.create(
@ -900,6 +898,16 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
@Test
public void pushWithoutChangeId() throws Exception {
testPushWithoutChangeId();
}
@Test
public void pushWithoutChangeIdWithCreateNewChangeForAllNotInTarget() throws Exception {
enableCreateNewChangeForAllNotInTarget();
testPushWithoutChangeId();
}
private void testPushWithoutChangeId() throws Exception {
RevCommit c = createCommit(testRepo, "Message without Change-Id");
assertThat(GitUtil.getChangeId(testRepo, c).isPresent()).isFalse();
pushForReviewRejected(testRepo, "missing Change-Id in commit message footer");
@ -912,6 +920,16 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
@Test
public void pushWithMultipleChangeIds() throws Exception {
testPushWithMultipleChangeIds();
}
@Test
public void pushWithMultipleChangeIdsWithCreateNewChangeForAllNotInTarget() throws Exception {
enableCreateNewChangeForAllNotInTarget();
testPushWithMultipleChangeIds();
}
private void testPushWithMultipleChangeIds() throws Exception {
createCommit(
testRepo,
"Message with multiple Change-Id\n"
@ -928,6 +946,16 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
@Test
public void pushWithInvalidChangeId() throws Exception {
testpushWithInvalidChangeId();
}
@Test
public void pushWithInvalidChangeIdWithCreateNewChangeForAllNotInTarget() throws Exception {
enableCreateNewChangeForAllNotInTarget();
testpushWithInvalidChangeId();
}
private void testpushWithInvalidChangeId() throws Exception {
createCommit(testRepo, "Message with invalid Change-Id\n" + "\n" + "Change-Id: X\n");
pushForReviewRejected(testRepo, "invalid Change-Id line format in commit message footer");
@ -939,6 +967,17 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
@Test
public void pushWithInvalidChangeIdFromEgit() throws Exception {
testPushWithInvalidChangeIdFromEgit();
}
@Test
public void pushWithInvalidChangeIdFromEgitWithCreateNewChangeForAllNotInTarget()
throws Exception {
enableCreateNewChangeForAllNotInTarget();
testPushWithInvalidChangeIdFromEgit();
}
private void testPushWithInvalidChangeIdFromEgit() throws Exception {
createCommit(
testRepo,
"Message with invalid Change-Id\n"
@ -1344,4 +1383,10 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest {
assertThat(refUpdate.getMessage()).contains(expectedMessage);
}
}
private void enableCreateNewChangeForAllNotInTarget() throws Exception {
ProjectConfig config = projectCache.checkedGet(project).getConfig();
config.getProject().setCreateNewChangeForAllNotInTarget(InheritableBoolean.TRUE);
saveProjectConfig(project, config);
}
}