[Jboss-svn-commits] JBL Code SVN: r2014 - in trunk/labs/jbossrules/drools-core/src: main/java/org/drools/reteoo main/java/org/drools/rule test/java/org/drools/examples/manners

[<jbo...@li...>]

Author: mar...@jb...
Date: 2006-01-07 00:06:14 -0500 (Sat, 07 Jan 2006)
New Revision: 2014

Modified:
   trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/AgendaItem.java
   trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/Builder.java
   trunk/labs/jbossrules/drools-core/src/main/java/org/drools/rule/Column.java
   trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/Hobby.java
   trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/MannersTest.java
Log:
-Have assertions and firing partially working

Modified: trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/AgendaItem.java
===================================================================
--- trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/AgendaItem.java	2006-01-07 05:03:43 UTC (rev 2013)
+++ trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/AgendaItem.java	2006-01-07 05:06:14 UTC (rev 2014)
@@ -167,7 +167,7 @@
      */
     void fire(WorkingMemoryImpl workingMemory) throws ConsequenceException {
 
-        this.rule.getConsequence().invoke( null );
+        this.rule.getConsequence().invoke( this );
 
         workingMemory.getAgendaEventSupport().fireActivationFired( this.rule,
                                                                    this.tuple );

Modified: trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/Builder.java
===================================================================
--- trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/Builder.java	2006-01-07 05:03:43 UTC (rev 2013)
+++ trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/Builder.java	2006-01-07 05:06:14 UTC (rev 2014)
@@ -113,7 +113,7 @@
      */
     Builder(RuleBaseImpl ruleBase, ObjectTypeResolver resolver) {
         this.ruleBase = ruleBase;
-        this.rete = new Rete();
+        this.rete = this.ruleBase.getRete();
         this.resolver = resolver;
         this.ruleSets = new ArrayList();
         this.attachedNodes = new HashMap();

Modified: trunk/labs/jbossrules/drools-core/src/main/java/org/drools/rule/Column.java
===================================================================
--- trunk/labs/jbossrules/drools-core/src/main/java/org/drools/rule/Column.java	2006-01-07 05:03:43 UTC (rev 2013)
+++ trunk/labs/jbossrules/drools-core/src/main/java/org/drools/rule/Column.java	2006-01-07 05:06:14 UTC (rev 2014)
@@ -73,4 +73,8 @@
     public int getIndex() {
         return this.index;
     }
+    
+    public String toString() {
+        return "Column type='"+ this.objectType + "', index='"+ this.index + "' identifer='"+ this.binding.getIdentifier() + "'";
+    }
 }

Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/Hobby.java
===================================================================
--- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/Hobby.java	2006-01-07 05:03:43 UTC (rev 2013)
+++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/Hobby.java	2006-01-07 05:06:14 UTC (rev 2014)
@@ -1,9 +1,11 @@
 package org.drools.examples.manners;
 
 public class Hobby {
+    public static final Hobby h1 = new Hobby( 1 );
     public static final Hobby h2 = new Hobby( 2 );
     public static final Hobby h3 = new Hobby( 3 );       
 
+    public static final String stringH1 = "h1";
     public static final String stringH2 = "h2";
     public static final String stringH3 = "h3";    
     
@@ -15,6 +17,8 @@
     
     public String getValue() {
         switch ( this.hobby ) {
+            case 1 :
+                return stringH1;            
             case 2 :
                 return stringH2;
             case 3 :

Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/MannersTest.java
===================================================================
--- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/MannersTest.java	2006-01-07 05:03:43 UTC (rev 2013)
+++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/MannersTest.java	2006-01-07 05:06:14 UTC (rev 2014)
@@ -115,6 +115,13 @@
         RuleBaseImpl ruleBase = new RuleBaseImpl();
         ruleBase.addRuleSet( ruleSet );
         
+        WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+        workingMemory.assertObject( new Context( Context.START_UP ) );
+        workingMemory.assertObject( new Guest("mark", Sex.m, Hobby.h1) );
+        workingMemory.assertObject( new Count(0) );
+        
+        workingMemory.fireAllRules();
+        
         System.out.println( "ttt" );
     }