[jboss-svn-commits] JBL Code SVN: r24068 - in labs/jbossrules/branches/etirelli/drools-compiler/src/test: resources/org/drools/lang and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tirelli
Date: 2008-11-24 10:54:02 -0500 (Mon, 24 Nov 2008)
New Revision: 24068

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/lang/pluggable_operators.drl
Log:
Fixing test for pluggable operators

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 15:53:29 UTC (rev 24067)
+++ labs/jbossrules/branches/etirelli/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java	2008-11-24 15:54:02 UTC (rev 24068)
@@ -2937,8 +2937,10 @@
 		assertEquals("$b", eventB.getIdentifier());
 		assertEquals("EventB", eventB.getObjectType());
 		assertEquals(1, eventB.getConstraint().getDescrs().size());
-		final FieldConstraintDescr fcdB = (FieldConstraintDescr) eventB
-				.getConstraint().getDescrs().get(0);
+		final OrDescr or = (OrDescr) eventB.getConstraint().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
@@ -2948,6 +2950,16 @@
 		assertEquals("1,10", rb.getParameterText());
 		assertFalse(rb.isNegated());
 
+		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
+				.getRestrictions().get(0);
+		assertEquals("after", rb2.getEvaluator());
+		assertEquals("$a", rb2.getText());
+		assertEquals("15,20", rb2.getParameterText());
+		assertTrue(rb2.isNegated());
+
 		final PatternDescr eventC = (PatternDescr) rule.getLhs().getDescrs()
 				.get(2);
 		assertEquals("$c", eventC.getIdentifier());

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 15:53:29 UTC (rev 24067)
+++ labs/jbossrules/branches/etirelli/drools-compiler/src/test/resources/org/drools/lang/pluggable_operators.drl	2008-11-24 15:54:02 UTC (rev 24068)
@@ -3,7 +3,7 @@
 rule "test pluggable operators"
 when
     $a : EventA()
-    $b : EventB( this after[1,10] $a || this after[15,20] $b )
+    $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 )