From fe3f82821595384e9584e38caff251b1e7e94482 Mon Sep 17 00:00:00 2001 From: Toshiya Kobayashi Date: Tue, 4 Jun 2024 15:48:23 +0900 Subject: [PATCH] [incubator-kie-drools-5980-DSL] [new-parser] Enable DSL tests --- .../drl/parser/antlr4/MiscDRLParserTest.java | 126 +++++++++--------- 1 file changed, 60 insertions(+), 66 deletions(-) diff --git a/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java b/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java index 875315157d1..9af45a36024 100644 --- a/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java +++ b/drools-drl/drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java @@ -20,6 +20,7 @@ import java.io.BufferedReader; import java.io.IOException; +import java.io.InputStreamReader; import java.io.UncheckedIOException; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; @@ -131,6 +132,17 @@ private PackageDescr parseAndGetPackageDescrWithoutErrorCheck(String drl) { } } + private PackageDescr parseAndGetPackageDescrWithDsl(String dslrFileName, String dslFileName) { + try (InputStreamReader dslr = new InputStreamReader(getClass().getResourceAsStream(dslrFileName)); + InputStreamReader dsl = new InputStreamReader(getClass().getResourceAsStream(dslFileName))) { + PackageDescr pkg = parser.parse(dslr, dsl); + assertThat(parser.hasErrors()).as(parser.getErrors().toString()).isFalse(); + return pkg; + } catch (DroolsParserException | IOException e) { + throw new RuntimeException(e); + } + } + private RuleDescr parseAndGetFirstRuleDescr(String drl) { PackageDescr pkg = parseAndGetPackageDescr(drl); assertThat(pkg.getRules()).isNotEmpty(); @@ -1161,73 +1173,55 @@ public void parse_MultipleRules() throws Exception { assertThat(first.getObjectType()).isEqualTo("Cheese"); } - @Disabled("Priority : low | Not yet support DSL") - @Test - public void parse_ExpanderLineSpread() throws Exception { -// final DrlParser parser = new DrlParser(LanguageLevelOption.DRL6); -// final PackageDescr pkg = parser.parse( this.getReader( "expander_spread_lines.dslr" ), -// this.getReader( "complex.dsl" ) ); -// -// assertThat(parser.hasErrors()).as(parser.getErrors().toString()).isFalse(); -// -// final RuleDescr rule = (RuleDescr) pkg.getRules().get( 0 ); -// assertThat(rule.getLhs().getDescrs().size()).isEqualTo(1); -// -// final OrDescr or = (OrDescr) rule.getLhs().getDescrs().get( 0 ); -// assertThat(or.getDescrs().size()).isEqualTo(2); -// assertThat( (String) rule.getConsequence() ).isNotNull(); - - } - - @Disabled("Priority : low | Not yet support DSL") - @Test - public void parse_ExpanderMultipleConstraints() throws Exception { -// final DrlParser parser = new DrlParser(LanguageLevelOption.DRL6); -// final PackageDescr pkg = parser.parse( this.getReader( "expander_multiple_constraints.dslr" ), -// this.getReader( "multiple_constraints.dsl" ) ); -// -// assertThat(parser.hasErrors()).as(parser.getErrors().toString()).isFalse(); -// -// final RuleDescr rule = (RuleDescr) pkg.getRules().get( 0 ); -// assertThat(rule.getLhs().getDescrs().size()).isEqualTo(2); -// -// PatternDescr pattern = (PatternDescr) rule.getLhs().getDescrs().get( 0 ); -// assertThat(pattern.getObjectType()).isEqualTo("Person"); -// -// assertThat(pattern.getConstraint().getDescrs().size()).isEqualTo(2); -// assertThat(((ExprConstraintDescr) pattern.getConstraint().getDescrs().get(0)).getExpression()).isEqualTo("age < 42"); -// assertThat(((ExprConstraintDescr) pattern.getConstraint().getDescrs().get(1)).getExpression()).isEqualTo("location==atlanta"); -// -// pattern = (PatternDescr) rule.getLhs().getDescrs().get( 1 ); -// assertThat(pattern.getObjectType()).isEqualTo("Bar"); -// -// assertThat( (String) rule.getConsequence() ).isNotNull(); - - } - - @Disabled("Priority : low | Not yet support DSL") - @Test - public void parse_ExpanderMultipleConstraintsFlush() throws Exception { -// final DrlParser parser = new DrlParser(LanguageLevelOption.DRL6); -// // this is similar to the other test, but it requires a flush to add the -// // constraints -// final PackageDescr pkg = parser.parse( this.getReader( "expander_multiple_constraints_flush.dslr" ), -// this.getReader( "multiple_constraints.dsl" ) ); -// -// assertThat(parser.hasErrors()).as(parser.getErrors().toString()).isFalse(); -// -// final RuleDescr rule = (RuleDescr) pkg.getRules().get( 0 ); -// assertThat(rule.getLhs().getDescrs().size()).isEqualTo(1); -// -// final PatternDescr pattern = (PatternDescr) rule.getLhs().getDescrs().get( 0 ); -// assertThat(pattern.getObjectType()).isEqualTo("Person"); -// -// assertThat(pattern.getConstraint().getDescrs().size()).isEqualTo(2); -// assertThat(((ExprConstraintDescr) pattern.getConstraint().getDescrs().get(0)).getExpression()).isEqualTo("age < 42"); -// assertThat(((ExprConstraintDescr) pattern.getConstraint().getDescrs().get(1)).getExpression()).isEqualTo("location==atlanta"); -// -// assertThat( (String) rule.getConsequence() ).isNotNull(); + @Test + public void parse_ExpanderLineSpread() { + final PackageDescr pkg = parseAndGetPackageDescrWithDsl("expander_spread_lines.dslr", "complex.dsl"); + + final RuleDescr rule = pkg.getRules().get(0); + assertThat(rule.getLhs().getDescrs().size()).isEqualTo(1); + + final OrDescr or = (OrDescr) rule.getLhs().getDescrs().get(0); + assertThat(or.getDescrs().size()).isEqualTo(2); + assertThat((String) rule.getConsequence()).isNotNull(); + } + + @Test + public void parse_ExpanderMultipleConstraints() { + final PackageDescr pkg = parseAndGetPackageDescrWithDsl("expander_multiple_constraints.dslr", "multiple_constraints.dsl"); + + final RuleDescr rule = pkg.getRules().get(0); + assertThat(rule.getLhs().getDescrs().size()).isEqualTo(2); + + PatternDescr pattern = (PatternDescr) rule.getLhs().getDescrs().get(0); + assertThat(pattern.getObjectType()).isEqualTo("Person"); + + assertThat(pattern.getConstraint().getDescrs().size()).isEqualTo(2); + assertThat(((ExprConstraintDescr) pattern.getConstraint().getDescrs().get(0)).getExpression()).isEqualTo("age < 42"); + assertThat(((ExprConstraintDescr) pattern.getConstraint().getDescrs().get(1)).getExpression()).isEqualTo("location==atlanta"); + + pattern = (PatternDescr) rule.getLhs().getDescrs().get(1); + assertThat(pattern.getObjectType()).isEqualTo("Bar"); + + assertThat((String) rule.getConsequence()).isNotNull(); + } + + @Test + public void parse_ExpanderMultipleConstraintsFlush() { + // this is similar to the other test, but it requires a flush to add the + // constraints + final PackageDescr pkg = parseAndGetPackageDescrWithDsl("expander_multiple_constraints_flush.dslr", "multiple_constraints.dsl"); + + final RuleDescr rule = pkg.getRules().get(0); + assertThat(rule.getLhs().getDescrs().size()).isEqualTo(1); + + final PatternDescr pattern = (PatternDescr) rule.getLhs().getDescrs().get(0); + assertThat(pattern.getObjectType()).isEqualTo("Person"); + + assertThat(pattern.getConstraint().getDescrs().size()).isEqualTo(2); + assertThat(((ExprConstraintDescr) pattern.getConstraint().getDescrs().get(0)).getExpression()).isEqualTo("age < 42"); + assertThat(((ExprConstraintDescr) pattern.getConstraint().getDescrs().get(1)).getExpression()).isEqualTo("location==atlanta"); + assertThat((String) rule.getConsequence()).isNotNull(); } @Test