commit 4fb2fbb47b42eec2f1963a659736985d7f60abc0
author David Pursehouse <dpursehouse@collab.net> Wed Mar 25 11:41:46 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 25 11:41:46 2020 +0000
tree b3b41fd3b021d0d689a9a8f92e9b88466403d038
parent d5f66dd3f5b82735c4621eff129f6d4c8c849e1f
parent c447a7b4259ee86564695f119df3e30709038e08

Merge changes I32bba5a0,I86e46cf3,I7593ff70,Id6d004e8

* changes:
  CreateBranch: Test rejection if branch name in URL and input mismatch
  CreateBranch: Test that branches cannot be created with invalid names
  CreateBranch: Test that branches cannot be created under 'refs/for/'
  CreateBranch: Test creation of a conflicting branch

javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java

diff --git a/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java b/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
index 1541850..311c264 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
@@ -45,6 +45,7 @@
 import com.google.gerrit.server.events.RefReceivedEvent;
 import com.google.gerrit.server.git.validators.RefOperationValidationListener;
 import com.google.gerrit.server.git.validators.ValidationMessage;
+import com.google.gerrit.server.util.MagicBranch;
 import com.google.gerrit.server.validators.ValidationException;
 import com.google.inject.Inject;
 import java.io.IOException;
@@ -141,6 +142,20 @@
   }
 
   @Test
+  public void conflictingBranchAlreadyExists_Conflict() throws Exception {
+    assertCreateSucceeds(testBranch);
+    BranchNameKey testBranch2 = BranchNameKey.create(project, testBranch.branch() + "/foo/bar");
+    assertCreateFails(
+        testBranch2,
+        ResourceConflictException.class,
+        "Cannot create branch \""
+            + testBranch2.branch()
+            + "\" since it conflicts with branch \""
+            + testBranch.branch()
+            + "\"");
+  }
+
+  @Test
   public void createBranchByProjectOwner() throws Exception {
     grantOwner();
     requestScopeOperations.setApiUser(user.id());
@@ -314,6 +329,22 @@
   }
 
   @Test
+  public void cannotCreateBranchInMagicBranchNamespace() throws Exception {
+    assertCreateFails(
+        BranchNameKey.create(project, MagicBranch.NEW_CHANGE + "foo"),
+        BadRequestException.class,
+        "not allowed to create branches under \"" + MagicBranch.NEW_CHANGE + "\"");
+  }
+
+  @Test
+  public void cannotCreateBranchWithInvalidName() throws Exception {
+    assertCreateFails(
+        BranchNameKey.create(project, RefNames.REFS_HEADS),
+        BadRequestException.class,
+        "invalid branch name \"" + RefNames.REFS_HEADS + "\"");
+  }
+
+  @Test
   public void createBranchLeadingSlashesAreRemoved() throws Exception {
     BranchNameKey expectedNameKey = BranchNameKey.create(project, "test");
 
@@ -334,6 +365,17 @@
         .isEqualTo(expectedNameKey.branch());
   }
 
+  @Test
+  public void branchNameInInputMustMatchBranchNameInUrl() throws Exception {
+    BranchInput branchInput = new BranchInput();
+    branchInput.ref = "foo";
+    BadRequestException ex =
+        assertThrows(
+            BadRequestException.class,
+            () -> gApi.projects().name(project.get()).branch("bar").create(branchInput));
+    assertThat(ex).hasMessageThat().isEqualTo("ref must match URL");
+  }
+
   private void blockCreateReference() throws Exception {
     projectOperations
         .project(project)