[jboss-svn-commits] JBL Code SVN: r7595 - in labs/jbossrules/trunk/drools-core/src: main/java/org/drools main/java/org/drools/rule test/java/org/drools test/java/org/drools/reteoo test/java/org/drools/rule
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 14 12:50:17 EST 2006
Author: tirelli
Date: 2006-11-14 12:50:07 -0500 (Tue, 14 Nov 2006)
New Revision: 7595
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/RuleBaseFactoryTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/CompositeObjectSinkAdapterTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java
Log:
JBRULES-515: fixing broken unit tests
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseFactory.java 2006-11-14 17:22:07 UTC (rev 7594)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseFactory.java 2006-11-14 17:50:07 UTC (rev 7595)
@@ -39,6 +39,10 @@
return RuleBaseFactory.newRuleBase( RuleBase.RETEOO, null );
}
+ public static RuleBase newRuleBase(final int type) {
+ return RuleBaseFactory.newRuleBase( type, null );
+ }
+
/** Create a new RuleBase of the appropriate type */
public static RuleBase newRuleBase(final int type, final RuleBaseConfiguration config) {
switch ( type ) {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java 2006-11-14 17:22:07 UTC (rev 7594)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java 2006-11-14 17:50:07 UTC (rev 7595)
@@ -84,7 +84,7 @@
this.localDeclarations = localDeclarations;
}
- this.requiredDeclarations = new Declaration[ previousDeclarations.length + localDeclarations.length ];
+ this.requiredDeclarations = new Declaration[ this.previousDeclarations.length + this.localDeclarations.length ];
System.arraycopy( this.previousDeclarations, 0, this.requiredDeclarations, 0, this.previousDeclarations.length );
System.arraycopy( this.localDeclarations, 0, this.requiredDeclarations, this.previousDeclarations.length, this.localDeclarations.length );
}
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/RuleBaseFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/RuleBaseFactoryTest.java 2006-11-14 17:22:07 UTC (rev 7594)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/RuleBaseFactoryTest.java 2006-11-14 17:50:07 UTC (rev 7595)
@@ -30,7 +30,7 @@
assertTrue( !"".equals( ((InternalRuleBase) rb).getId() ) );
assertNotNull( ((InternalRuleBase) rb).getId() );
- final RuleBase rb2 = RuleBaseFactory.newRuleBase( RuleBase.RETEOO );
+ final RuleBase rb2 = RuleBaseFactory.newRuleBase( RuleBase.RETEOO, null );
assertTrue( rb2 instanceof org.drools.reteoo.ReteooRuleBase );
assertNotSame( rb2,
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/CompositeObjectSinkAdapterTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/CompositeObjectSinkAdapterTest.java 2006-11-14 17:22:07 UTC (rev 7594)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/CompositeObjectSinkAdapterTest.java 2006-11-14 17:50:07 UTC (rev 7595)
@@ -10,7 +10,6 @@
import org.drools.base.field.ObjectFieldImpl;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
-import org.drools.rule.Declaration;
import org.drools.rule.LiteralConstraint;
import org.drools.rule.PredicateConstraint;
import org.drools.spi.FieldExtractor;
@@ -47,7 +46,7 @@
public void testAlphaWithPredicate() {
CompositeObjectSinkAdapter ad = new CompositeObjectSinkAdapter();
- AlphaNode al = new AlphaNode(0, new PredicateConstraint(null, (Declaration[]) null), null);
+ AlphaNode al = new AlphaNode(0, new PredicateConstraint(null, null), null);
ad.addObjectSink( al );
assertEquals(1, ad.getSinks().length);
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java 2006-11-14 17:22:07 UTC (rev 7594)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java 2006-11-14 17:50:07 UTC (rev 7595)
@@ -187,9 +187,10 @@
public boolean evaluate(Object object,
Tuple tuple,
Declaration declaration,
- Declaration[] declarations,
+ Declaration[] previousDeclarations,
+ Declaration[] localDeclarations,
WorkingMemory workingMemory) {
- int price1 = declarations[0].getIntValue( workingMemory.getObject( tuple.get( declarations[0] ) ) );
+ int price1 = previousDeclarations[0].getIntValue( workingMemory.getObject( tuple.get( previousDeclarations[0] ) ) );
int price2 = declaration.getIntValue( object );
return (price2 == (price1 * 2));
@@ -199,7 +200,8 @@
final PredicateConstraint constraint1 = new PredicateConstraint( evaluator,
price2Declaration,
- new Declaration[]{price1Declaration} );
+ new Declaration[]{price1Declaration},
+ new Declaration[0] );
final Cheese cheddar0 = new Cheese( "cheddar",
5 );
@@ -253,24 +255,34 @@
*/
private static final long serialVersionUID = 5673999834006100045L;
- public FieldValue evaluate(Tuple tuple, // ?price
- Declaration[] declarations,
+ public FieldValue evaluate(Object object,
+ Tuple tuple, // ?price
+ Declaration[] previousDeclarations,
+ Declaration[] localDeclarations,
WorkingMemory workingMemory) {
- int price = ((Number) declarations[0].getValue( workingMemory.getObject( tuple.get( declarations[0] ) ) )).intValue();
+ int price = ((Number) previousDeclarations[0].getValue( workingMemory.getObject( tuple.get( previousDeclarations[0] ) ) )).intValue();
return FieldFactory.getFieldValue( 2 * price );
}
};
+
+ ReturnValueRestriction restriction1 = new ReturnValueRestriction( priceExtractor,
+ isDoubleThePrice,
+ new Declaration[]{priceDeclaration},
+ new Declaration[0],
+ ValueType.INTEGER_TYPE.getEvaluator( Operator.EQUAL ) );
final ReturnValueConstraint constraint1 = new ReturnValueConstraint( priceExtractor,
- isDoubleThePrice,
- new Declaration[]{priceDeclaration},
- ValueType.INTEGER_TYPE.getEvaluator( Operator.EQUAL ) );
+ restriction1 );
+ ReturnValueRestriction restriction2 = new ReturnValueRestriction( priceExtractor,
+ isDoubleThePrice,
+ new Declaration[]{priceDeclaration},
+ new Declaration[0],
+ ValueType.INTEGER_TYPE.getEvaluator( Operator.GREATER ) );
+
final ReturnValueConstraint constraint2 = new ReturnValueConstraint( priceExtractor,
- isDoubleThePrice,
- new Declaration[]{priceDeclaration},
- ValueType.INTEGER_TYPE.getEvaluator( Operator.GREATER ) );
+ restriction2 );
final Cheese cheddar0 = new Cheese( "cheddar",
5 );
More information about the jboss-svn-commits
mailing list