SONAR-5178 "sonar.branch" should not be validated against the same pattern as project key

2 files changed, 6 insertions, 6 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java
index 398f1e405b5..4aa718dcbd9 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java
@@ -91,7 +91,7 @@ public class ProjectReactorValidator {
   }
 
   private void validateBranch(List<String> validationMessages, @Nullable String branch) {
-    if (StringUtils.isNotEmpty(branch) && !ComponentKeys.isValidModuleKey(branch)) {
+    if (StringUtils.isNotEmpty(branch) && !ComponentKeys.isValidBranch(branch)) {
       validationMessages.add(String.format("\"%s\" is not a valid branch name", branch));
     }
   }
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectReactorValidatorTest.java b/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectReactorValidatorTest.java
index d403213401f..5d1b2f7f348 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectReactorValidatorTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/scan/ProjectReactorValidatorTest.java
@@ -160,7 +160,7 @@ public class ProjectReactorValidatorTest {
     ProjectReactor reactor = createProjectReactor("foo$bar");
 
     thrown.expect(SonarException.class);
-    thrown.expectMessage("foo$bar is not a valid project or module key");
+    thrown.expectMessage("\"foo$bar\" is not a valid project or module key");
     validator.validate(reactor);
   }
 
@@ -169,7 +169,7 @@ public class ProjectReactorValidatorTest {
     ProjectReactor reactor = createProjectReactor("foo\\bar");
 
     thrown.expect(SonarException.class);
-    thrown.expectMessage("foo\\bar is not a valid project or module key");
+    thrown.expectMessage("\"foo\\bar\" is not a valid project or module key");
     validator.validate(reactor);
   }
 
@@ -179,7 +179,7 @@ public class ProjectReactorValidatorTest {
     validator.validate(createProjectReactor("foo", "Branch2"));
     validator.validate(createProjectReactor("foo", "bra.nch"));
     validator.validate(createProjectReactor("foo", "bra-nch"));
-    validator.validate(createProjectReactor("foo", "bra:nch"));
+    validator.validate(createProjectReactor("foo", "1"));
     validator.validate(createProjectReactor("foo", "bra_nch"));
   }
 
@@ -187,7 +187,7 @@ public class ProjectReactorValidatorTest {
   public void fail_with_invalid_branch() {
     ProjectReactor reactor = createProjectReactor("foo", "bran#ch");
     thrown.expect(SonarException.class);
-    thrown.expectMessage("bran#ch is not a valid branch name");
+    thrown.expectMessage("\"bran#ch\" is not a valid branch name");
     validator.validate(reactor);
   }
 
@@ -196,7 +196,7 @@ public class ProjectReactorValidatorTest {
     ProjectReactor reactor = createProjectReactor("12345");
 
     thrown.expect(SonarException.class);
-    thrown.expectMessage("12345 is not a valid project or module key");
+    thrown.expectMessage("\"12345\" is not a valid project or module key");
     validator.validate(reactor);
   }