opendev/gerrit
Code Issues Proposed changes

RevisionIT: Don't import Branch.NameKey

Browse Source 
We normally don't import the NameKey classes, since there are too many
of them.

Change-Id: I19a02e9c6ee4047003b393e3fd736a3448697375
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2017-07-03 11:54:06 +02:00
parent 5bec3878b4
commit 672a20bc49
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RevisionIT.java
View File

@@ -79,7 +79,6 @@ import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
import com.google.gerrit.extensions.webui.PatchSetWebLink;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.Branch.NameKey;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.server.change.GetRevisionActions;
@@ -635,9 +634,9 @@ public class RevisionIT extends AbstractDaemonTest {
@Test
public void cherryPickNotify() throws Exception {
createBranch(new NameKey(project, "branch-1"));
createBranch(new NameKey(project, "branch-2"));
createBranch(new NameKey(project, "branch-3"));
createBranch(new Branch.NameKey(project, "branch-1"));
createBranch(new Branch.NameKey(project, "branch-2"));
createBranch(new Branch.NameKey(project, "branch-3"));
// Creates a change for 'admin'.
PushOneCommit.Result result = createChange();
@@ -676,7 +675,7 @@ public class RevisionIT extends AbstractDaemonTest {
@Test
public void cherryPickToMergedChangeRevision() throws Exception {
createBranch(new NameKey(project, "foo"));
createBranch(new Branch.NameKey(project, "foo"));
PushOneCommit.Result dstChange = createChange(testRepo, "foo", SUBJECT, "b.txt", "b", "t");
dstChange.assertOkStatus();
@@ -700,7 +699,7 @@ public class RevisionIT extends AbstractDaemonTest {
@Test
public void cherryPickToOpenChangeRevision() throws Exception {
createBranch(new NameKey(project, "foo"));
createBranch(new Branch.NameKey(project, "foo"));
PushOneCommit.Result dstChange = createChange(testRepo, "foo", SUBJECT, "b.txt", "b", "t");
dstChange.assertOkStatus();
@@ -718,7 +717,7 @@ public class RevisionIT extends AbstractDaemonTest {
@Test
public void cherryPickToNonVisibleChangeFails() throws Exception {
createBranch(new NameKey(project, "foo"));
createBranch(new Branch.NameKey(project, "foo"));
PushOneCommit.Result dstChange = createChange(testRepo, "foo", SUBJECT, "b.txt", "b", "t");
dstChange.assertOkStatus();