[jboss-svn-commits] JBL Code SVN: r24071 - in labs/jbossrules/branches/etirelli/drools-compiler/src/test: resources/org/drools/integrationtests and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 24 12:38:46 EST 2008
Author: tirelli
Date: 2008-11-24 12:38:46 -0500 (Mon, 24 Nov 2008)
New Revision: 24071
Modified:
labs/jbossrules/branches/etirelli/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl
labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/pluggable_operators.drl
Log:
Fixing tests
Modified: labs/jbossrules/branches/etirelli/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/branches/etirelli/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2008-11-24 16:51:51 UTC (rev 24070)
+++ labs/jbossrules/branches/etirelli/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2008-11-24 17:38:46 UTC (rev 24071)
@@ -79,7 +79,7 @@
protected void setUp() throws Exception {
super.setUp();
this.walker = null;
-
+
// initializes pluggable operators
new EvaluatorRegistry();
}
@@ -1769,28 +1769,28 @@
assertEquals("true", at.getValue());
}
- public void testEnabledExpression() throws Exception {
- final RuleDescr rule = (RuleDescr) parseResource("rule", "rule",
- "rule_enabled_expression.drl");
- assertEquals("simple_rule", rule.getName());
- assertEqualsIgnoreWhitespace("bar();", (String) rule.getConsequence());
+ public void testEnabledExpression() throws Exception {
+ final RuleDescr rule = (RuleDescr) parseResource("rule", "rule",
+ "rule_enabled_expression.drl");
+ assertEquals("simple_rule", rule.getName());
+ assertEqualsIgnoreWhitespace("bar();", (String) rule.getConsequence());
- final List attrs = rule.getAttributes();
- assertEquals(3, attrs.size());
+ final List attrs = rule.getAttributes();
+ assertEquals(3, attrs.size());
- AttributeDescr at = (AttributeDescr) attrs.get(0);
- assertEquals("enabled", at.getName());
- assertEquals("( 1 + 1 == 2 )", at.getValue());
+ AttributeDescr at = (AttributeDescr) attrs.get(0);
+ assertEquals("enabled", at.getName());
+ assertEquals("( 1 + 1 == 2 )", at.getValue());
- at = (AttributeDescr) attrs.get(1);
- assertEquals("salience", at.getName());
- assertEquals("( 1+2 )", at.getValue());
-
- at = (AttributeDescr) attrs.get(2);
- assertEquals("lock-on-active", at.getName());
- assertEquals("true", at.getValue());
- }
+ at = (AttributeDescr) attrs.get(1);
+ assertEquals("salience", at.getName());
+ assertEquals("( 1+2 )", at.getValue());
+ at = (AttributeDescr) attrs.get(2);
+ assertEquals("lock-on-active", at.getName());
+ assertEquals("true", at.getValue());
+ }
+
public void testAttributes_alternateSyntax() throws Exception {
final RuleDescr rule = (RuleDescr) parseResource("rule", "rule",
"rule_attributes_alt.drl");
@@ -2494,7 +2494,7 @@
assertEquals(1, pattern.getDescrs().size());
}
-
+
public void testRestrictionConnectives() throws Exception {
// the expression bellow must generate the following tree:
@@ -2918,7 +2918,7 @@
}
public void testPluggableOperators() throws Exception {
-
+
parseResource("compilation_unit", "compilation_unit",
"pluggable_operators.drl");
@@ -2938,9 +2938,10 @@
assertEquals("EventB", eventB.getObjectType());
assertEquals(1, eventB.getConstraint().getDescrs().size());
final OrDescr or = (OrDescr) eventB.getConstraint().getDescrs().get(0);
- assertEquals( 2, or.getDescrs().size());
-
- final FieldConstraintDescr fcdB = (FieldConstraintDescr) or.getDescrs().get(0);
+ assertEquals(2, or.getDescrs().size());
+
+ final FieldConstraintDescr fcdB = (FieldConstraintDescr) or.getDescrs()
+ .get(0);
assertEquals(1, fcdB.getRestrictions().size());
assertTrue(fcdB.getRestrictions().get(0) instanceof VariableRestrictionDescr);
final VariableRestrictionDescr rb = (VariableRestrictionDescr) fcdB
@@ -2950,7 +2951,8 @@
assertEquals("1,10", rb.getParameterText());
assertFalse(rb.isNegated());
- final FieldConstraintDescr fcdB2 = (FieldConstraintDescr) or.getDescrs().get(1);
+ final FieldConstraintDescr fcdB2 = (FieldConstraintDescr) or
+ .getDescrs().get(1);
assertEquals(1, fcdB2.getRestrictions().size());
assertTrue(fcdB2.getRestrictions().get(0) instanceof VariableRestrictionDescr);
final VariableRestrictionDescr rb2 = (VariableRestrictionDescr) fcdB2
@@ -2996,17 +2998,38 @@
.get(4);
assertEquals("$e", eventE.getIdentifier());
assertEquals("EventE", eventE.getObjectType());
- assertEquals(1, eventE.getConstraint().getDescrs().size());
- final FieldConstraintDescr fcdE = (FieldConstraintDescr) eventE
- .getConstraint().getDescrs().get(0);
+ assertEquals(2, eventE.getConstraint().getDescrs().size());
+
+ final AndDescr and = (AndDescr) eventE.getConstraint();
+
+ FieldConstraintDescr fcdE = (FieldConstraintDescr) and.getDescrs().get(
+ 0);
assertEquals(1, fcdE.getRestrictions().size());
- assertTrue(fcdE.getRestrictions().get(0) instanceof VariableRestrictionDescr);
- final VariableRestrictionDescr re = (VariableRestrictionDescr) fcdE
+ final RestrictionConnectiveDescr orrestr = (RestrictionConnectiveDescr) fcdE
.getRestrictions().get(0);
+ assertEquals(RestrictionConnectiveDescr.OR, orrestr.getConnective());
+ assertEquals(2, orrestr.getRestrictions().size());
+ assertTrue(orrestr.getRestrictions().get(0) instanceof VariableRestrictionDescr);
+ VariableRestrictionDescr re = (VariableRestrictionDescr) orrestr
+ .getRestrictions().get(0);
assertEquals("before", re.getEvaluator());
assertEquals("$b", re.getText());
assertEquals("1, 10", re.getParameterText());
assertTrue(re.isNegated());
+ re = (VariableRestrictionDescr) orrestr.getRestrictions().get(1);
+ assertEquals("after", re.getEvaluator());
+ assertEquals("$c", re.getText());
+ assertEquals("1, 10", re.getParameterText());
+ assertFalse(re.isNegated());
+
+ fcdE = (FieldConstraintDescr) and.getDescrs().get(1);
+ assertEquals(1, fcdE.getRestrictions().size());
+ assertTrue(fcdE.getRestrictions().get(0) instanceof VariableRestrictionDescr);
+ re = (VariableRestrictionDescr) fcdE.getRestrictions().get(0);
+ assertEquals("after", re.getEvaluator());
+ assertEquals("$d", re.getText());
+ assertEquals("1, 5", re.getParameterText());
+ assertFalse(re.isNegated());
}
public void testTypeDeclaration() throws Exception {
@@ -3025,31 +3048,31 @@
assertEquals("duration", descr.getMetaAttribute("duration"));
assertEquals("timestamp", descr.getMetaAttribute("timestamp"));
}
+
public void testRuleMetadata() throws Exception {
parseResource("compilation_unit", "compilation_unit",
"Rule_with_Metadata.drl");
final PackageDescr pack = walker.getPackageDescr();
-// @fooAttribute(barValue)
-// @fooAtt2(barVal2)
+ // @fooAttribute(barValue)
+ // @fooAtt2(barVal2)
RuleDescr rule = pack.getRules().get(0);
assertTrue(rule.getMetaAttributes().containsKey("fooMeta1"));
- assertEquals("barVal1",rule.getMetaAttribute("fooMeta1"));
+ assertEquals("barVal1", rule.getMetaAttribute("fooMeta1"));
assertTrue(rule.getMetaAttributes().containsKey("fooMeta2"));
- assertEquals("barVal2",rule.getMetaAttribute("fooMeta2"));
+ assertEquals("barVal2", rule.getMetaAttribute("fooMeta2"));
}
-
+
public void testRuleExtends() throws Exception {
parseResource("compilation_unit", "compilation_unit",
"Rule_with_Extends.drl");
final PackageDescr pack = walker.getPackageDescr();
-// @fooAttribute(barValue)
-// @fooAtt2(barVal2)
+ // @fooAttribute(barValue)
+ // @fooAtt2(barVal2)
RuleDescr rule = pack.getRules().get(0);
assertTrue(rule.getParentName() != null);
- assertEquals("rule1",rule.getParentName());
+ assertEquals("rule1", rule.getParentName());
}
-
public void testTypeDeclarationWithFields() throws Exception {
parseResource("compilation_unit", "compilation_unit",
@@ -3109,25 +3132,25 @@
assertEquals("StreamA", entry.getEntryId());
}
- public void testSlidingWindow() throws Exception {
- final String text = "StockTick( symbol==\"ACME\") over window:length(10)";
+ public void testSlidingWindow() throws Exception {
+ final String text = "StockTick( symbol==\"ACME\") over window:length(10)";
- PatternDescr pattern = (PatternDescr) parse("pattern_source", "lhs",
- text);
+ PatternDescr pattern = (PatternDescr) parse("pattern_source", "lhs",
+ text);
- assertEquals(1, pattern.getDescrs().size());
- FieldConstraintDescr fcd = (FieldConstraintDescr) pattern.getDescrs()
- .get(0);
- assertEquals("symbol", fcd.getFieldName());
+ assertEquals(1, pattern.getDescrs().size());
+ FieldConstraintDescr fcd = (FieldConstraintDescr) pattern.getDescrs()
+ .get(0);
+ assertEquals("symbol", fcd.getFieldName());
- List<BehaviorDescr> behaviors = pattern.getBehaviors();
- assertNotNull( behaviors );
- assertEquals( 1, behaviors.size() );
- SlidingWindowDescr descr = (SlidingWindowDescr) behaviors.get( 0 );
- assertEquals( "length", descr.getText() );
- assertEquals( "length", descr.getType() );
- assertEquals( "10", descr.getParameters() );
- }
+ List<BehaviorDescr> behaviors = pattern.getBehaviors();
+ assertNotNull(behaviors);
+ assertEquals(1, behaviors.size());
+ SlidingWindowDescr descr = (SlidingWindowDescr) behaviors.get(0);
+ assertEquals("length", descr.getText());
+ assertEquals("length", descr.getType());
+ assertEquals("10", descr.getParameters());
+ }
public void testNesting() throws Exception {
parseResource("compilation_unit", "compilation_unit",
@@ -3258,5 +3281,5 @@
assertEquals(cleanExpected, cleanActual);
}
-
+
}
Modified: labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl
===================================================================
--- labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl 2008-11-24 16:51:51 UTC (rev 24070)
+++ labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl 2008-11-24 17:38:46 UTC (rev 24071)
@@ -32,7 +32,7 @@
rule "before operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this `before[5,8] $a )
+ $b : StockTick( company == "ACME", this before[5,8] $a )
then
results_before.add( $b );
end
@@ -40,7 +40,7 @@
rule "after operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this `after[5,8] $a )
+ $b : StockTick( company == "ACME", this after[5,8] $a )
then
results_after.add( $b );
end
@@ -48,7 +48,7 @@
rule "meets operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this `meets[1] $a )
+ $b : StockTick( company == "ACME", this meets[1] $a )
then
results_meets.add( $b );
end
@@ -56,7 +56,7 @@
rule "met-by operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this `metby[1] $a )
+ $b : StockTick( company == "ACME", this metby[1] $a )
then
results_met_by.add( $b );
end
@@ -65,7 +65,7 @@
rule "overlaps operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "DROO", this `overlaps[1] $a )
+ $b : StockTick( company == "DROO", this overlaps[1] $a )
then
results_overlaps.add( $b );
end
@@ -73,7 +73,7 @@
rule "overlapped-by operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this `overlappedby[1] $a )
+ $b : StockTick( company == "ACME", this overlappedby[1] $a )
then
results_overlapped_by.add( $b );
end
@@ -81,7 +81,7 @@
rule "during operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this `during[1] $a )
+ $b : StockTick( company == "ACME", this during[1] $a )
then
results_during.add( $b );
end
@@ -89,7 +89,7 @@
rule "includes operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "DROO", this `includes[1] $a )
+ $b : StockTick( company == "DROO", this includes[1] $a )
then
results_includes.add( $b );
end
@@ -97,7 +97,7 @@
rule "starts operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "ACME", this `starts[2] $a )
+ $b : StockTick( company == "ACME", this starts[2] $a )
then
results_starts.add( $b );
end
@@ -105,7 +105,7 @@
rule "started-by operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "ACME", this `startedby[2] $a )
+ $b : StockTick( company == "ACME", this startedby[2] $a )
then
results_started_by.add( $b );
end
@@ -113,7 +113,7 @@
rule "finishes operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "ACME", this `finishes[2] $a )
+ $b : StockTick( company == "ACME", this finishes[2] $a )
then
results_finishes.add( $b );
end
@@ -121,7 +121,7 @@
rule "finished-by operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "ACME", this `finishedby[2] $a )
+ $b : StockTick( company == "ACME", this finishedby[2] $a )
then
results_finished_by.add( $b );
end
\ No newline at end of file
Modified: labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/pluggable_operators.drl
===================================================================
--- labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/pluggable_operators.drl 2008-11-24 16:51:51 UTC (rev 24070)
+++ labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/pluggable_operators.drl 2008-11-24 17:38:46 UTC (rev 24071)
@@ -6,6 +6,6 @@
$b : EventB( this after[1,10] $a || this not after[15,20] $a )
$c : EventC( this finishes $b )
$d : EventD( this not starts $a )
- $e : EventE( this not before[1, 10] $b )
+ $e : EventE( this not before[1, 10] $b || after[1, 10] $c && this after[1, 5] $d )
then
end
\ No newline at end of file
More information about the jboss-svn-commits
mailing list