opendev/gerrit
Code Issues Proposed changes

Extract the Prolog evaluator out of SubmitRuleEvaluator

Browse Source 
The new PrologRule class follows the to-be-implemented SubmitRule
interface.
SubmitRuleEvaluator does not depend directly on Prolog anymore, instead,
calls are redirected to the proxy class PrologRule

This gets us one step closer to a working SubmitRule implementation!

Change-Id: I3742dd68dd1ed8f7b8d76791dceb8c7c4cf631f7
This commit is contained in:
Maxime Guerreiro
2018-03-02 18:17:44 +01:00
parent 806e9db26f
commit 5c0ec401b2
8 changed files with 607 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
javatests/com/google/gerrit/acceptance/server/project/BUILD
View File

@@ -4,7 +4,4 @@ acceptance_tests(
srcs = glob(["*IT.java"]),
group = "server_project",
labels = ["server"],
deps = [
"@prolog_runtime//jar",
],
)

10
javatests/com/google/gerrit/acceptance/server/rules/BUILD Normal file
View File

@@ -0,0 +1,10 @@
load("//javatests/com/google/gerrit/acceptance:tests.bzl", "acceptance_tests")
acceptance_tests(
srcs = glob(["*IT.java"]),
group = "server_rules",
labels = ["server"],
deps = [
"@prolog_runtime//jar",
],
)

22
javatests/com/google/gerrit/acceptance/server/project/SubmitRulesEvaluatorIT.java → javatests/com/google/gerrit/acceptance/server/rules/PrologRuleEvaluatorIT.java
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.acceptance.server.project;
package com.google.gerrit.acceptance.server.rules;
import static com.google.common.truth.Truth.assertThat;
@@ -21,9 +21,9 @@ import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.common.data.SubmitRecord;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.server.project.SubmitRuleEvaluator;
import com.google.gerrit.server.project.SubmitRuleOptions;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.rules.PrologRuleEvaluator;
import com.google.gerrit.testing.TestChanges;
import com.google.inject.Inject;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
@@ -34,19 +34,18 @@ import java.util.Collection;
import java.util.List;
import org.junit.Test;
public class SubmitRulesEvaluatorIT extends AbstractDaemonTest {
@Inject private SubmitRuleEvaluator.Factory evaluatorFactory;
public class PrologRuleEvaluatorIT extends AbstractDaemonTest {
@Inject private PrologRuleEvaluator.Factory evaluatorFactory;
@Test
public void convertsPrologToSubmitRecord() {
SubmitRuleEvaluator evaluator = makeEvaluator();
ChangeData cd = makeChangeData();
PrologRuleEvaluator evaluator = makeEvaluator();
StructureTerm verifiedLabel = makeLabel("Verified", "may");
StructureTerm labels = new StructureTerm("label", verifiedLabel);
List<Term> terms = ImmutableList.of(makeTerm("ok", labels));
Collection<SubmitRecord> records = evaluator.resultsToSubmitRecord(null, terms, cd);
Collection<SubmitRecord> records = evaluator.resultsToSubmitRecord(null, terms);
assertThat(records).hasSize(1);
}
@@ -83,8 +82,7 @@ public class SubmitRulesEvaluatorIT extends AbstractDaemonTest {
*/
@Test
public void abortsEarlyWithOkayRecord() {
SubmitRuleEvaluator evaluator = makeEvaluator();
ChangeData cd = makeChangeData();
PrologRuleEvaluator evaluator = makeEvaluator();
SubmitRecord.Label submitRecordLabel1 = new SubmitRecord.Label();
submitRecordLabel1.label = "Verified";
@@ -114,7 +112,7 @@ public class SubmitRulesEvaluatorIT extends AbstractDaemonTest {
terms.add(makeTerm("not_ready", makeLabels(label3)));
// When
List<SubmitRecord> records = evaluator.resultsToSubmitRecord(null, terms, cd);
List<SubmitRecord> records = evaluator.resultsToSubmitRecord(null, terms);
// assert that
SubmitRecord record1Expected = new SubmitRecord();
@@ -156,7 +154,7 @@ public class SubmitRulesEvaluatorIT extends AbstractDaemonTest {
return cd;
}
private SubmitRuleEvaluator makeEvaluator() {
return evaluatorFactory.create(SubmitRuleOptions.defaults());
private PrologRuleEvaluator makeEvaluator() {
return evaluatorFactory.create(makeChangeData(), SubmitRuleOptions.defaults());
}
}