opendev/gerrit
Code Issues Proposed changes

Merge "Replace double dashes with a simple dash in Prolog generated label names"

Browse Source
This commit is contained in:
Maxime Guerreiro
2018-07-02 08:19:04 +00:00
committed by Gerrit Code Review
parent 144f57f543 725803aa73
commit 6bcfedefe1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/com/google/gerrit/server/rules/PrologRuleEvaluator.java
View File

@@ -297,7 +297,8 @@ public class PrologRuleEvaluator {
try { try {
return LabelType.checkName(name); return LabelType.checkName(name);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
return LabelType.checkName("Invalid-Prolog-Rules-Label-Name--" + sanitizeLabelName(name)); String newName = "Invalid-Prolog-Rules-Label-Name-" + sanitizeLabelName(name);
return LabelType.checkName(newName.replace("--", "-"));
} }
} }

6
javatests/com/google/gerrit/server/rules/PrologRuleEvaluatorTest.java
View File

@@ -30,18 +30,18 @@ public class PrologRuleEvaluatorTest {
@Test @Test
public void labelWithSpacesIsTransformed() { public void labelWithSpacesIsTransformed() {
assertThat(PrologRuleEvaluator.checkLabelName("Label with spaces")) assertThat(PrologRuleEvaluator.checkLabelName("Label with spaces"))
.isEqualTo("Invalid-Prolog-Rules-Label-Name--Labelwithspaces"); .isEqualTo("Invalid-Prolog-Rules-Label-Name-Labelwithspaces");
} }
@Test @Test
public void labelStartingWithADashIsTransformed() { public void labelStartingWithADashIsTransformed() {
assertThat(PrologRuleEvaluator.checkLabelName("-dashed-label")) assertThat(PrologRuleEvaluator.checkLabelName("-dashed-label"))
.isEqualTo("Invalid-Prolog-Rules-Label-Name---dashed-label"); .isEqualTo("Invalid-Prolog-Rules-Label-Name-dashed-label");
} }
@Test @Test
public void labelWithInvalidCharactersIsTransformed() { public void labelWithInvalidCharactersIsTransformed() {
assertThat(PrologRuleEvaluator.checkLabelName("*urgent*")) assertThat(PrologRuleEvaluator.checkLabelName("*urgent*"))
.isEqualTo("Invalid-Prolog-Rules-Label-Name--urgent"); .isEqualTo("Invalid-Prolog-Rules-Label-Name-urgent");
} }
} }