opendev/gerrit
Code Issues Proposed changes

[project.config] Override ValidationError equals()

Browse Source 
Change-Id: Iebea816ff95c57dbe778df88f2ccae0e0e34fc90
This commit is contained in:
Hector Oswaldo Caballero
2018-01-16 22:14:00 -05:00
parent c76d942420
commit 0ff89430af
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/com/google/gerrit/server/git/ValidationError.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.server.git;
import java.util.Objects;
import org.slf4j.Logger;
/** Indicates a problem with Git based data. */
@@ -48,4 +49,21 @@ public class ValidationError {
public static Sink createLoggerSink(String message, Logger log) {
return error -> log.error(message + error.getMessage());
}
@Override
public boolean equals(Object o) {
if (o == this) {
return true;
}
if (o instanceof ValidationError) {
ValidationError that = (ValidationError) o;
return Objects.equals(this.message, that.message);
}
return false;
}
@Override
public int hashCode() {
return Objects.hashCode(message);
}
}

16
javatests/com/google/gerrit/server/git/ProjectConfigTest.java
View File

@@ -16,7 +16,6 @@ package com.google.gerrit.server.git;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static com.google.common.truth.Truth8.assertThat;
import com.google.common.collect.Iterables;
import com.google.gerrit.common.data.AccessSection;
@@ -516,12 +515,13 @@ public class ProjectConfigTest extends GerritBaseTests {
.create();
ProjectConfig cfg = read(rev);
assertThat(cfg.getCommentLinkSections()).isEmpty();
assertThat(cfg.getValidationErrors().stream().map(ValidationError::getMessage))
assertThat(cfg.getValidationErrors())
.containsExactly(
new ValidationError(
"project.config: Invalid pattern \"(bugs{+#?)(d+)\" in commentlink.bugzilla.match: "
+ "Illegal repetition near index 4\n"
+ "(bugs{+#?)(d+)\n"
+ " ^");
+ " ^"));
}
@Test
@@ -536,10 +536,11 @@ public class ProjectConfigTest extends GerritBaseTests {
.create();
ProjectConfig cfg = read(rev);
assertThat(cfg.getCommentLinkSections()).isEmpty();
assertThat(cfg.getValidationErrors().stream().map(ValidationError::getMessage))
assertThat(cfg.getValidationErrors())
.containsExactly(
new ValidationError(
"project.config: Error in pattern \"(bugs#?)(d+)\" in commentlink.bugzilla.match: "
+ "Raw html replacement not allowed");
+ "Raw html replacement not allowed"));
}
@Test
@@ -550,10 +551,11 @@ public class ProjectConfigTest extends GerritBaseTests {
.create();
ProjectConfig cfg = read(rev);
assertThat(cfg.getCommentLinkSections()).isEmpty();
assertThat(cfg.getValidationErrors().stream().map(ValidationError::getMessage))
assertThat(cfg.getValidationErrors())
.containsExactly(
new ValidationError(
"project.config: Error in pattern \"(bugs#?)(d+)\" in commentlink.bugzilla.match: "
+ "commentlink.bugzilla must have either link or html");
+ "commentlink.bugzilla must have either link or html"));
}
private ProjectConfig read(RevCommit rev) throws IOException, ConfigInvalidException {