[jboss-svn-commits] JBL Code SVN: r11338 - labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clp.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Apr 25 20:29:41 EDT 2007
Author: mark.proctor at jboss.com
Date: 2007-04-25 20:29:41 -0400 (Wed, 25 Apr 2007)
New Revision: 11338
Modified:
labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clp/AddFunctionTest.java
labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clp/LhsClpParserTest.java
Log:
JBRULES-816 Refactor Column to be Pattern
Modified: labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clp/AddFunctionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clp/AddFunctionTest.java 2007-04-25 23:30:55 UTC (rev 11337)
+++ labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clp/AddFunctionTest.java 2007-04-26 00:29:41 UTC (rev 11338)
@@ -17,9 +17,9 @@
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
import org.drools.reteoo.ReteTuple;
-import org.drools.rule.Column;
+import org.drools.rule.Pattern;
import org.drools.rule.Declaration;
-import org.drools.spi.ColumnExtractor;
+import org.drools.spi.PatternExtractor;
import org.drools.spi.ObjectType;
import junit.framework.TestCase;
@@ -57,35 +57,35 @@
public void testNestedAddWithVars() {
RuleBase ruleBase = RuleBaseFactory.newRuleBase();
- InternalWorkingMemory workingMemory = (InternalWorkingMemory) ruleBase.newWorkingMemory();
+ InternalWorkingMemory workingMemory = (InternalWorkingMemory) ruleBase.newStatefulSession();
InternalFactHandle factHandle = (InternalFactHandle) workingMemory.assertObject( new BigDecimal( 10 ) );
ReteTuple tuple = new ReteTuple( factHandle );
ObjectType objectType = new ClassObjectType( BigDecimal.class );
- Column column0 = new Column( 0,
- objectType );
- Column column1 = new Column( 1,
- objectType );
- ColumnExtractor extractor = new ColumnExtractor( objectType );
+ Pattern pattern0 = new Pattern( 0,
+ objectType );
+ Pattern pattern1 = new Pattern( 1,
+ objectType );
+ PatternExtractor extractor = new PatternExtractor( objectType );
-// VariableValueHandler pd = new CLPPreviousDeclarationVariable( new Declaration( "pd",
-// extractor,
-// column0 ) );
-//
-// VariableValueHandler ld = new CLPLocalDeclarationVariable( new Declaration( "ld",
-// extractor,
-// column1 ) );
+ // VariableValueHandler pd = new CLPPreviousDeclarationVariable( new Declaration( "pd",
+ // extractor,
+ // column0 ) );
+ //
+ // VariableValueHandler ld = new CLPLocalDeclarationVariable( new Declaration( "ld",
+ // extractor,
+ // column1 ) );
Map variables = new HashMap();
variables.put( "pd",
new CLPPreviousDeclarationVariable( new Declaration( "pd",
extractor,
- column0 ) ) );
+ pattern0 ) ) );
variables.put( "ld",
new CLPLocalDeclarationVariable( new Declaration( "ld",
extractor,
- column1 ) ) );
+ pattern1 ) ) );
ValueHandler val1 = new TempTokenVariable( "pd" );
ValueHandler val2 = new LocalVariableValue( "lv",
@@ -112,7 +112,7 @@
f.replaceTempTokens( variables );
assertEquals( new BigDecimal( 30 ),
- f.getBigDecimalValue( context ) );
+ f.getBigDecimalValue( context ) );
}
}
Modified: labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clp/LhsClpParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clp/LhsClpParserTest.java 2007-04-25 23:30:55 UTC (rev 11337)
+++ labs/jbossrules/trunk/drools-clips/src/test/java/org/drools/clp/LhsClpParserTest.java 2007-04-26 00:29:41 UTC (rev 11338)
@@ -17,7 +17,7 @@
import org.drools.compiler.SwitchingCommonTokenStream;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.AttributeDescr;
-import org.drools.lang.descr.ColumnDescr;
+import org.drools.lang.descr.PatternDescr;
import org.drools.lang.descr.EvalDescr;
import org.drools.lang.descr.ExistsDescr;
import org.drools.lang.descr.FieldConstraintDescr;
@@ -66,7 +66,7 @@
lhsList.size() );
// Parse the first column
- ColumnDescr col = (ColumnDescr) lhsList.get( 0 );
+ PatternDescr col = (PatternDescr) lhsList.get( 0 );
assertEquals( "?b",
col.getIdentifier() );
assertEquals( "person",
@@ -131,7 +131,7 @@
assertEquals( new LongValueHandler( 2 ), fc.getParameters()[1] );
// Parse the second column
- col = (ColumnDescr) lhsList.get( 1 );
+ col = (PatternDescr) lhsList.get( 1 );
assertEquals( "?c",
col.getIdentifier() );
assertEquals( "hobby",
@@ -187,7 +187,7 @@
lhsList.size() );
// Parse the first column
- ColumnDescr col = (ColumnDescr) lhsList.get( 0 );
+ PatternDescr col = (PatternDescr) lhsList.get( 0 );
assertEquals( "?b",
col.getIdentifier() );
assertEquals( "person",
@@ -206,7 +206,7 @@
orDescr.getDescrs().size() );
AndDescr andDescr = (AndDescr) orDescr.getDescrs().get( 0 );
- col = (ColumnDescr) andDescr.getDescrs().get( 0 );
+ col = (PatternDescr) andDescr.getDescrs().get( 0 );
assertEquals( "hobby1",
col.getObjectType() );
fieldConstraintDescr = (FieldConstraintDescr) col.getDescrs().get( 0 );
@@ -218,7 +218,7 @@
assertEquals( "qqq1",
litDescr.getText() );
- col = (ColumnDescr) andDescr.getDescrs().get( 1 );
+ col = (PatternDescr) andDescr.getDescrs().get( 1 );
assertEquals( "hobby2",
col.getObjectType() );
fieldConstraintDescr = (FieldConstraintDescr) col.getDescrs().get( 0 );
@@ -230,7 +230,7 @@
assertEquals( "qqq2",
litDescr.getText() );
- col = (ColumnDescr) orDescr.getDescrs().get( 1 );
+ col = (PatternDescr) orDescr.getDescrs().get( 1 );
assertEquals( "food",
col.getObjectType() );
fieldConstraintDescr = (FieldConstraintDescr) col.getDescrs().get( 0 );
@@ -258,7 +258,7 @@
assertEquals( 2,
orDescr.getDescrs().size() );
- ColumnDescr col = (ColumnDescr) orDescr.getDescrs().get( 0 );
+ PatternDescr col = (PatternDescr) orDescr.getDescrs().get( 0 );
assertEquals( "hobby1",
col.getObjectType() );
FieldConstraintDescr fieldConstraintDescr = (FieldConstraintDescr) col.getDescrs().get( 0 );
@@ -277,7 +277,7 @@
AndDescr andDescr = (AndDescr) notDescr.getDescrs().get( 0 );
assertEquals( 2, andDescr.getDescrs().size() );
ExistsDescr existsDescr = (ExistsDescr) andDescr.getDescrs().get( 0 );
- col = (ColumnDescr) existsDescr.getDescrs().get( 0 );
+ col = (PatternDescr) existsDescr.getDescrs().get( 0 );
assertEquals( "person",
col.getObjectType() );
fieldConstraintDescr = (FieldConstraintDescr) col.getDescrs().get( 0 );
@@ -289,7 +289,7 @@
assertEquals( "ppp",
litDescr.getText() );
- col = (ColumnDescr) andDescr.getDescrs().get( 1 );
+ col = (PatternDescr) andDescr.getDescrs().get( 1 );
assertEquals( "person",
col.getObjectType() );
fieldConstraintDescr = (FieldConstraintDescr) col.getDescrs().get( 0 );
More information about the jboss-svn-commits
mailing list