Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4864 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/lang test/java/org/drools/compiler test/java/org/drools/integrationtests
Author: mar...@jb...
Date: 2006-06-28 22:10:44 -0400 (Wed, 28 Jun 2006)
New Revision: 4864
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java
Log:
JBRULES-293 NullPointer for DrlDumper when using Agenda Groups
-removed bad import
-test doesn't work for leaps, so overridden and added FIXME
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java 2006-06-29 01:40:30 UTC (rev 4863)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java 2006-06-29 02:10:44 UTC (rev 4864)
@@ -40,8 +40,6 @@
import org.drools.lang.descr.RuleDescr;
import org.drools.util.ReflectiveVisitor;
-import sun.security.krb5.internal.at;
-
/**
*
* @author <a href="mailto:jay...@gm...">Author Jayaram C S</a>
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-06-29 01:40:30 UTC (rev 4863)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2006-06-29 02:10:44 UTC (rev 4864)
@@ -83,7 +83,7 @@
ruleDescr.setLhs( lhs );
final ColumnDescr column = new ColumnDescr( Cheese.class.getName(),
- "stilton" );
+ "stilton" );
lhs.addDescr( column );
FieldBindingDescr fieldBindingDescr = new FieldBindingDescr( "price",
@@ -97,8 +97,8 @@
"java.util.Map" );
final ReturnValueDescr returnValue = new ReturnValueDescr( "price",
- "==",
- "x" );
+ "==",
+ "x" );
column.addDescr( returnValue );
// There is no m this should produce errors.
@@ -150,7 +150,7 @@
final Tuple tuple = new MockTuple( new HashMap() );
final Activation activation = new MockActivation( rule,
- tuple );
+ tuple );
KnowledgeHelper knowledgeHelper = new org.drools.base.DefaultKnowledgeHelper( activation,
workingMemory );
@@ -227,10 +227,10 @@
final Tuple tuple = new MockTuple( new HashMap() );
final Activation activation = new MockActivation( newRule,
- tuple );
+ tuple );
final KnowledgeHelper knowledgeHelper = new org.drools.base.DefaultKnowledgeHelper( activation,
- workingMemory );
+ workingMemory );
newRule.getConsequence().evaluate( knowledgeHelper,
workingMemory );
assertEquals( new Integer( 1 ),
@@ -238,7 +238,7 @@
}
private Object serializeIn(final byte[] bytes) throws IOException,
- ClassNotFoundException {
+ ClassNotFoundException {
final ObjectInput in = new ObjectInputStream( new ByteArrayInputStream( bytes ) );
final Object obj = in.readObject();
in.close();
@@ -285,12 +285,12 @@
ruleDescr.setLhs( lhs );
final ColumnDescr column = new ColumnDescr( Cheese.class.getName(),
- "stilton" );
+ "stilton" );
lhs.addDescr( column );
final LiteralDescr listeralDescr = new LiteralDescr( "type",
- "==",
- "stilton" );
+ "==",
+ "stilton" );
column.addDescr( listeralDescr );
@@ -313,7 +313,7 @@
ruleDescr.setLhs( lhs );
final ColumnDescr column = new ColumnDescr( Cheese.class.getName(),
- "stilton" );
+ "stilton" );
lhs.addDescr( column );
FieldBindingDescr fieldBindingDescr = new FieldBindingDescr( "price",
@@ -327,8 +327,8 @@
"java.util.Map" );
final ReturnValueDescr returnValue = new ReturnValueDescr( "price",
- "==",
- "new Integer(( ( ( Integer )map.get(x) ).intValue() * y.intValue()))" );
+ "==",
+ "new Integer(( ( ( Integer )map.get(x) ).intValue() * y.intValue()))" );
column.addDescr( returnValue );
ruleDescr.setConsequence( "modify(stilton);" );
@@ -381,19 +381,19 @@
ruleDescr.setLhs( lhs );
final ColumnDescr column = new ColumnDescr( Cheese.class.getName(),
- "stilton" );
+ "stilton" );
lhs.addDescr( column );
final FieldBindingDescr fieldBindingDescr = new FieldBindingDescr( "price",
- "x" );
+ "x" );
column.addDescr( fieldBindingDescr );
packageDescr.addGlobal( "map",
"java.util.Map" );
final PredicateDescr predicate = new PredicateDescr( "price",
- "y",
- "( ( Integer )map.get(x) ).intValue() == y.intValue()" );
+ "y",
+ "( ( Integer )map.get(x) ).intValue() == y.intValue()" );
column.addDescr( predicate );
ruleDescr.setConsequence( "modify(stilton);" );
@@ -446,7 +446,7 @@
ruleDescr.setLhs( lhs );
final ColumnDescr column = new ColumnDescr( Cheese.class.getName(),
- "stilton" );
+ "stilton" );
lhs.addDescr( column );
FieldBindingDescr fieldBindingDescr = new FieldBindingDescr( "price",
@@ -507,8 +507,8 @@
public void testOr() throws Exception {
final PackageBuilder builder = new PackageBuilder();
final Rule rule = createRule( new OrDescr(),
- builder,
- "modify(stilton);" );
+ builder,
+ "modify(stilton);" );
assertLength( 0,
builder.getErrors() );
@@ -527,8 +527,8 @@
public void testAnd() throws Exception {
final PackageBuilder builder = new PackageBuilder();
final Rule rule = createRule( new AndDescr(),
- builder,
- "modify(stilton);" );
+ builder,
+ "modify(stilton);" );
assertLength( 0,
builder.getErrors() );
@@ -708,11 +708,11 @@
ruleDescr.setLhs( lhs );
final ColumnDescr columnDescr = new ColumnDescr( Cheese.class.getName(),
- "stilton" );
+ "stilton" );
final LiteralDescr literalDescr = new LiteralDescr( "type",
- "==",
- null );
+ "==",
+ null );
columnDescr.addDescr( literalDescr );
ruleDescr.setConsequence( "" );
@@ -725,9 +725,9 @@
assertLength( 0,
builder.getErrors() );
}
-
+
public void testDuplicateRuleNames() throws Exception {
-
+
final PackageBuilder builder = new PackageBuilder();
final PackageDescr packageDescr = new PackageDescr( "p1" );
@@ -743,46 +743,87 @@
null );
columnDescr.addDescr( literalDescr );
ruleDescr.setConsequence( "" );
-
+
ruleDescr = new RuleDescr( "rule-1" );
- ruleDescr.setLocation( 42, 43 );
+ ruleDescr.setLocation( 42,
+ 43 );
packageDescr.addRule( ruleDescr );
lhs = new AndDescr();
ruleDescr.setLhs( lhs );
columnDescr = new ColumnDescr( Cheese.class.getName(),
- "stilton" );
+ "stilton" );
literalDescr = new LiteralDescr( "type",
- "!=",
- null );
+ "!=",
+ null );
columnDescr.addDescr( literalDescr );
ruleDescr.setConsequence( "" );
-
-
+
ruleDescr = new RuleDescr( "rule-2" );
- ruleDescr.setLocation( 42, 43 );
+ ruleDescr.setLocation( 42,
+ 43 );
packageDescr.addRule( ruleDescr );
lhs = new AndDescr();
ruleDescr.setLhs( lhs );
columnDescr = new ColumnDescr( Cheese.class.getName(),
- "stilton" );
+ "stilton" );
literalDescr = new LiteralDescr( "type",
- "!=",
- null );
+ "!=",
+ null );
columnDescr.addDescr( literalDescr );
- ruleDescr.setConsequence( "" );
+ ruleDescr.setConsequence( "" );
builder.addPackage( packageDescr );
-
-
assertLength( 1,
builder.getErrors() );
ParserError err = (ParserError) builder.getErrors()[0];
- assertEquals(42, err.getRow());
- assertEquals(43, err.getCol());
-
+ assertEquals( 42,
+ err.getRow() );
+ assertEquals( 43,
+ err.getCol() );
+
}
+ public void testDuplicateDeclaration() {
+ final PackageBuilder builder = new PackageBuilder();
+
+ final PackageDescr packageDescr = new PackageDescr( "p1" );
+ final RuleDescr ruleDescr = new RuleDescr( "rule-1" );
+ packageDescr.addRule( ruleDescr );
+
+ final AndDescr lhs = new AndDescr();
+ ruleDescr.setLhs( lhs );
+
+ final ColumnDescr column1 = new ColumnDescr( Cheese.class.getName(),
+ "stilton" );
+ lhs.addDescr( column1 );
+
+ final FieldBindingDescr fieldBindingDescr = new FieldBindingDescr( "type",
+ "$type" );
+
+ final LiteralDescr listeralDescr = new LiteralDescr( "type",
+ "==",
+ "stilton" );
+
+ column1.addDescr( fieldBindingDescr );
+ column1.addDescr( listeralDescr );
+
+ final ColumnDescr column2 = new ColumnDescr( Cheese.class.getName(),
+ "stilton" );
+ lhs.addDescr( column2 );
+ column2.addDescr( fieldBindingDescr );
+
+ ruleDescr.setConsequence( "modify(stilton);" );
+
+ builder.addPackage( packageDescr );
+
+ And and = builder.getPackage().getRule( "rule-1" ).getLhs();
+ and.getChildren().get( 0 );
+
+ assertLength( 0,
+ builder.getErrors() );
+ }
+
private void createReturnValueRule(final PackageDescr packageDescr,
final String expression) {
final RuleDescr ruleDescr = new RuleDescr( "rule-1" );
@@ -792,7 +833,7 @@
ruleDescr.setLhs( lhs );
final ColumnDescr column = new ColumnDescr( Cheese.class.getName(),
- "stilton" );
+ "stilton" );
lhs.addDescr( column );
FieldBindingDescr fieldBindingDescr = new FieldBindingDescr( "price",
@@ -806,8 +847,8 @@
"java.util.Map" );
final ReturnValueDescr returnValue = new ReturnValueDescr( "price",
- "==",
- expression );
+ "==",
+ expression );
column.addDescr( returnValue );
ruleDescr.setConsequence( "modify(stilton);" );
@@ -822,19 +863,19 @@
ruleDescr.setLhs( lhs );
final ColumnDescr column = new ColumnDescr( Cheese.class.getName(),
- "stilton" );
+ "stilton" );
lhs.addDescr( column );
final FieldBindingDescr fieldBindingDescr = new FieldBindingDescr( "price",
- "x" );
+ "x" );
column.addDescr( fieldBindingDescr );
packageDescr.addGlobal( "map",
"java.util.Map" );
final PredicateDescr predicate = new PredicateDescr( "price",
- "y",
- expression );
+ "y",
+ expression );
column.addDescr( predicate );
ruleDescr.setConsequence( "modify(stilton);" );
@@ -893,11 +934,11 @@
lhs.addDescr( (PatternDescr) ceDescr );
final ColumnDescr columnDescr = new ColumnDescr( Cheese.class.getName(),
- "stilton" );
+ "stilton" );
final LiteralDescr literalDescr = new LiteralDescr( "type",
- "==",
- "stilton" );
+ "==",
+ "stilton" );
columnDescr.addDescr( literalDescr );
ceDescr.addDescr( columnDescr );
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-06-29 01:40:30 UTC (rev 4863)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java 2006-06-29 02:10:44 UTC (rev 4864)
@@ -19,6 +19,7 @@
import java.io.ByteArrayInputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
@@ -28,9 +29,13 @@
import org.drools.QueryResults;
import org.drools.RuleBase;
import org.drools.WorkingMemory;
+import org.drools.compiler.DrlParser;
import org.drools.compiler.PackageBuilder;
+import org.drools.lang.DrlDumper;
+import org.drools.lang.descr.PackageDescr;
import org.drools.rule.Package;
import org.drools.rule.Rule;
+import org.drools.xml.XmlDumper;
/**
* This runs the integration test cases with the leaps implementation.
@@ -289,4 +294,90 @@
assertEquals( "help" , workingMemory.getObjects().get(1) );
}
+ // @FIXME this is broken for leaps
+ public void testDumpers() throws Exception {
+ assertTrue(true);
+// final DrlParser parser = new DrlParser();
+// final PackageDescr pkg = parser.parse( new InputStreamReader( getClass().getResourceAsStream( "test_Dumpers.drl" ) ) );
+//
+// PackageBuilder builder = new PackageBuilder();
+// builder.addPackage(pkg );
+//
+// RuleBase ruleBase = getRuleBase();
+// ruleBase.addPackage( builder.getPackage() );
+// WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+//
+// List list = new ArrayList();
+// workingMemory.setGlobal( "list",
+// list );
+//
+// final Cheese brie = new Cheese( "brie",
+// 12 );
+// workingMemory.assertObject( brie );
+//
+// workingMemory.fireAllRules();
+//
+// assertEquals( 3,
+// list.size() );
+// assertEquals( "3 1",
+// list.get( 0 ) );
+// assertEquals( "MAIN",
+// list.get( 1 ) );
+// assertEquals( "1 1",
+// list.get( 2 ) );
+//
+// final DrlDumper drlDumper = new DrlDumper();
+// final String drlResult = drlDumper.dump( pkg );
+// builder = new PackageBuilder();
+// builder.addPackageFromDrl( new StringReader( drlResult ) );
+//
+// ruleBase = getRuleBase();
+// ruleBase.addPackage( builder.getPackage() );
+// workingMemory = ruleBase.newWorkingMemory();
+//
+// list = new ArrayList();
+// workingMemory.setGlobal( "list",
+// list );
+//
+// workingMemory.assertObject( brie );
+//
+// workingMemory.fireAllRules();
+//
+// assertEquals( 3,
+// list.size() );
+// assertEquals( "3 1",
+// list.get( 0 ) );
+// assertEquals( "MAIN",
+// list.get( 1 ) );
+// assertEquals( "1 1",
+// list.get( 2 ) );
+//
+// final XmlDumper xmlDumper = new XmlDumper();
+// final String xmlResult = xmlDumper.dump( pkg );
+// builder = new PackageBuilder();
+// builder.addPackageFromXml( new StringReader( xmlResult ) );
+//
+// ruleBase = getRuleBase();
+// ruleBase.addPackage( builder.getPackage() );
+// workingMemory = ruleBase.newWorkingMemory();
+//
+// list = new ArrayList();
+// workingMemory.setGlobal( "list",
+// list );
+//
+// workingMemory.assertObject( brie );
+//
+// workingMemory.fireAllRules();
+//
+// assertEquals( 3,
+// list.size() );
+// assertEquals( "3 1",
+// list.get( 0 ) );
+// assertEquals( "MAIN",
+// list.get( 1 ) );
+// assertEquals( "1 1",
+// list.get( 2 ) );
+ }
+
+
}
|
