[jboss-svn-commits] JBL Code SVN: r7056 - in labs/jbossrules/trunk/drools-compiler/src/test: java/org/drools java/org/drools/integrationtests java/org/drools/integrationtests/helloworld resources/org/drools/integrationtests

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Oct 23 20:57:06 EDT 2006


Author: mark.proctor at jboss.com
Date: 2006-10-23 20:57:01 -0400 (Mon, 23 Oct 2006)
New Revision: 7056

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cell.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheese.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Person.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/helloworld/Message.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/big_decimal_and_comparable.drl
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/salience_rule_test.drl
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ExplicitAnd.drl
Log:
-Making fixes for limitatinos  with ShadowFacts

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cell.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cell.java	2006-10-24 00:34:09 UTC (rev 7055)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cell.java	2006-10-24 00:57:01 UTC (rev 7056)
@@ -20,6 +20,10 @@
 
     int value = 0;
 
+    public Cell() {
+    	
+    }
+    
     public Cell(final int value) {
         this.value = value;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheese.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheese.java	2006-10-24 00:34:09 UTC (rev 7055)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Cheese.java	2006-10-24 00:57:01 UTC (rev 7056)
@@ -28,6 +28,10 @@
     private String type;
     private int    price;
 
+    public Cheese() {
+    	
+    }
+    
     public Cheese(final String type,
                   final int price) {
         super();

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Person.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Person.java	2006-10-24 00:34:09 UTC (rev 7055)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Person.java	2006-10-24 00:57:01 UTC (rev 7056)
@@ -12,7 +12,7 @@
      * 
      */
     private static final long serialVersionUID = 2640286967578736742L;
-    private final String      name;
+    private String      name;
     private String            likes;
     private int               age;
     private BigDecimal        bigDecimal;
@@ -25,6 +25,10 @@
 
     private String            status;
 
+    public Person() {
+    	
+    }
+    
     public Person(final String name) {
         this( name,
               "",

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java	2006-10-24 00:34:09 UTC (rev 7055)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java	2006-10-24 00:57:01 UTC (rev 7056)
@@ -9,6 +9,10 @@
     private String                state;
     private boolean               flag;
 
+    public State() {
+    	
+    }
+    
     public State(final String state) {
         this.state = state;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-10-24 00:34:09 UTC (rev 7055)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-10-24 00:57:01 UTC (rev 7056)
@@ -194,6 +194,12 @@
         workingMemory.fireAllRules();
         assertEquals( 0,
                       list.size() );
+        
+        workingMemory.assertObject( new Cheese( "brie", 33 ) );
+        
+        workingMemory.fireAllRules();
+        assertEquals( 1,
+                      list.size() );
     }
 
     public void testHelloWorld() throws Exception {
@@ -362,8 +368,14 @@
                                                  null,
                                                  12 );
         bill.setBigDecimal( new BigDecimal( "42" ) );
-        workingMemory.assertObject( new BigDecimal( "43" ) );
+
+        final PersonInterface ben = new Person( "ben",
+                null,
+                13 );
+        ben.setBigDecimal( new BigDecimal( "43" ) );        
+        
         workingMemory.assertObject( bill );
+        workingMemory.assertObject( ben );
         workingMemory.fireAllRules();
 
         assertEquals( 1,

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/helloworld/Message.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/helloworld/Message.java	2006-10-24 00:34:09 UTC (rev 7055)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/helloworld/Message.java	2006-10-24 00:57:01 UTC (rev 7056)
@@ -27,6 +27,10 @@
     private int     number   = 0;
     private Date    birthday = new Date();
     private boolean fired    = false;
+    
+    public Message() {
+    	
+    }
 
     public boolean isFired() {
         return this.fired;

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/big_decimal_and_comparable.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/big_decimal_and_comparable.drl	2006-10-24 00:34:09 UTC (rev 7055)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/big_decimal_and_comparable.drl	2006-10-24 00:57:01 UTC (rev 7056)
@@ -9,8 +9,8 @@
 rule "BigDec"
 	
 	when
-		b : BigDecimal()
-		p : Person(bigDecimal < b)
+		Person($b : bigDecimal )
+		p : Person(bigDecimal < $b)
 	then 		
 		list.add( p );
 end

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/salience_rule_test.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/salience_rule_test.drl	2006-10-24 00:34:09 UTC (rev 7055)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/salience_rule_test.drl	2006-10-24 00:57:01 UTC (rev 7056)
@@ -14,7 +14,8 @@
 end    
 
 # this rule shall fire second, since rule 3 has higher salience
-rule "Salience rule 2" salience 10
+rule "Salience rule 2" 
+    salience 10
     when
         person: Person( )
     then
@@ -23,7 +24,8 @@
 end    
 
 # this rule shall fire first since it has the higher salience
-rule "Salience rule 3" salience 20
+rule "Salience rule 3" 
+    salience 20
     when
         Person( )
     then

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ExplicitAnd.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ExplicitAnd.drl	2006-10-24 00:34:09 UTC (rev 7055)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ExplicitAnd.drl	2006-10-24 00:57:01 UTC (rev 7056)
@@ -1,13 +1,14 @@
 package HelloWorld
  
 import org.drools.integrationtests.helloworld.Message
+import org.drools.Cheese;
 import java.lang.*
 
 global java.util.List list;
 
 rule "Hello World"
 	when
-		Message() && Integer()
+		Message() && Cheese()
 	then
 		list.add("hola");
 end
\ No newline at end of file




More information about the jboss-svn-commits mailing list