Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4040 - in labs/jbossrules/trunk/drools-core/src: main/java/org/drools/reteoo test/java/org/drools/reteoo
|
From: <jbo...@li...> - 2006-05-02 12:47:42
|
Author: mar...@jb...
Date: 2006-05-02 08:47:36 -0400 (Tue, 02 May 2006)
New Revision: 4040
Added:
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/EvalConditionNodeTest.java
Removed:
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/EvalNodeTest.java
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java
Log:
JBRULES-246 NPE on retract()
-Added fixed unit test that recreated the error in core
-line 148 in EvalConditionNode the logic is wrong. I've changed it to:
if ( tuple.getLinkedTuples() != null ) {
The idea is we only want to attempt to retract the tuple if we know its in the nodes memory and has propagated children - othwerwise we know that previous assert evaluations were false.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java 2006-05-02 12:35:52 UTC (rev 4039)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java 2006-05-02 12:47:36 UTC (rev 4040)
@@ -145,7 +145,7 @@
LinkedList memory = (LinkedList) workingMemory.getNodeMemory( this );
// checks if the tuple is attach to tuple
- if ( (tuple.getNext() != null && tuple.getPrevious() != null) || memory.getFirst() == tuple ) {
+ if ( tuple.getLinkedTuples() != null ) {
memory.remove( tuple );
propagateRetractTuple( tuple,
Copied: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/EvalConditionNodeTest.java (from rev 4024, labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/EvalNodeTest.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/EvalNodeTest.java 2006-05-01 08:06:45 UTC (rev 4024)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/EvalConditionNodeTest.java 2006-05-02 12:47:36 UTC (rev 4040)
@@ -0,0 +1,374 @@
+package org.drools.reteoo;
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+
+
+import java.util.List;
+
+import org.drools.DroolsTestCase;
+import org.drools.FactException;
+import org.drools.common.PropagationContextImpl;
+import org.drools.spi.PropagationContext;
+import org.drools.util.LinkedList;
+
+public class EvalConditionNodeTest extends DroolsTestCase {
+ private PropagationContext context;
+ private WorkingMemoryImpl workingMemory;
+
+ public EvalConditionNodeTest(String name) {
+ super( name );
+ }
+
+ public void setUp() {
+ this.context = new PropagationContextImpl( 0,
+ PropagationContext.ASSERTION,
+ null,
+ null );
+
+ this.workingMemory = new WorkingMemoryImpl( new RuleBaseImpl() );
+ }
+
+ public void testAttach() throws Exception {
+ MockTupleSource source = new MockTupleSource( 12 );
+
+ EvalConditionNode node = new EvalConditionNode( 18,
+ source,
+ new MockEvalCondition( true ) );
+
+ assertEquals( 18,
+ node.getId() );
+
+ assertLength( 0,
+ source.getTupleSinks() );
+
+ node.attach();
+
+ assertLength( 1,
+ source.getTupleSinks() );
+
+ assertSame( node,
+ source.getTupleSinks().get( 0 ) );
+ }
+
+ public void testMemory() {
+ WorkingMemoryImpl workingMemory = new WorkingMemoryImpl( new RuleBaseImpl() );
+
+ MockTupleSource source = new MockTupleSource( 12 );
+
+ EvalConditionNode node = new EvalConditionNode( 18,
+ source,
+ new MockEvalCondition( true ) );
+
+ LinkedList memory = (LinkedList) workingMemory.getNodeMemory( node );
+
+ assertNotNull( memory );
+ }
+
+ /**
+ * If a eval allows an incoming Object, then the Object MUST be
+ * propagated. This tests that the memory is updated
+ *
+ * @throws FactException
+ */
+ public void testAllowed() throws FactException {
+
+ // Create a test node that always returns true
+ EvalConditionNode node = new EvalConditionNode( 1,
+ new MockTupleSource( 15 ),
+ new MockEvalCondition( true ) );
+
+ MockTupleSink sink = new MockTupleSink();
+ node.addTupleSink( sink );
+
+ // Create the Tuple
+ FactHandleImpl f0 = new FactHandleImpl( 0 );
+ ReteTuple tuple = new ReteTuple( f0 );
+
+ // Tuple should pass and propagate
+ node.assertTuple( tuple,
+ this.context,
+ this.workingMemory );
+
+ // Check memory was populated
+ LinkedList memory = (LinkedList) this.workingMemory.getNodeMemory( node );
+
+ assertEquals( 1,
+ memory.size() );
+ assertEquals( tuple,
+ memory.getFirst() );
+
+ // Now test that the fact is retracted correctly
+ node.retractTuple( tuple,
+ context,
+ workingMemory );
+
+ // Now test that the fact is retracted correctly
+ assertEquals( 0,
+ memory.size() );
+ }
+
+ /**
+ * If a Condition does not allow an incoming Object, then the object MUST
+ * NOT be propagated.
+ *
+ * @throws FactException
+ */
+ public void testNotAllowed() throws FactException {
+ // Create a test node that always returns false
+ EvalConditionNode node = new EvalConditionNode( 1,
+ new MockTupleSource( 15 ),
+ new MockEvalCondition( false ) );
+
+ MockTupleSink sink = new MockTupleSink();
+ node.addTupleSink( sink );
+
+ // Create the Tuple
+ FactHandleImpl f0 = new FactHandleImpl( 0 );
+ ReteTuple tuple = new ReteTuple( f0 );
+
+ // Tuple should pass and propagate
+ node.assertTuple( tuple,
+ this.context,
+ this.workingMemory );
+
+ // make sure no assertions were propagated
+ assertEquals( 0,
+ sink.getAsserted().size() );
+
+ }
+
+ public void testRetractNotAllowed() throws Exception {
+ // Create a test node that always returns false
+ EvalConditionNode node = new EvalConditionNode( 1,
+ new MockTupleSource( 15 ),
+ new MockEvalCondition( false ) );
+
+ MockTupleSink sink = new MockTupleSink();
+ node.addTupleSink( sink );
+
+ // Create the Tuple
+ FactHandleImpl f0 = new FactHandleImpl( 0 );
+ ReteTuple tuple = new ReteTuple( f0 );
+
+ // Tuple should pass and propagate
+ node.assertTuple( tuple,
+ this.context,
+ this.workingMemory );
+
+ node.retractTuple( tuple,
+ context,
+ workingMemory );
+
+ // make sure no assertions were propagated
+ assertEquals( 0,
+ sink.getRetracted().size() );
+ }
+
+ public void testRetractAllowed() throws Exception {
+ // Create a test node that always returns false
+ EvalConditionNode node = new EvalConditionNode( 1,
+ new MockTupleSource( 15 ),
+ new MockEvalCondition( true ) );
+
+ MockTupleSink sink = new MockTupleSink();
+ node.addTupleSink( sink );
+
+ // Create the Tuple
+ FactHandleImpl f0 = new FactHandleImpl( 0 );
+ f0.setObject( "stilton" );
+ ReteTuple tuple0 = new ReteTuple( f0 );
+
+ // Tuple should pass and propagate
+ node.assertTuple( tuple0,
+ this.context,
+ this.workingMemory );
+
+ // we create and retract two tuples, checking the linkedtuples is null for JBRULES-246 "NPE on retract()"
+ // Create the Tuple
+ FactHandleImpl f1 = new FactHandleImpl( 1 );
+ f0.setObject( "cheddar" );
+ ReteTuple tuple1 = new ReteTuple( f1 );
+
+ // Tuple should pass and propagate
+ node.assertTuple( tuple1,
+ this.context,
+ this.workingMemory );
+
+ // to stimulate JBRULES-246 we retract the second tuple1 first.
+ node.retractTuple( tuple1,
+ context,
+ workingMemory );
+
+ List list = sink.getRetracted();
+
+ // make sure no assertions were propagated
+ assertEquals( 1,
+ sink.getRetracted().size() );
+
+ ReteTuple retractedTuple0 = ( ReteTuple ) ( ( Object[] ) list.get( 0 ) )[0];
+ assertNull( retractedTuple0.getLinkedTuples() );
+
+ node.retractTuple( tuple0,
+ context,
+ workingMemory );
+
+ // make sure no assertions were propagated
+ assertEquals( 2,
+ sink.getRetracted().size() );
+
+
+ ReteTuple retractedTuple1 = ( ReteTuple ) ( ( Object[] ) list.get( 1) )[0];
+ assertNull( retractedTuple1.getLinkedTuples() );
+
+ assertNotSame( retractedTuple0, retractedTuple1);
+ }
+
+ public void testModifyNotAllowed() throws Exception {
+ // Create a test node that always returns false
+ EvalConditionNode node = new EvalConditionNode( 1,
+ new MockTupleSource( 15 ),
+ new MockEvalCondition( false ) );
+
+ MockTupleSink sink = new MockTupleSink();
+ node.addTupleSink( sink );
+
+ // Create the Tuple
+ FactHandleImpl f0 = new FactHandleImpl( 0 );
+ ReteTuple tuple = new ReteTuple( f0 );
+
+ // Tuple should pass and propagate
+ node.assertTuple( tuple,
+ this.context,
+ this.workingMemory );
+
+ node.modifyTuple( tuple,
+ context,
+ workingMemory );
+
+ // make sure no assertions were propagated
+ assertEquals( 0,
+ sink.getRetracted().size() );
+ assertEquals( 0,
+ sink.getModified().size() );
+ assertEquals( 0,
+ sink.getAsserted().size() );
+ }
+
+ public void testModifyAllowed() throws Exception {
+ // Create a test node that always returns false
+ EvalConditionNode node = new EvalConditionNode( 1,
+ new MockTupleSource( 15 ),
+ new MockEvalCondition( true ) );
+
+ MockTupleSink sink = new MockTupleSink();
+ node.addTupleSink( sink );
+
+ // Create the Tuple
+ FactHandleImpl f0 = new FactHandleImpl( 0 );
+ ReteTuple tuple = new ReteTuple( f0 );
+
+ // Tuple should pass and propagate
+ node.assertTuple( tuple,
+ this.context,
+ this.workingMemory );
+
+ node.modifyTuple( tuple,
+ context,
+ workingMemory );
+
+ // make sure no assertions were propagated
+ assertEquals( 1,
+ sink.getModified().size() );
+ }
+
+ // public void testException() throws FactException {
+ // // Create a eval that will always throw an exception
+ // MockCondition eval = new MockCondition( true );
+ // eval.setTestException( true );
+ //
+ // // Create the TestNode
+ // EvalConditionNode node = new EvalConditionNode( 1,
+ // new MockTupleSource( 15 ),
+ // eval );
+ //
+ // MockTupleSink sink = new MockTupleSink();
+ // node.addTupleSink( sink );
+ //
+ // /* Create the Tuple */
+ // FactHandleImpl f0 = new FactHandleImpl( 0 );
+ // ReteTuple tuple = new ReteTuple( f0 );
+ //
+ // /* When asserting the node should throw an exception */
+ // try {
+ // node.assertTuple( tuple,
+ // this.context,
+ // this.workingMemory );
+ // fail( "Should have thrown TestException" );
+ // } catch ( TestException e ) {
+ // // should throw exception
+ // }
+ // }
+
+ public void testUpdateWithMemory() throws FactException {
+ // If no child nodes have children then we need to re-process the left
+ // and right memories
+ // as a joinnode does not store the resulting tuples
+ WorkingMemoryImpl workingMemory = new WorkingMemoryImpl( new RuleBaseImpl() );
+
+ // Creat the object source so we can detect the alphaNode telling it to
+ // propate its contents
+ MockTupleSource source = new MockTupleSource( 1 );
+
+ /* Create a test node that always returns true */
+ EvalConditionNode node = new EvalConditionNode( 1,
+ new MockTupleSource( 15 ),
+ new MockEvalCondition( true ) );
+
+ // Add the first tuple sink and assert a tuple and object
+ // The sink has no memory
+ MockTupleSink sink1 = new MockTupleSink( 2 );
+ node.addTupleSink( sink1 );
+
+ FactHandleImpl f0 = new FactHandleImpl( 0 );
+ workingMemory.putObject( f0,
+ "string0" );
+
+ ReteTuple tuple1 = new ReteTuple( f0 );
+
+ node.assertTuple( tuple1,
+ this.context,
+ workingMemory );
+
+ assertLength( 1,
+ sink1.getAsserted() );
+
+ // Add the new sink, this should be updated from the re-processed
+ // joinnode memory
+ MockTupleSink sink2 = new MockTupleSink( 3 );
+ node.addTupleSink( sink2 );
+ assertLength( 0,
+ sink2.getAsserted() );
+
+ node.updateNewNode( workingMemory,
+ this.context );
+
+ assertLength( 1,
+ sink2.getAsserted() );
+ }
+}
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/EvalNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/EvalNodeTest.java 2006-05-02 12:35:52 UTC (rev 4039)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/EvalNodeTest.java 2006-05-02 12:47:36 UTC (rev 4040)
@@ -1,340 +0,0 @@
-package org.drools.reteoo;
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-
-import org.drools.DroolsTestCase;
-import org.drools.FactException;
-import org.drools.common.PropagationContextImpl;
-import org.drools.spi.PropagationContext;
-import org.drools.util.LinkedList;
-
-public class EvalNodeTest extends DroolsTestCase {
- private PropagationContext context;
- private WorkingMemoryImpl workingMemory;
-
- public EvalNodeTest(String name) {
- super( name );
- }
-
- public void setUp() {
- this.context = new PropagationContextImpl( 0,
- PropagationContext.ASSERTION,
- null,
- null );
-
- this.workingMemory = new WorkingMemoryImpl( new RuleBaseImpl() );
- }
-
- public void testAttach() throws Exception {
- MockTupleSource source = new MockTupleSource( 12 );
-
- EvalConditionNode node = new EvalConditionNode( 18,
- source,
- new MockEvalCondition( true ) );
-
- assertEquals( 18,
- node.getId() );
-
- assertLength( 0,
- source.getTupleSinks() );
-
- node.attach();
-
- assertLength( 1,
- source.getTupleSinks() );
-
- assertSame( node,
- source.getTupleSinks().get( 0 ) );
- }
-
- public void testMemory() {
- WorkingMemoryImpl workingMemory = new WorkingMemoryImpl( new RuleBaseImpl() );
-
- MockTupleSource source = new MockTupleSource( 12 );
-
- EvalConditionNode node = new EvalConditionNode( 18,
- source,
- new MockEvalCondition( true ) );
-
- LinkedList memory = (LinkedList) workingMemory.getNodeMemory( node );
-
- assertNotNull( memory );
- }
-
- /**
- * If a eval allows an incoming Object, then the Object MUST be
- * propagated. This tests that the memory is updated
- *
- * @throws FactException
- */
- public void testAllowed() throws FactException {
-
- // Create a test node that always returns true
- EvalConditionNode node = new EvalConditionNode( 1,
- new MockTupleSource( 15 ),
- new MockEvalCondition( true ) );
-
- MockTupleSink sink = new MockTupleSink();
- node.addTupleSink( sink );
-
- // Create the Tuple
- FactHandleImpl f0 = new FactHandleImpl( 0 );
- ReteTuple tuple = new ReteTuple( f0 );
-
- // Tuple should pass and propagate
- node.assertTuple( tuple,
- this.context,
- this.workingMemory );
-
- // Check memory was populated
- LinkedList memory = (LinkedList) this.workingMemory.getNodeMemory( node );
-
- assertEquals( 1,
- memory.size() );
- assertEquals( tuple,
- memory.getFirst() );
-
- // Now test that the fact is retracted correctly
- node.retractTuple( tuple,
- context,
- workingMemory );
-
- // Now test that the fact is retracted correctly
- assertEquals( 0,
- memory.size() );
- }
-
- /**
- * If a Condition does not allow an incoming Object, then the object MUST
- * NOT be propagated.
- *
- * @throws FactException
- */
- public void testNotAllowed() throws FactException {
- // Create a test node that always returns false
- EvalConditionNode node = new EvalConditionNode( 1,
- new MockTupleSource( 15 ),
- new MockEvalCondition( false ) );
-
- MockTupleSink sink = new MockTupleSink();
- node.addTupleSink( sink );
-
- // Create the Tuple
- FactHandleImpl f0 = new FactHandleImpl( 0 );
- ReteTuple tuple = new ReteTuple( f0 );
-
- // Tuple should pass and propagate
- node.assertTuple( tuple,
- this.context,
- this.workingMemory );
-
- // make sure no assertions were propagated
- assertEquals( 0,
- sink.getAsserted().size() );
-
- }
-
- public void testRetractNotAllowed() throws Exception {
- // Create a test node that always returns false
- EvalConditionNode node = new EvalConditionNode( 1,
- new MockTupleSource( 15 ),
- new MockEvalCondition( false ) );
-
- MockTupleSink sink = new MockTupleSink();
- node.addTupleSink( sink );
-
- // Create the Tuple
- FactHandleImpl f0 = new FactHandleImpl( 0 );
- ReteTuple tuple = new ReteTuple( f0 );
-
- // Tuple should pass and propagate
- node.assertTuple( tuple,
- this.context,
- this.workingMemory );
-
- node.retractTuple( tuple,
- context,
- workingMemory );
-
- // make sure no assertions were propagated
- assertEquals( 0,
- sink.getRetracted().size() );
- }
-
- public void testRetractAllowed() throws Exception {
- // Create a test node that always returns false
- EvalConditionNode node = new EvalConditionNode( 1,
- new MockTupleSource( 15 ),
- new MockEvalCondition( true ) );
-
- MockTupleSink sink = new MockTupleSink();
- node.addTupleSink( sink );
-
- // Create the Tuple
- FactHandleImpl f0 = new FactHandleImpl( 0 );
- ReteTuple tuple = new ReteTuple( f0 );
-
- // Tuple should pass and propagate
- node.assertTuple( tuple,
- this.context,
- this.workingMemory );
-
- node.retractTuple( tuple,
- context,
- workingMemory );
-
- // make sure no assertions were propagated
- assertEquals( 1,
- sink.getRetracted().size() );
- }
-
- public void testModifyNotAllowed() throws Exception {
- // Create a test node that always returns false
- EvalConditionNode node = new EvalConditionNode( 1,
- new MockTupleSource( 15 ),
- new MockEvalCondition( false ) );
-
- MockTupleSink sink = new MockTupleSink();
- node.addTupleSink( sink );
-
- // Create the Tuple
- FactHandleImpl f0 = new FactHandleImpl( 0 );
- ReteTuple tuple = new ReteTuple( f0 );
-
- // Tuple should pass and propagate
- node.assertTuple( tuple,
- this.context,
- this.workingMemory );
-
- node.modifyTuple( tuple,
- context,
- workingMemory );
-
- // make sure no assertions were propagated
- assertEquals( 0,
- sink.getRetracted().size() );
- assertEquals( 0,
- sink.getModified().size() );
- assertEquals( 0,
- sink.getAsserted().size() );
- }
-
- public void testModifyAllowed() throws Exception {
- // Create a test node that always returns false
- EvalConditionNode node = new EvalConditionNode( 1,
- new MockTupleSource( 15 ),
- new MockEvalCondition( true ) );
-
- MockTupleSink sink = new MockTupleSink();
- node.addTupleSink( sink );
-
- // Create the Tuple
- FactHandleImpl f0 = new FactHandleImpl( 0 );
- ReteTuple tuple = new ReteTuple( f0 );
-
- // Tuple should pass and propagate
- node.assertTuple( tuple,
- this.context,
- this.workingMemory );
-
- node.modifyTuple( tuple,
- context,
- workingMemory );
-
- // make sure no assertions were propagated
- assertEquals( 1,
- sink.getModified().size() );
- }
-
- // public void testException() throws FactException {
- // // Create a eval that will always throw an exception
- // MockCondition eval = new MockCondition( true );
- // eval.setTestException( true );
- //
- // // Create the TestNode
- // EvalConditionNode node = new EvalConditionNode( 1,
- // new MockTupleSource( 15 ),
- // eval );
- //
- // MockTupleSink sink = new MockTupleSink();
- // node.addTupleSink( sink );
- //
- // /* Create the Tuple */
- // FactHandleImpl f0 = new FactHandleImpl( 0 );
- // ReteTuple tuple = new ReteTuple( f0 );
- //
- // /* When asserting the node should throw an exception */
- // try {
- // node.assertTuple( tuple,
- // this.context,
- // this.workingMemory );
- // fail( "Should have thrown TestException" );
- // } catch ( TestException e ) {
- // // should throw exception
- // }
- // }
-
- public void testUpdateWithMemory() throws FactException {
- // If no child nodes have children then we need to re-process the left
- // and right memories
- // as a joinnode does not store the resulting tuples
- WorkingMemoryImpl workingMemory = new WorkingMemoryImpl( new RuleBaseImpl() );
-
- // Creat the object source so we can detect the alphaNode telling it to
- // propate its contents
- MockTupleSource source = new MockTupleSource( 1 );
-
- /* Create a test node that always returns true */
- EvalConditionNode node = new EvalConditionNode( 1,
- new MockTupleSource( 15 ),
- new MockEvalCondition( true ) );
-
- // Add the first tuple sink and assert a tuple and object
- // The sink has no memory
- MockTupleSink sink1 = new MockTupleSink( 2 );
- node.addTupleSink( sink1 );
-
- FactHandleImpl f0 = new FactHandleImpl( 0 );
- workingMemory.putObject( f0,
- "string0" );
-
- ReteTuple tuple1 = new ReteTuple( f0 );
-
- node.assertTuple( tuple1,
- this.context,
- workingMemory );
-
- assertLength( 1,
- sink1.getAsserted() );
-
- // Add the new sink, this should be updated from the re-processed
- // joinnode memory
- MockTupleSink sink2 = new MockTupleSink( 3 );
- node.addTupleSink( sink2 );
- assertLength( 0,
- sink2.getAsserted() );
-
- node.updateNewNode( workingMemory,
- this.context );
-
- assertLength( 1,
- sink2.getAsserted() );
- }
-}
\ No newline at end of file
|
