From: <jbo...@li...> - 2006-03-03 03:36:14
|
Author: bagerman Date: 2006-03-02 22:36:04 -0500 (Thu, 02 Mar 2006) New Revision: 2726 Removed: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/PendingTupleTest.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/PostedActivationTest.java Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Edge.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Junction.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/LeapsWaltzTest.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Line.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/ReteooWaltzTest.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Stage.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/WaltzUtil.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/FactHandleImplTest.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/HandleFactoryTest.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/HandleTest.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/LeapsTupleTest.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/util/TableIteratorTest.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/util/TableRecordTest.java trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/util/TableTest.java Log: Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -30,7 +30,7 @@ ruleBase.addRuleSet( this.pkg ); WorkingMemory workingMemory = ruleBase.newWorkingMemory(); - InputStream is = getClass().getResourceAsStream( "/manners5.dat" ); + InputStream is = getClass().getResourceAsStream( "/manners64.dat" ); List list = getInputObjects( is ); for ( Iterator it = list.iterator(); it.hasNext(); ) { Object object = it.next(); Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Edge.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Edge.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Edge.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -1,5 +1,27 @@ package org.drools.examples.waltz; +/* + * Copyright 2006 Alexander Bagerman + * + * 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. + */ + + +/** + * @author Alexander Bagerman + * + */ + public class Edge { private int p1; @@ -48,9 +70,9 @@ } public String toString() { - return "{Edge p1=" + this.p1 + ", p2=" + this.p2 + ", joined=" - + this.joined + ", label=" + this.label + ", plotted" - + this.plotted + "}"; + return "Edge p1=" + this.p1 + ", p2=" + this.p2 + ", joined=" + + this.joined + ", label=" + this.label + ", plotted=" + + this.plotted; } public boolean isJoined() { Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Junction.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Junction.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Junction.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -1,5 +1,27 @@ package org.drools.examples.waltz; +/* + * Copyright 2006 Alexander Bagerman + * + * 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. + */ + + +/** + * @author Alexander Bagerman + * + */ + public class Junction { public static String TEE = "tee"; Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/LeapsWaltzTest.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/LeapsWaltzTest.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/LeapsWaltzTest.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -1,6 +1,27 @@ package org.drools.examples.waltz; -import java.beans.IntrospectionException; +/* + * Copyright 2006 Alexander Bagerman + * + * 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. + */ + + +/** + * @author Alexander Bagerman + * + */ + import java.io.IOException; import java.io.InputStream; import java.util.Iterator; @@ -8,40 +29,62 @@ import org.drools.FactException; import org.drools.PackageIntegrationException; -import org.drools.RuleIntegrationException; import org.drools.WorkingMemory; -import org.drools.rule.DuplicateRuleNameException; import org.drools.rule.InvalidPatternException; -import org.drools.rule.InvalidRuleException; +/** + * + * @author Alexander Bagerman + * + */ public class LeapsWaltzTest extends BaseWaltzTest { - public void testWaltz() throws DuplicateRuleNameException, - InvalidRuleException, - IntrospectionException, - RuleIntegrationException, - PackageIntegrationException, + public void testWaltz() throws PackageIntegrationException, InvalidPatternException, FactException, - IOException, - InterruptedException { + IOException { final org.drools.leaps.RuleBaseImpl ruleBase = new org.drools.leaps.RuleBaseImpl(); ruleBase.addRuleSet( this.pkg ); WorkingMemory workingMemory = ruleBase.newWorkingMemory(); -// -// InputStream is = getClass().getResourceAsStream( "/waltz12.dat" ); -// List list = getInputObjects( is ); -// for ( Iterator it = list.iterator(); it.hasNext(); ) { -// Object object = it.next(); -// workingMemory.assertObject( object ); -// } - workingMemory.assertObject( new Stage(Stage.START) ); + InputStream is = getClass().getResourceAsStream( "/waltz12.dat" ); + List list = getInputObjects( is ); + for ( Iterator it = list.iterator(); it.hasNext(); ) { + Object object = it.next(); + workingMemory.assertObject( object ); + } +// workingMemory.assertObject( new Stage(Stage.START) ); + long start = System.currentTimeMillis(); workingMemory.fireAllRules(); - System.err.println( System.currentTimeMillis() - start ); +// System.out.println(workingMemory); + System.out.println( "Elapsed time - " +( ( System.currentTimeMillis() - start ) / 1000.) + " sec."); } + + public static void main(String[] argv) throws Exception, PackageIntegrationException, + InvalidPatternException, FactException { + LeapsWaltzTest waltz = new LeapsWaltzTest(); + waltz.setUp(); + + final org.drools.leaps.RuleBaseImpl ruleBase = new org.drools.leaps.RuleBaseImpl(); + ruleBase.addRuleSet(waltz.pkg); + WorkingMemory workingMemory = ruleBase.newWorkingMemory(); + + InputStream is = waltz.getClass().getResourceAsStream( "/waltz12.dat" ); + List list = waltz.getInputObjects( is ); + for ( Iterator it = list.iterator(); it.hasNext(); ) { + Object object = it.next(); + workingMemory.assertObject( object ); + } + +// workingMemory.assertObject(new Stage(Stage.START)); + + long start = System.currentTimeMillis(); + workingMemory.fireAllRules(); + System.err.println(System.currentTimeMillis() - start); + + } } Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Line.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Line.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Line.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -1,5 +1,27 @@ package org.drools.examples.waltz; +/* + * Copyright 2006 Alexander Bagerman + * + * 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. + */ + + +/** + * @author Alexander Bagerman + * + */ + public class Line { private int p1; Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/ReteooWaltzTest.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/ReteooWaltzTest.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/ReteooWaltzTest.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -1,5 +1,27 @@ package org.drools.examples.waltz; +/* + * Copyright 2006 Alexander Bagerman + * + * 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. + */ + + +/** + * @author Alexander Bagerman + * + */ + import java.beans.IntrospectionException; import java.io.IOException; import java.io.InputStream; @@ -14,6 +36,11 @@ import org.drools.rule.InvalidPatternException; import org.drools.rule.InvalidRuleException; +/** + * + * @author Alexander Bagerman + * + */ public class ReteooWaltzTest extends BaseWaltzTest { public void testWaltz() throws DuplicateRuleNameException, Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Stage.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Stage.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/Stage.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -1,7 +1,34 @@ package org.drools.examples.waltz; +/* + * Copyright 2006 Alexander Bagerman + * + * 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. + */ + + +/** + * @author Alexander Bagerman + * + */ + import java.io.Serializable; +/** + * + * @author Alexander Bagerman + * + */ public class Stage implements Serializable { final public static int START = 0; Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/WaltzUtil.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/WaltzUtil.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/waltz/WaltzUtil.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -1,5 +1,27 @@ package org.drools.examples.waltz; +/* + * Copyright 2006 Alexander Bagerman + * + * 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. + */ + + +/** + * @author Alexander Bagerman + * + */ + class WaltzUtil { private static double PI = 3.1415927; @@ -41,7 +63,7 @@ ret = PI; } } else { - ret = (double) Math.atan2(delta_y, delta_x); + ret = Math.atan2(delta_y, delta_x); } return ret; } Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/FactHandleImplTest.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/FactHandleImplTest.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/FactHandleImplTest.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -21,6 +21,11 @@ import org.drools.FactHandle; import org.drools.FactException; +/** + * + * @author Alexander Bagerman + * + */ public class FactHandleImplTest extends TestCase { private RuleBaseImpl ruleBase; Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/HandleFactoryTest.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/HandleFactoryTest.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/HandleFactoryTest.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -18,6 +18,11 @@ import junit.framework.TestCase; +/** + * + * @author Alexander Bagerman + * + */ public class HandleFactoryTest extends TestCase { HandleFactory factory; Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/HandleTest.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/HandleTest.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/HandleTest.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -18,6 +18,11 @@ import junit.framework.TestCase; +/** + * + * @author Alexander Bagerman + * + */ public class HandleTest extends TestCase { /* Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/LeapsTupleTest.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/LeapsTupleTest.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/LeapsTupleTest.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -21,6 +21,9 @@ import org.drools.FactHandle; import org.drools.common.AgendaItem; +/** + * @author Alexander Bagerman + */ public class LeapsTupleTest extends TestCase { LeapsTuple tuple; @@ -42,7 +45,7 @@ this.h3 = new FactHandleImpl(3, "three"); this.h4 = new FactHandleImpl(4, "four"); FactHandleImpl arr[] = { this.h1, this.h2, this.h3, this.h4 }; - this.tuple = new LeapsTuple(arr); + this.tuple = new LeapsTuple(arr, null, null, null); this.hOutsider = new FactHandleImpl(9876, "outsider"); } @@ -99,7 +102,7 @@ */ public void testEqualsObject() { FactHandleImpl arr[] = { this.h1, this.h2, this.h3, this.h4 }; - LeapsTuple tupleToCompare = new LeapsTuple(arr); + LeapsTuple tupleToCompare = new LeapsTuple(arr, null, null, null); assertEquals(this.tuple, tupleToCompare); } Deleted: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/PendingTupleTest.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/PendingTupleTest.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/PendingTupleTest.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -1,105 +0,0 @@ -package org.drools.leaps; - -/* - * Copyright 2006 Alexander Bagerman - * - * 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 junit.framework.TestCase; - -public class PendingTupleTest extends TestCase { - PendingTuple pendingTupleNoBlockingFacts; - - PendingTuple pendingTupleSevenBlockingFacts; - - PendingTuple pendingTupleNoExistsFacts; - - PendingTuple pendingTupleNoExistsFactsWhenRequired; - - PendingTuple pendingTupleSevenExistsFacts; - - protected void setUp() throws Exception { - super.setUp(); - this.pendingTupleNoBlockingFacts = new PendingTuple(null, null, null, - null, false, -1, false, -1); - this.pendingTupleSevenBlockingFacts = new PendingTuple(null, null, - null, null, false, -1, true, 7); - this.pendingTupleNoExistsFacts = new PendingTuple(null, null, null, - null, false, -1, false, -1); - this.pendingTupleNoExistsFactsWhenRequired = new PendingTuple(null, null, null, - null, true, 0, false, -1); - this.pendingTupleSevenExistsFacts = new PendingTuple(null, null, null, - null, true, 7, false, -1); - } - - /* - * Test method for - */ - public void testContainsBlockingFacts() { - assertFalse(this.pendingTupleSevenBlockingFacts - .isValid()); - assertTrue(this.pendingTupleNoBlockingFacts - .isValid()); - this.pendingTupleNoBlockingFacts.decrementNotCount(); - this.pendingTupleNoBlockingFacts.decrementNotCount(); - this.pendingTupleNoBlockingFacts.decrementNotCount(); - this.pendingTupleSevenBlockingFacts.decrementNotCount(); - this.pendingTupleSevenBlockingFacts.decrementNotCount(); - this.pendingTupleSevenBlockingFacts.decrementNotCount(); - assertFalse(this.pendingTupleSevenBlockingFacts - .isValid()); - assertTrue(this.pendingTupleNoBlockingFacts - .isValid()); - this.pendingTupleSevenBlockingFacts.decrementNotCount(); - this.pendingTupleSevenBlockingFacts.decrementNotCount(); - this.pendingTupleSevenBlockingFacts.decrementNotCount(); - this.pendingTupleSevenBlockingFacts.decrementNotCount(); - assertTrue(this.pendingTupleSevenBlockingFacts - .isValid()); - } - - /* - * Test method for - */ - public void testContainsExistsFacts() { - assertTrue(this.pendingTupleSevenExistsFacts - .isValid()); - assertTrue(this.pendingTupleNoExistsFacts - .isValid()); - assertFalse(this.pendingTupleNoExistsFactsWhenRequired - .isValid()); - this.pendingTupleNoExistsFacts.decrementExistsCount(); - this.pendingTupleNoExistsFacts.decrementExistsCount(); - this.pendingTupleNoExistsFacts.decrementExistsCount(); - this.pendingTupleNoExistsFactsWhenRequired.decrementExistsCount(); - this.pendingTupleNoExistsFactsWhenRequired.decrementExistsCount(); - this.pendingTupleNoExistsFactsWhenRequired.decrementExistsCount(); - this.pendingTupleSevenExistsFacts.decrementExistsCount(); - this.pendingTupleSevenExistsFacts.decrementExistsCount(); - this.pendingTupleSevenExistsFacts.decrementExistsCount(); - assertTrue(this.pendingTupleSevenExistsFacts - .isValid()); - assertTrue(this.pendingTupleNoExistsFacts - .isValid()); - assertFalse(this.pendingTupleNoExistsFactsWhenRequired - .isValid()); - this.pendingTupleSevenExistsFacts.decrementExistsCount(); - this.pendingTupleSevenExistsFacts.decrementExistsCount(); - this.pendingTupleSevenExistsFacts.decrementExistsCount(); - this.pendingTupleSevenExistsFacts.decrementExistsCount(); - assertFalse(this.pendingTupleSevenExistsFacts - .isValid()); - } - -} Deleted: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/PostedActivationTest.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/PostedActivationTest.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/PostedActivationTest.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -1,58 +0,0 @@ -package org.drools.leaps; - -/* - * Copyright 2006 Alexander Bagerman - * - * 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.common.AgendaItem; - -import junit.framework.TestCase; - -public class PostedActivationTest extends TestCase { - - PostedActivation postedActivation; - - AgendaItem item; - - protected void setUp() throws Exception { - super.setUp(); - FactHandleImpl h1 = new FactHandleImpl(1, "one"); - FactHandleImpl h2 = new FactHandleImpl(2, "two"); - FactHandleImpl h3 = new FactHandleImpl(3, "three"); - FactHandleImpl h4 = new FactHandleImpl(4, "four"); - FactHandleImpl arr[] = { h1, h2, h3, h4 }; - LeapsTuple tuple = new LeapsTuple(arr); - this.item = new AgendaItem(0L, tuple, null, null, null); - this.postedActivation = new PostedActivation(this.item, false, 1); - } - - /* - * Test method for - * 'org.drools.leaps.PostedActivation.setWasRemoved(boolean)' - */ - public void testSetRemoved() { - assertTrue(this.postedActivation.isValid()); - this.postedActivation.invalidate(); - assertFalse(this.postedActivation.isValid()); - } - - /* - * Test method for 'org.drools.leaps.PostedActivation.getActivation()' - */ - public void testGetActivation() { - assertEquals(this.item, this.postedActivation.getAgendaItem()); - } - -} Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/util/TableIteratorTest.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/util/TableIteratorTest.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/util/TableIteratorTest.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -23,6 +23,10 @@ import junit.framework.TestCase; +/** + * @author Alexander Bagerman + */ + public class TableIteratorTest extends TestCase { Handle h1; @@ -48,13 +52,13 @@ * 'org.drools..util.TableIterator.TableIterator()' */ public void testTableIterator() { - TableIterator it = new TableIterator(); + BaseTableIterator it = new BaseTableIterator(null, null,null); assertFalse(it.hasNext()); assertTrue(it.isEmpty()); } public void testGetDominantFactIterator() { - Iterator it = TableIterator.baseFactIterator(this.h1000); + Iterator it = Table.singleItemIterator(this.h1000); assertTrue(it.hasNext()); assertEquals(it.next(), this.h1000); assertFalse(it.hasNext()); @@ -65,7 +69,7 @@ * 'org.drools..util.TableIterator.TableIterator(TableRecord)' */ public void testTableIteratorTableRecord() { - TableIterator it = new TableIterator(new TableRecord(this.h1)); + BaseTableIterator it = new BaseTableIterator(new TableRecord(this.h1)); assertTrue(it.hasNext()); assertFalse(it.isEmpty()); assertEquals(this.h1, it.next()); @@ -81,7 +85,7 @@ */ public void testTableIteratorTableRecordTableRecordTableRecord() { this.testTable.add(this.h1); - TableIterator it = new TableIterator(this.testTable.headRecord, + BaseTableIterator it = new BaseTableIterator(this.testTable.headRecord, this.testTable.tailRecord, this.testTable.tailRecord); assertTrue(it.hasNext()); assertFalse(it.isEmpty()); @@ -93,7 +97,7 @@ this.testTable.add(this.h1000); this.testTable.add(this.h10); this.testTable.add(this.h100); - it = new TableIterator(this.testTable.headRecord, + it = new BaseTableIterator(this.testTable.headRecord, this.testTable.headRecord, this.testTable.tailRecord); assertFalse(it.isEmpty()); assertTrue(it.hasNext()); @@ -110,7 +114,7 @@ this.testTable.add(this.h1000); this.testTable.add(this.h10); this.testTable.add(this.h100); - it = new TableIterator(this.testTable.headRecord, + it = new BaseTableIterator(this.testTable.headRecord, this.testTable.tailRecord, this.testTable.tailRecord); assertFalse(it.isEmpty()); assertTrue(it.hasNext()); @@ -125,7 +129,7 @@ */ public void testIsEmpty() { this.testTable.add(this.h1); - TableIterator it = new TableIterator(this.testTable.headRecord, + BaseTableIterator it = new BaseTableIterator(this.testTable.headRecord, this.testTable.tailRecord, this.testTable.tailRecord); assertFalse(it.isEmpty()); this.testTable.clear(); @@ -133,13 +137,13 @@ this.testTable.add(this.h1000); this.testTable.add(this.h10); this.testTable.add(this.h100); - it = new TableIterator(this.testTable.headRecord, + it = new BaseTableIterator(this.testTable.headRecord, this.testTable.headRecord, this.testTable.tailRecord); assertFalse(it.isEmpty()); - it = new TableIterator(this.testTable.tailRecord, + it = new BaseTableIterator(this.testTable.tailRecord, this.testTable.headRecord, this.testTable.headRecord); assertFalse(it.isEmpty()); - it = new TableIterator(); + it = new BaseTableIterator(null, null, null); assertTrue(it.isEmpty()); } @@ -149,7 +153,7 @@ */ public void testReset() { this.testTable.add(this.h1); - TableIterator it = new TableIterator(this.testTable.headRecord, + BaseTableIterator it = new BaseTableIterator(this.testTable.headRecord, this.testTable.tailRecord, this.testTable.tailRecord); assertEquals(this.h1, it.next()); it.reset(); @@ -159,7 +163,7 @@ this.testTable.add(this.h1000); this.testTable.add(this.h10); this.testTable.add(this.h100); - it = new TableIterator(this.testTable.headRecord, + it = new BaseTableIterator(this.testTable.headRecord, this.testTable.headRecord, this.testTable.tailRecord); assertEquals(this.h1000, it.next()); it.reset(); @@ -173,11 +177,11 @@ this.testTable.add(this.h1000); this.testTable.add(this.h10); this.testTable.add(this.h100); - it = new TableIterator(this.testTable.headRecord, + it = new BaseTableIterator(this.testTable.headRecord, this.testTable.tailRecord, this.testTable.tailRecord); it.reset(); assertEquals(this.h1000, it.next()); - it = new TableIterator(new TableRecord(this.h1)); + it = new BaseTableIterator(new TableRecord(this.h1)); assertEquals(this.h1, it.next()); it.reset(); assertEquals(this.h1, it.next()); @@ -189,7 +193,7 @@ */ public void testHasNext() { this.testTable.add(this.h1); - TableIterator it = new TableIterator(this.testTable.headRecord, + BaseTableIterator it = new BaseTableIterator(this.testTable.headRecord, this.testTable.tailRecord, this.testTable.tailRecord); assertTrue(it.hasNext()); assertFalse(it.isEmpty()); @@ -201,7 +205,7 @@ this.testTable.add(this.h1000); this.testTable.add(this.h10); this.testTable.add(this.h100); - it = new TableIterator(this.testTable.headRecord, + it = new BaseTableIterator(this.testTable.headRecord, this.testTable.headRecord, this.testTable.tailRecord); assertTrue(it.hasNext()); this.testTable.clear(); @@ -209,12 +213,12 @@ this.testTable.add(this.h1000); this.testTable.add(this.h10); this.testTable.add(this.h100); - it = new TableIterator(this.testTable.headRecord, + it = new BaseTableIterator(this.testTable.headRecord, this.testTable.tailRecord, this.testTable.tailRecord); assertTrue(it.hasNext()); - it = new TableIterator(); + it = new BaseTableIterator(null, null, null); assertFalse(it.hasNext()); - it = new TableIterator(new TableRecord(this.h1)); + it = new BaseTableIterator(new TableRecord(this.h1)); assertTrue(it.hasNext()); } @@ -224,7 +228,7 @@ */ public void testNext() { this.testTable.add(this.h1); - TableIterator it = new TableIterator(this.testTable.headRecord, + BaseTableIterator it = new BaseTableIterator(this.testTable.headRecord, this.testTable.tailRecord, this.testTable.tailRecord); assertEquals(this.h1, it.next()); this.testTable.clear(); @@ -232,7 +236,7 @@ this.testTable.add(this.h1000); this.testTable.add(this.h10); this.testTable.add(this.h100); - it = new TableIterator(this.testTable.headRecord, + it = new BaseTableIterator(this.testTable.headRecord, this.testTable.headRecord, this.testTable.tailRecord); assertEquals(this.h1000, it.next()); this.testTable.clear(); @@ -240,10 +244,10 @@ this.testTable.add(this.h1000); this.testTable.add(this.h10); this.testTable.add(this.h100); - it = new TableIterator(this.testTable.headRecord, + it = new BaseTableIterator(this.testTable.headRecord, this.testTable.tailRecord, this.testTable.tailRecord); assertEquals(this.h1, it.next()); - it = new TableIterator(new TableRecord(this.h1)); + it = new BaseTableIterator(new TableRecord(this.h1)); assertEquals(this.h1, it.next()); } @@ -252,7 +256,7 @@ */ public void testCurrent() { this.testTable.add(this.h1); - TableIterator it = new TableIterator(this.testTable.headRecord, + BaseTableIterator it = new BaseTableIterator(this.testTable.headRecord, this.testTable.tailRecord, this.testTable.tailRecord); assertEquals(this.h1, it.next()); assertEquals(this.h1, it.current()); @@ -261,7 +265,7 @@ this.testTable.add(this.h1000); this.testTable.add(this.h10); this.testTable.add(this.h100); - it = new TableIterator(this.testTable.headRecord, + it = new BaseTableIterator(this.testTable.headRecord, this.testTable.headRecord, this.testTable.tailRecord); assertEquals(this.h1000, it.next()); assertEquals(this.h1000, it.current()); @@ -270,11 +274,11 @@ this.testTable.add(this.h1000); this.testTable.add(this.h10); this.testTable.add(this.h100); - it = new TableIterator(this.testTable.headRecord, + it = new BaseTableIterator(this.testTable.headRecord, this.testTable.tailRecord, this.testTable.tailRecord); assertEquals(this.h1, it.next()); assertEquals(this.h1, it.current()); - it = new TableIterator(new TableRecord(this.h1)); + it = new BaseTableIterator(new TableRecord(this.h1)); assertEquals(this.h1, it.next()); assertEquals(this.h1, it.current()); @@ -285,7 +289,7 @@ */ public void testPeekNext() { this.testTable.add(this.h1); - TableIterator it = new TableIterator(this.testTable.headRecord, + BaseTableIterator it = new BaseTableIterator(this.testTable.headRecord, this.testTable.tailRecord, this.testTable.tailRecord); assertEquals(this.h1, it.peekNext()); assertEquals(this.h1, it.next()); @@ -294,7 +298,7 @@ this.testTable.add(this.h1000); this.testTable.add(this.h10); this.testTable.add(this.h100); - it = new TableIterator(this.testTable.headRecord, + it = new BaseTableIterator(this.testTable.headRecord, this.testTable.headRecord, this.testTable.tailRecord); assertEquals(this.h1000, it.peekNext()); assertEquals(this.h1000, it.next()); @@ -303,11 +307,11 @@ this.testTable.add(this.h1000); this.testTable.add(this.h10); this.testTable.add(this.h100); - it = new TableIterator(this.testTable.headRecord, + it = new BaseTableIterator(this.testTable.headRecord, this.testTable.tailRecord, this.testTable.tailRecord); assertEquals(this.h1, it.peekNext()); assertEquals(this.h1, it.next()); - it = new TableIterator(new TableRecord(this.h1)); + it = new BaseTableIterator(new TableRecord(this.h1)); assertEquals(this.h1, it.peekNext()); assertEquals(this.h1, it.next()); Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/util/TableRecordTest.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/util/TableRecordTest.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/util/TableRecordTest.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -18,6 +18,10 @@ import junit.framework.TestCase; +/** + * @author Alexander Bagerman + */ + public class TableRecordTest extends TestCase { public void testConstractor() { Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/util/TableTest.java =================================================================== --- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/util/TableTest.java 2006-03-03 03:30:02 UTC (rev 2725) +++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/leaps/util/TableTest.java 2006-03-03 03:36:04 UTC (rev 2726) @@ -28,6 +28,10 @@ import org.drools.leaps.*; import org.drools.leaps.conflict.*; +/** + * @author Alexander Bagerman + */ + public class TableTest extends TestCase { Handle h1; |