[jboss-svn-commits] JBL Code SVN: r13265 - in labs/jbossrules/trunk/drools-compiler/src: test/java/org/drools/integrationtests and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 9 14:11:38 EDT 2007
Author: mark.proctor at jboss.com
Date: 2007-07-09 14:11:38 -0400 (Mon, 09 Jul 2007)
New Revision: 13265
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzer.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
Log:
-getting static type consequences and accumulator to work with MVEL.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java 2007-07-09 16:57:24 UTC (rev 13264)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java 2007-07-09 18:11:38 UTC (rev 13265)
@@ -69,13 +69,15 @@
if ( sourcePattern == null ) {
return null;
}
+
+ MVELDialect dialect = (MVELDialect) context.getDialect();
final Declaration[] sourceDeclArr = (Declaration[]) sourcePattern.getOuterDeclarations().values().toArray( new Declaration[0] );
final DroolsMVELFactory factory = new DroolsMVELFactory( context.getDeclarationResolver().getDeclarations(),
sourcePattern.getOuterDeclarations(),
context.getPkg().getGlobals() );
- factory.setNextFactory( ((MVELDialect) context.getDialect()).getClassImportResolverFactory() );
+ factory.setNextFactory( dialect.getClassImportResolverFactory() );
Accumulator accumulator = null;
Declaration[] declarations = null;
@@ -120,19 +122,28 @@
for ( int i = 0, size = requiredDeclarations.size(); i < size; i++ ) {
declarations[i] = context.getDeclarationResolver().getDeclaration( (String) requiredDeclarations.get( i ) );
}
+
+ final Serializable init = dialect.compile( (String) accumDescr.getInitCode(), analysis1, null, context );
+ final Serializable action = dialect.compile((String) accumDescr.getActionCode(), analysis2, null, context );
- final Serializable init = MVEL.compileExpression( (String) accumDescr.getInitCode(),
- ((MVELDialect) context.getDialect()).getClassImportResolverFactory().getImportedClasses() );
- final Serializable action = MVEL.compileExpression( (String) accumDescr.getActionCode(),
- ((MVELDialect) context.getDialect()).getClassImportResolverFactory().getImportedClasses() );
+
+
+
+// final Serializable init = MVEL.compileExpression( (String) accumDescr.getInitCode(),
+// ((MVELDialect) context.getDialect()).getClassImportResolverFactory().getImportedClasses() );
+// final Serializable action = MVEL.compileExpression( (String) accumDescr.getActionCode(),
+// ((MVELDialect) context.getDialect()).getClassImportResolverFactory().getImportedClasses() );
Serializable reverse = null;
if ( accumDescr.getReverseCode() != null ) {
- reverse = MVEL.compileExpression( (String) accumDescr.getReverseCode(),
- ((MVELDialect) context.getDialect()).getClassImportResolverFactory().getImportedClasses() );
+// reverse = MVEL.compileExpression( (String) accumDescr.getReverseCode(),
+// ((MVELDialect) context.getDialect()).getClassImportResolverFactory().getImportedClasses() );
+ reverse = dialect.compile( (String) accumDescr.getReverseCode(), analysis3, null, context );
}
- final Serializable result = MVEL.compileExpression( (String) accumDescr.getResultCode(),
- ((MVELDialect) context.getDialect()).getClassImportResolverFactory().getImportedClasses() );
+// final Serializable result = MVEL.compileExpression( (String) accumDescr.getResultCode(),
+// ((MVELDialect) context.getDialect()).getClassImportResolverFactory().getImportedClasses() );
+ final Serializable result = dialect.compile((String) accumDescr.getResultCode(), analysis3, null, context );
+
accumulator = new MVELAccumulator( factory,
init,
action,
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java 2007-07-09 16:57:24 UTC (rev 13264)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java 2007-07-09 18:11:38 UTC (rev 13265)
@@ -9,6 +9,7 @@
import org.drools.base.mvel.MVELConsequence;
import org.drools.compiler.RuleError;
import org.drools.rule.builder.ConsequenceBuilder;
+import org.drools.rule.builder.Dialect;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.spi.KnowledgeHelper;
import org.mvel.ASTNode;
@@ -25,42 +26,39 @@
//private final Interceptor assertInterceptor;
//private final Interceptor modifyInterceptor;
- private final Map interceptors;
+
private final Map macros;
public MVELConsequenceBuilder() {
- this.interceptors = new HashMap(1);
- this.interceptors.put( "Modify", new ModifyInterceptor() );
+ macros = new HashMap( 4 );
- macros = new HashMap(4);
-
macros.put( "insert",
new Macro() {
public String doMacro() {
return "drools.insert";
}
- } );
-
+ } );
+
macros.put( "modify",
new Macro() {
public String doMacro() {
return "@Modify with";
}
} );
-
+
macros.put( "update",
new Macro() {
public String doMacro() {
return "drools.update";
}
} );
-
+
macros.put( "retract",
new Macro() {
public String doMacro() {
return "drools.retract";
}
- } );
+ } );
}
public void build(final RuleBuildContext context) {
@@ -68,17 +66,27 @@
context.getBuildStack().push( context.getRule().getLhs() );
try {
+ MVELDialect dialect = (MVELDialect) context.getDialect();
final DroolsMVELFactory factory = new DroolsMVELFactory( context.getDeclarationResolver().getDeclarations(),
null,
context.getPkg().getGlobals() );
- factory.setNextFactory( ((MVELDialect) context.getDialect()).getClassImportResolverFactory() );
+ factory.setNextFactory( dialect.getClassImportResolverFactory() );
MacroProcessor macroProcessor = new MacroProcessor();
macroProcessor.setMacros( macros );
-
- final Serializable expr = MVEL.compileExpression( macroProcessor.parse( delimitExpressions( (String) context.getRuleDescr().getConsequence() )),
- ((MVELDialect) context.getDialect()).getClassImportResolverFactory().getImportedClasses(), this.interceptors );
+ String text = macroProcessor.parse( delimitExpressions( (String) context.getRuleDescr().getConsequence() ) );
+
+ Dialect.AnalysisResult analysis = dialect.analyzeBlock( context,
+ context.getRuleDescr(),
+ dialect.getInterceptors(),
+ text );
+
+ final Serializable expr = dialect.compile( text,
+ analysis,
+ dialect.getInterceptors(),
+ context );
+
context.getRule().setConsequence( new MVELConsequence( expr,
factory ) );
} catch ( final Exception e ) {
@@ -142,44 +150,4 @@
return result.toString();
}
- public static class AssertInterceptor
- implements
- Interceptor {
- public int doBefore(ASTNode node,
- VariableResolverFactory factory) {
- return 0;
- }
-
- public int doAfter(Object value,
- ASTNode node,
- VariableResolverFactory factory) {
- ((DroolsMVELFactory) factory).getWorkingMemory().insert( value );
- return 0;
- }
- }
-
- public static class ModifyInterceptor
- implements
- Interceptor {
- public int doBefore(ASTNode node,
- VariableResolverFactory factory) {
- Object object = ((WithNode) node). getNestedStatement().getValue( null,
- factory );
-
- DroolsMVELKnowledgeHelper resolver = ( DroolsMVELKnowledgeHelper ) factory.getVariableResolver( "drools" );
- KnowledgeHelper helper = ( KnowledgeHelper ) resolver.getValue();
- helper.modifyRetract( object );
- return 0;
- }
-
- public int doAfter(Object value,
- ASTNode node,
- VariableResolverFactory factory) {
- DroolsMVELKnowledgeHelper resolver = ( DroolsMVELKnowledgeHelper ) factory.getVariableResolver( "drools" );
- KnowledgeHelper helper = ( KnowledgeHelper ) resolver.getValue();
- helper.modifyInsert( value );
- return 0;
- }
- }
-
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java 2007-07-09 16:57:24 UTC (rev 13264)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java 2007-07-09 18:11:38 UTC (rev 13265)
@@ -11,6 +11,8 @@
import org.drools.base.ClassFieldExtractorCache;
import org.drools.base.TypeResolver;
+import org.drools.base.mvel.DroolsMVELFactory;
+import org.drools.base.mvel.DroolsMVELKnowledgeHelper;
import org.drools.compiler.ImportError;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
@@ -42,9 +44,14 @@
import org.drools.rule.builder.RuleConditionBuilder;
import org.drools.rule.builder.SalienceBuilder;
import org.drools.spi.DeclarationScopeResolver;
+import org.drools.spi.KnowledgeHelper;
+import org.mvel.ASTNode;
import org.mvel.AbstractParser;
import org.mvel.ExpressionCompiler;
import org.mvel.ParserContext;
+import org.mvel.ast.WithNode;
+import org.mvel.integration.Interceptor;
+import org.mvel.integration.VariableResolverFactory;
import org.mvel.integration.impl.ClassImportResolverFactory;
import org.mvel.integration.impl.StaticMethodImportResolverFactory;
@@ -64,6 +71,8 @@
private final MVELConsequenceBuilder consequence = new MVELConsequenceBuilder();
//private final JavaRuleClassBuilder rule = new JavaRuleClassBuilder();
private final MVELFromBuilder from = new MVELFromBuilder();
+
+ private final Map interceptors;
private List results;
//private final JavaFunctionBuilder function = new JavaFunctionBuilder();
@@ -87,8 +96,8 @@
private Map builders;
public MVELDialect(final PackageBuilder builder) {
- AbstractParser.setLanguageLevel(4);
-
+ AbstractParser.setLanguageLevel( 4 );
+
this.pkg = builder.getPackage();
this.configuration = builder.getPackageBuilderConfiguration();
this.typeResolver = builder.getTypeResolver();
@@ -104,6 +113,10 @@
initBuilder();
+ this.interceptors = new HashMap( 1 );
+ this.interceptors.put( "Modify",
+ new ModifyInterceptor() );
+
this.importFactory = new ClassImportResolverFactory();
this.staticImportFactory = new StaticMethodImportResolverFactory();
this.importFactory.setNextFactory( this.staticImportFactory );
@@ -143,6 +156,8 @@
this.builders.put( EvalDescr.class,
getEvalBuilder() );
+
+
}
public void init(Package pkg) {
@@ -231,6 +246,16 @@
public Dialect.AnalysisResult analyzeBlock(RuleBuildContext context,
BaseDescr descr,
String text) {
+ return analyzeBlock( context,
+ descr,
+ null,
+ text );
+ }
+
+ public Dialect.AnalysisResult analyzeBlock(RuleBuildContext context,
+ BaseDescr descr,
+ Map interceptors,
+ String text) {
Dialect.AnalysisResult result = null;
try {
result = this.analyzer.analyzeExpression( context,
@@ -244,25 +269,37 @@
}
return result;
}
-
- public Serializable compile(final String text, final Dialect.AnalysisResult analysis, final RuleBuildContext context) {
- final ParserContext parserContext = new ParserContext( getClassImportResolverFactory().getImportedClasses(), null, null);
+
+ public Serializable compile(final String text,
+ final Dialect.AnalysisResult analysis,
+ final Map interceptors,
+ final RuleBuildContext context) {
+ final ParserContext parserContext = new ParserContext( getClassImportResolverFactory().getImportedClasses(),
+ null,
+ null );
parserContext.setStrictTypeEnforcement( true );
-
+ if ( interceptors != null ) {
+ parserContext.setInterceptors( interceptors );
+ }
+
List list[] = analysis.getBoundIdentifiers();
DeclarationScopeResolver resolver = context.getDeclarationResolver();
for ( Iterator it = list[0].iterator(); it.hasNext(); ) {
String identifier = (String) it.next();
Class cls = resolver.getDeclaration( identifier ).getExtractor().getExtractToClass();
- parserContext.addInput( identifier, cls );
+ parserContext.addInput( identifier,
+ cls );
}
-
+
Map globalTypes = context.getPkg().getGlobals();
for ( Iterator it = list[1].iterator(); it.hasNext(); ) {
String identifier = (String) it.next();
- parserContext.addInput( identifier, ( Class ) globalTypes.get( identifier ) );
- }
+ parserContext.addInput( identifier,
+ (Class) globalTypes.get( identifier ) );
+ }
+ parserContext.addInput( "drools", KnowledgeHelper.class );
+
ExpressionCompiler compiler = new ExpressionCompiler( text );
return compiler.compile( parserContext );
}
@@ -330,5 +367,49 @@
public TypeResolver getTypeResolver() {
return this.typeResolver;
}
+
+ public Map getInterceptors() {
+ return this.interceptors;
+ }
+
+ public static class AssertInterceptor
+ implements
+ Interceptor {
+ public int doBefore(ASTNode node,
+ VariableResolverFactory factory) {
+ return 0;
+ }
+
+ public int doAfter(Object value,
+ ASTNode node,
+ VariableResolverFactory factory) {
+ ((DroolsMVELFactory) factory).getWorkingMemory().insert( value );
+ return 0;
+ }
}
+
+public static class ModifyInterceptor
+ implements
+ Interceptor {
+ public int doBefore(ASTNode node,
+ VariableResolverFactory factory) {
+ Object object = ((WithNode) node).getNestedStatement().getValue( null,
+ factory );
+
+ DroolsMVELKnowledgeHelper resolver = (DroolsMVELKnowledgeHelper) factory.getVariableResolver( "drools" );
+ KnowledgeHelper helper = (KnowledgeHelper) resolver.getValue();
+ helper.modifyRetract( object );
+ return 0;
+ }
+
+ public int doAfter(Object value,
+ ASTNode node,
+ VariableResolverFactory factory) {
+ DroolsMVELKnowledgeHelper resolver = (DroolsMVELKnowledgeHelper) factory.getVariableResolver( "drools" );
+ KnowledgeHelper helper = (KnowledgeHelper) resolver.getValue();
+ helper.modifyInsert( value );
+ return 0;
+ }
+}
+}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java 2007-07-09 16:57:24 UTC (rev 13264)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java 2007-07-09 18:11:38 UTC (rev 13265)
@@ -88,7 +88,7 @@
final EvalCondition eval = new EvalCondition( declarations );
- Serializable expr = ((MVELDialect) context.getDialect()).compile( (String) evalDescr.getContent(), analysis, context );
+ Serializable expr = ((MVELDialect) context.getDialect()).compile( (String) evalDescr.getContent(), analysis, null, context );
eval.setEvalExpression( new MVELEvalExpression( expr,
factory ) );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzer.java 2007-07-09 16:57:24 UTC (rev 13264)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzer.java 2007-07-09 18:11:38 UTC (rev 13265)
@@ -34,7 +34,7 @@
*
*/
public class MVELExprAnalyzer {
-
+
public MVELExprAnalyzer() {
// intentionally left blank.
}
@@ -58,15 +58,16 @@
public MVELAnalysisResult analyzeExpression(final RuleBuildContext context,
final String expr,
final Set[] availableIdentifiers) throws RecognitionException {
- ExpressionCompiler compiler = new ExpressionCompiler( expr);
-
+ ExpressionCompiler compiler = new ExpressionCompiler( expr );
+
ParserContext parserContext = new ParserContext();
- parserContext.setStrictTypeEnforcement( false );
+ parserContext.setStrictTypeEnforcement( false );
MVELDialect dialect = (MVELDialect) context.getDialect( "mvel" );
- parserContext.setImports( dialect.getClassImportResolverFactory().getImportedClasses() );
+ parserContext.setImports( dialect.getClassImportResolverFactory().getImportedClasses() );
+ parserContext.setInterceptors( dialect.getInterceptors() );
- compiler.compile(parserContext);
-
+ compiler.compile( parserContext );
+
return analyze( compiler.getParserContextState().getInputs().keySet(),
availableIdentifiers );
}
@@ -85,7 +86,7 @@
* If an error occurs in the parser.
*/
private MVELAnalysisResult analyze(final Set identifiers,
- final Set[] availableIdentifiers) throws RecognitionException {
+ final Set[] availableIdentifiers) throws RecognitionException {
MVELAnalysisResult result = new MVELAnalysisResult();
result.setIdentifiers( new ArrayList( identifiers ) );
@@ -109,6 +110,6 @@
result.setBoundIdentifiers( used );
result.setNotBoundedIdentifiers( new ArrayList( notBound ) );
- return result;
+ return result;
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java 2007-07-09 16:57:24 UTC (rev 13264)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java 2007-07-09 18:11:38 UTC (rev 13265)
@@ -77,6 +77,7 @@
final Serializable expr = dialect.compile( text,
analysis,
+ null,
context );
dataProvider = new MVELDataProvider( expr,
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java 2007-07-09 16:57:24 UTC (rev 13264)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java 2007-07-09 18:11:38 UTC (rev 13265)
@@ -73,7 +73,7 @@
predicateDescr,
predicateDescr.getContent() );
- final Serializable expr = ((MVELDialect) context.getDialect()).compile( (String) predicateDescr.getContent(), analysis, context );
+ final Serializable expr = ((MVELDialect) context.getDialect()).compile( (String) predicateDescr.getContent(), analysis, null, context );
predicate.setPredicateExpression( new MVELPredicateExpression( expr,
factory ) );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java 2007-07-09 16:57:24 UTC (rev 13264)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java 2007-07-09 18:11:38 UTC (rev 13265)
@@ -73,7 +73,7 @@
returnValueRestrictionDescr,
returnValueRestrictionDescr.getContent() );
- final Serializable expr = ((MVELDialect) context.getDialect()).compile( (String) returnValueRestrictionDescr.getContent(), analysis, context );
+ final Serializable expr = ((MVELDialect) context.getDialect()).compile( (String) returnValueRestrictionDescr.getContent(), analysis, null, context );
returnValueRestriction.setReturnValueExpression( new MVELReturnValueExpression( expr,
factory ) );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java 2007-07-09 16:57:24 UTC (rev 13264)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilder.java 2007-07-09 18:11:38 UTC (rev 13265)
@@ -36,6 +36,7 @@
final Serializable expr = dialect.compile( (String) context.getRuleDescr().getSalience(),
analysis,
+ null,
context );
MVELSalienceExpression salience = new MVELSalienceExpression( expr,
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java 2007-07-09 16:57:24 UTC (rev 13264)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java 2007-07-09 18:11:38 UTC (rev 13265)
@@ -473,7 +473,7 @@
results.size() );
}
-
+
public void testAccumulateMax() throws Exception {
// read in the source
final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_AccumulateMax.drl" ) );
@@ -487,11 +487,11 @@
final Cheese[] cheese = new Cheese[]{new Cheese( "stilton",
4 ), new Cheese( "stilton",
- 2 ), new Cheese( "stilton",
- 3 ), new Cheese( "brie",
- 15 ), new Cheese( "brie",
- 17 ), new Cheese( "provolone",
- 8 )};
+ 2 ), new Cheese( "stilton",
+ 3 ), new Cheese( "brie",
+ 15 ), new Cheese( "brie",
+ 17 ), new Cheese( "provolone",
+ 8 )};
final Person bob = new Person( "Bob",
"stilton" );
@@ -542,7 +542,7 @@
results.size() );
}
-
+
public void testAccumulateMin() throws Exception {
// read in the source
final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_AccumulateMin.drl" ) );
@@ -556,11 +556,11 @@
final Cheese[] cheese = new Cheese[]{new Cheese( "stilton",
8 ), new Cheese( "stilton",
- 10 ), new Cheese( "stilton",
+ 10 ), new Cheese( "stilton",
9 ), new Cheese( "brie",
- 4 ), new Cheese( "brie",
- 1 ), new Cheese( "provolone",
- 8 )};
+ 4 ), new Cheese( "brie",
+ 1 ), new Cheese( "provolone",
+ 8 )};
final Person bob = new Person( "Bob",
"stilton" );
@@ -611,7 +611,7 @@
results.size() );
}
-
+
public void testAccumulateCount() throws Exception {
// read in the source
final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_AccumulateCount.drl" ) );
@@ -625,11 +625,11 @@
final Cheese[] cheese = new Cheese[]{new Cheese( "stilton",
8 ), new Cheese( "stilton",
- 10 ), new Cheese( "stilton",
+ 10 ), new Cheese( "stilton",
9 ), new Cheese( "brie",
- 4 ), new Cheese( "brie",
- 1 ), new Cheese( "provolone",
- 8 )};
+ 4 ), new Cheese( "brie",
+ 1 ), new Cheese( "provolone",
+ 8 )};
final Person bob = new Person( "Bob",
"stilton" );
@@ -681,7 +681,7 @@
results.size() );
}
-
+
public void testAccumulateWithFromChaining() throws Exception {
// read in the source
final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_AccumulateWithFromChaining.drl" ) );
@@ -695,20 +695,20 @@
final Cheese[] cheese = new Cheese[]{new Cheese( "stilton",
8 ), new Cheese( "stilton",
- 10 ), new Cheese( "stilton",
+ 10 ), new Cheese( "stilton",
9 ), new Cheese( "brie",
- 4 ), new Cheese( "brie",
- 1 ), new Cheese( "provolone",
- 8 )};
+ 4 ), new Cheese( "brie",
+ 1 ), new Cheese( "provolone",
+ 8 )};
Cheesery cheesery = new Cheesery();
-
- for( int i = 0; i < cheese.length; i++ ) {
+
+ for ( int i = 0; i < cheese.length; i++ ) {
cheesery.addCheese( cheese[i] );
}
-
+
FactHandle cheeseryHandle = wm.insert( cheesery );
-
+
final Person bob = new Person( "Bob",
"stilton" );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2007-07-09 16:57:24 UTC (rev 13264)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2007-07-09 18:11:38 UTC (rev 13265)
@@ -36,7 +36,7 @@
MVELDialect mvelDialect = new MVELDialect( new PackageBuilder( pkg ) );
DialectRegistry registry = new DialectRegistry();
- registry.addDialect( "default",
+ registry.addDialect( "mvel",
mvelDialect );
final PackageBuilderConfiguration conf = new PackageBuilderConfiguration();
More information about the jboss-svn-commits
mailing list