Adapt to changed SubmitRule interface in Gerrit core (part 2)
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I91cd3df287b876c760e7453bb026b3eeab23f8d6
diff --git a/src/test/java/com/googlesource/gerrit/plugins/simplesubmitrules/rules/NoUnresolvedCommentsRuleIT.java b/src/test/java/com/googlesource/gerrit/plugins/simplesubmitrules/rules/NoUnresolvedCommentsRuleIT.java
index ea58eb4..265b03a 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/simplesubmitrules/rules/NoUnresolvedCommentsRuleIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/simplesubmitrules/rules/NoUnresolvedCommentsRuleIT.java
@@ -25,7 +25,6 @@
import com.google.gerrit.common.data.SubmitRecord;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.client.Side;
-import com.google.gerrit.server.project.SubmitRuleOptions;
import com.google.gerrit.server.query.change.ChangeData;
import com.googlesource.gerrit.plugins.simplesubmitrules.SimpleSubmitRulesConfig;
import java.util.Collection;
@@ -50,7 +49,7 @@
comment.unresolved = true;
PushOneCommit.Result r = createChangeWithComment(comment);
- Collection<SubmitRecord> submitRecords = evaluate(r.getChange(), SubmitRuleOptions.defaults());
+ Collection<SubmitRecord> submitRecords = evaluate(r.getChange());
assertThat(submitRecords).hasSize(1);
SubmitRecord result = submitRecords.iterator().next();
@@ -65,7 +64,7 @@
comment.unresolved = false;
PushOneCommit.Result r = createChangeWithComment(comment);
- Collection<SubmitRecord> submitRecords = evaluate(r.getChange(), SubmitRuleOptions.defaults());
+ Collection<SubmitRecord> submitRecords = evaluate(r.getChange());
assertThat(submitRecords).hasSize(1);
SubmitRecord result = submitRecords.iterator().next();
@@ -78,8 +77,7 @@
public void doesNotBlockWithOnlyResolvedComments() throws Exception {
PushOneCommit.Result change = createChange("refs/for/master");
- Collection<SubmitRecord> submitRecords =
- evaluate(change.getChange(), SubmitRuleOptions.defaults());
+ Collection<SubmitRecord> submitRecords = evaluate(change.getChange());
assertThat(submitRecords).hasSize(1);
SubmitRecord result = submitRecords.iterator().next();
@@ -97,7 +95,7 @@
enableRule(false);
- Collection<SubmitRecord> submitRecords = evaluate(r.getChange(), SubmitRuleOptions.defaults());
+ Collection<SubmitRecord> submitRecords = evaluate(r.getChange());
assertThat(submitRecords).isEmpty();
}
@@ -120,11 +118,11 @@
}
}
- private Collection<SubmitRecord> evaluate(ChangeData cd, SubmitRuleOptions options) {
+ private Collection<SubmitRecord> evaluate(ChangeData cd) {
NoUnresolvedCommentsRule rule =
plugin.getSysInjector().getInstance(NoUnresolvedCommentsRule.class);
- return rule.evaluate(cd, options);
+ return rule.evaluate(cd);
}
private static ReviewInput.CommentInput newFileComment() {