Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4225 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/semantics/java main/resources/org/drools/lang test/java/org/drools/compiler test/java/org/drools/integrationtests test/java/org/drools/lang test/resources/org/drools/integrationtests test/resources/org/drools/lang
|
From: <jbo...@li...> - 2006-05-15 11:29:59
|
Author: mar...@jb...
Date: 2006-05-15 07:29:49 -0400 (Mon, 15 May 2006)
New Revision: 4225
Added:
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActivationGroups.drl
Removed:
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_XorGroups.drl
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/drl.g
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/rule_attributes.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/rule_attributes_alt.drl
Log:
-Change xor-group to activation-group
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java 2006-05-15 11:29:45 UTC (rev 4224)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java 2006-05-15 11:29:49 UTC (rev 4225)
@@ -200,7 +200,7 @@
}
} else if ( name.equals( "agenda-group" ) ) {
rule.setAgendaGroup( attributeDescr.getValue() );
- } else if ( name.equals( "xor-group" ) ) {
+ } else if ( name.equals( "activation-group" ) ) {
rule.setXorGroup( attributeDescr.getValue() );
} else if ( name.equals( "duration" ) ) {
rule.setDuration( Long.parseLong( attributeDescr.getValue() ) );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/drl.g
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/drl.g 2006-05-15 11:29:45 UTC (rev 4224)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/drl.g 2006-05-15 11:29:49 UTC (rev 4225)
@@ -461,7 +461,7 @@
| a=no_loop { d = a; }
| a=agenda_group { d = a; }
| a=duration { d = a; }
- | a=xor_group { d = a; }
+ | a=activation_group { d = a; }
| a=auto_focus { d = a; }
;
@@ -526,14 +526,14 @@
;
-xor_group returns [AttributeDescr d]
+activation_group returns [AttributeDescr d]
@init {
d = null;
}
:
- loc='xor-group' opt_eol name=STRING ';'? opt_eol
+ loc='activation-group' opt_eol name=STRING ';'? opt_eol
{
- d = new AttributeDescr( "xor-group", getString( name ) );
+ d = new AttributeDescr( "activation-group", getString( name ) );
d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
}
;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2006-05-15 11:29:45 UTC (rev 4224)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2006-05-15 11:29:49 UTC (rev 4225)
@@ -37,7 +37,7 @@
import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.common.LogicalDependency;
-import org.drools.common.XorGroupNode;
+import org.drools.common.ActivationGroupNode;
import org.drools.compiler.PackageBuilder;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.ColumnDescr;
@@ -897,12 +897,12 @@
public void setActivated(boolean activated) {
}
- public XorGroupNode getXorGroupNode() {
+ public ActivationGroupNode getActivationGroupNode() {
// TODO Auto-generated method stub
return null;
}
- public void setXorGroupNode(XorGroupNode xorGroupNode) {
+ public void setActivationGroupNode(ActivationGroupNode activationGroupNode) {
// TODO Auto-generated method stub
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java 2006-05-15 11:29:45 UTC (rev 4224)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java 2006-05-15 11:29:49 UTC (rev 4225)
@@ -59,7 +59,7 @@
import org.drools.rule.Package;
import org.drools.rule.Rule;
import org.drools.spi.AgendaGroup;
-import org.drools.spi.XorGroup;
+import org.drools.spi.ActivationGroup;
/**
* This contains the test cases for each engines implementation to execute.
@@ -1162,13 +1162,13 @@
12 );
workingMemory.assertObject( brie );
- XorGroup xorGroup0 = workingMemory.getAgenda().getXorGroup( "xor-group-0" );
+ ActivationGroup activationGroup0 = workingMemory.getAgenda().getActivationGroup( "activation-group-0" );
assertEquals( 2,
- xorGroup0.size() );
+ activationGroup0.size() );
- XorGroup xorGroup3 = workingMemory.getAgenda().getXorGroup( "xor-group-3" );
+ ActivationGroup activationGroup3 = workingMemory.getAgenda().getActivationGroup( "activation-group-3" );
assertEquals( 1,
- xorGroup3.size() );
+ activationGroup3.size() );
AgendaGroup agendaGroup3 = workingMemory.getAgenda().getAgendaGroup( "agenda-group-3" );
assertEquals( 1,
@@ -1180,14 +1180,14 @@
workingMemory.clearAgendaGroup( "agenda-group-3" );
assertEquals( 0,
- xorGroup3.size() );
+ activationGroup3.size() );
assertEquals( 0,
agendaGroup3.size() );
workingMemory.fireAllRules();
assertEquals( 0,
- xorGroup0.size() );
+ activationGroup0.size() );
assertEquals( 2,
list.size() );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java 2006-05-15 11:29:45 UTC (rev 4224)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java 2006-05-15 11:29:49 UTC (rev 4225)
@@ -28,7 +28,7 @@
import org.drools.compiler.PackageBuilder;
import org.drools.rule.Package;
import org.drools.spi.AgendaGroup;
-import org.drools.spi.XorGroup;
+import org.drools.spi.ActivationGroup;
/**
* This runs the integration test cases with the leaps implementation.
@@ -132,11 +132,11 @@
// while Xor group behaviour is supported by leaps certain functionality is no
// due to the lazy nature of leaps and the fact that it does not accumulate
- // activations before firing them we can not do counts on xor groups and
+ // activations before firing them we can not do counts on activation groups and
// agenda groups as in base integration test
public void testXorGroups() throws Exception {
PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_XorGroups.drl" ) ) );
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_ActivationGroups.drl" ) ) );
Package pkg = builder.getPackage();
RuleBase ruleBase = getRuleBase();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2006-05-15 11:29:45 UTC (rev 4224)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2006-05-15 11:29:49 UTC (rev 4225)
@@ -1261,8 +1261,8 @@
assertEquals("42", at.getValue());
at = (AttributeDescr) attrs.get( 4 );
- assertEquals("xor-group", at.getName());
- assertEquals("my_xor_group", at.getValue());
+ assertEquals("activation-group", at.getName());
+ assertEquals("my_activation_group", at.getValue());
assertFalse( parser.hasErrors() );
}
@@ -1292,8 +1292,8 @@
assertEquals("42", at.getValue());
at = (AttributeDescr) attrs.get( 4 );
- assertEquals("xor-group", at.getName());
- assertEquals("my_xor_group", at.getValue());
+ assertEquals("activation-group", at.getName());
+ assertEquals("my_activation_group", at.getValue());
assertFalse( parser.hasErrors() );
}
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActivationGroups.drl (from rev 4217, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_XorGroups.drl)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_XorGroups.drl 2006-05-14 23:24:48 UTC (rev 4217)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActivationGroups.drl 2006-05-15 11:29:49 UTC (rev 4225)
@@ -0,0 +1,38 @@
+package org.drools.test;
+
+import org.drools.Cheese;
+
+global java.util.List list;
+
+rule "rule0"
+ salience 10
+ activation-group "activation-group-0"
+ when
+ Cheese( )
+ then
+ list.add( "rule0" );
+end
+
+rule "rule1"
+ activation-group "activation-group-0"
+ when
+ Cheese( )
+ then
+ list.add( "rule1" );
+end
+
+rule "rul2"
+ when
+ Cheese( )
+ then
+ list.add( "rule2" );
+end
+
+rule "rule3"
+ agenda-group "agenda-group-3"
+ activation-group "activatino-group-3"
+ when
+ Cheese( )
+ then
+ list.add( "rule3" );
+end
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_XorGroups.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_XorGroups.drl 2006-05-15 11:29:45 UTC (rev 4224)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_XorGroups.drl 2006-05-15 11:29:49 UTC (rev 4225)
@@ -1,38 +0,0 @@
-package org.drools.test;
-
-import org.drools.Cheese;
-
-global java.util.List list;
-
-rule "rule0"
- salience 10
- xor-group "xor-group-0"
- when
- Cheese( )
- then
- list.add( "rule0" );
-end
-
-rule "rule1"
- xor-group "xor-group-0"
- when
- Cheese( )
- then
- list.add( "rule1" );
-end
-
-rule "rul2"
- when
- Cheese( )
- then
- list.add( "rule2" );
-end
-
-rule "rule3"
- agenda-group "agenda-group-3"
- xor-group "xor-group-3"
- when
- Cheese( )
- then
- list.add( "rule3" );
-end
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/rule_attributes.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/rule_attributes.drl 2006-05-15 11:29:45 UTC (rev 4224)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/rule_attributes.drl 2006-05-15 11:29:49 UTC (rev 4225)
@@ -7,7 +7,7 @@
agenda-group "my_group"
no-loop
duration 42
- xor-group "my_xor_group"
+ activation-group "my_activation_group"
when
Foo()
then
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/rule_attributes_alt.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/rule_attributes_alt.drl 2006-05-15 11:29:45 UTC (rev 4224)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/rule_attributes_alt.drl 2006-05-15 11:29:49 UTC (rev 4225)
@@ -3,7 +3,7 @@
rule simple_rule
attributes:
- salience 42, agenda-group "my_group", no-loop, duration 42, xor-group "my_xor_group"
+ salience 42, agenda-group "my_group", no-loop, duration 42, activation-group "my_activation_group"
when
Foo()
then
|
