diff options
| author | Sven Selberg <svense@axis.com> | 2020-02-03 11:33:30 +0100 |
|---|---|---|
| committer | Sven Selberg <svense@axis.com> | 2020-02-03 11:49:13 +0100 |
| commit | 15753c282e9fcb44fa049788136505071a339ad5 (patch) | |
| tree | 4f23979fc0ed248d19c6322ef6f255b01ecf8a04 | |
| parent | 97331cc1688da62609e58a7c0518617a40aede70 (diff) | |
Tests: Use helper method for config change
Use enableCreateNewChangeForAllNotInTarget() from AbstractDaemonTest
instead of duplicating the code.
Change-Id: Ic2fe137533a7b6ad33fc1705947473766730bf56
| -rw-r--r-- | javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java | 18 | ||||
| -rw-r--r-- | javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java | 10 |
2 files changed, 3 insertions, 25 deletions
diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java index 398ed84069..2acc3cd084 100644 --- a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java +++ b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java @@ -1440,14 +1440,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { @Test public void pushSameCommitTwice() throws Exception { - try (ProjectConfigUpdate u = updateProject(project)) { - u.getConfig() - .getProject() - .setBooleanConfig( - BooleanProjectConfig.CREATE_NEW_CHANGE_FOR_ALL_NOT_IN_TARGET, - InheritableBoolean.TRUE); - u.save(); - } + enableCreateNewChangeForAllNotInTarget(); PushOneCommit push = pushFactory.create( @@ -1469,14 +1462,7 @@ public abstract class AbstractPushForReview extends AbstractDaemonTest { @Test public void pushSameCommitTwiceWhenIndexFailed() throws Exception { - try (ProjectConfigUpdate u = updateProject(project)) { - u.getConfig() - .getProject() - .setBooleanConfig( - BooleanProjectConfig.CREATE_NEW_CHANGE_FOR_ALL_NOT_IN_TARGET, - InheritableBoolean.TRUE); - u.save(); - } + enableCreateNewChangeForAllNotInTarget(); PushOneCommit push = pushFactory.create( diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java index 08a76e4773..6622baeccf 100644 --- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java +++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java @@ -59,7 +59,6 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.webui.UiAction; import com.google.gerrit.reviewdb.client.Account; -import com.google.gerrit.reviewdb.client.BooleanProjectConfig; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSet; @@ -574,14 +573,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest { // | // C0 -- Master // - try (ProjectConfigUpdate u = updateProject(project)) { - u.getConfig() - .getProject() - .setBooleanConfig( - BooleanProjectConfig.CREATE_NEW_CHANGE_FOR_ALL_NOT_IN_TARGET, - InheritableBoolean.TRUE); - u.save(); - } + enableCreateNewChangeForAllNotInTarget(); PushOneCommit push1 = pushFactory.create( |