[jboss-svn-commits] JBL Code SVN: r7073 - in labs/jbossrules/trunk/drools-compiler/src/test: java/org/drools java/org/drools/integrationtests resources/org/drools/integrationtests
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 24 07:32:05 EDT 2006
Author: mark.proctor at jboss.com
Date: 2006-10-24 07:31:53 -0400 (Tue, 24 Oct 2006)
New Revision: 7073
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Alarm.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/CheeseEqual.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/EmergencyTeam.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Sensor.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsLoop.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsModifyEqual.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNoLoop.drl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsSelfreferencing.drl
Log:
-Fixed logical assertion issues
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Alarm.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Alarm.java 2006-10-24 10:03:23 UTC (rev 7072)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Alarm.java 2006-10-24 11:31:53 UTC (rev 7073)
@@ -3,6 +3,10 @@
public class Alarm {
private String message;
+ public Alarm() {
+
+ }
+
public Alarm(final String message) {
this.message = message;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/CheeseEqual.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/CheeseEqual.java 2006-10-24 10:03:23 UTC (rev 7072)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/CheeseEqual.java 2006-10-24 11:31:53 UTC (rev 7073)
@@ -28,6 +28,10 @@
protected String type;
protected int price;
+ public CheeseEqual(){
+
+ }
+
public CheeseEqual(final String type,
final int price) {
super();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/EmergencyTeam.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/EmergencyTeam.java 2006-10-24 10:03:23 UTC (rev 7072)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/EmergencyTeam.java 2006-10-24 11:31:53 UTC (rev 7073)
@@ -1,5 +1,7 @@
package org.drools;
public class EmergencyTeam {
-
-}
+ public EmergencyTeam() {
+
+ }
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Sensor.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Sensor.java 2006-10-24 10:03:23 UTC (rev 7072)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Sensor.java 2006-10-24 11:31:53 UTC (rev 7073)
@@ -4,6 +4,10 @@
private int temperature;
private int pressure;
+ public Sensor() {
+
+ }
+
public Sensor(final int temp,
final int press) {
this.temperature = temp;
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 10:03:23 UTC (rev 7072)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java 2006-10-24 11:31:53 UTC (rev 7073)
@@ -2303,8 +2303,8 @@
List list;
- final String b = new String( "b" );
- final String a = new String( "a" );
+ final Person b = new Person( "b");
+ final Person a = new Person( "a");
workingMemory.setGlobal( "b",
b );
@@ -2347,7 +2347,7 @@
List list;
final List l = new ArrayList();
- final String a = new String( "a" );
+ final Person a = new Person( "a" );
workingMemory.setGlobal( "a",
a );
workingMemory.setGlobal( "l",
@@ -2375,7 +2375,7 @@
List list;
final List l = new ArrayList();
- final String a = new String( "a" );
+ final Person a = new Person( "a" );
workingMemory.setGlobal( "a",
a );
workingMemory.setGlobal( "l",
@@ -2657,7 +2657,9 @@
final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
List l;
- final FactHandle h = workingMemory.assertObject( new Integer( 2 ) );
+ Person p = new Person( "person");
+ p.setAge( 2 );
+ final FactHandle h = workingMemory.assertObject( p );
assertEquals( 1,
workingMemory.getObjects().size() );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsLoop.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsLoop.drl 2006-10-24 10:03:23 UTC (rev 7072)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsLoop.drl 2006-10-24 11:31:53 UTC (rev 7073)
@@ -1,14 +1,14 @@
package org.drools.test;
-import java.lang.String;
+import org.drools.Person;
import java.util.List;
-global java.lang.String a;
-global java.util.List l;
+global Person a;
+global List l;
rule "r"
when
- not String()
+ not Person()
then
if (l.size() < 10)
{
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsModifyEqual.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsModifyEqual.drl 2006-10-24 10:03:23 UTC (rev 7072)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsModifyEqual.drl 2006-10-24 11:31:53 UTC (rev 7073)
@@ -1,14 +1,13 @@
package org.drools.test;
-import java.lang.Integer;
-import java.lang.Float;
+import org.drools.Person
import org.drools.CheeseEqual;
rule "assert"
when
- i : Integer()
+ p : Person()
then
- assertLogical(new CheeseEqual(i.toString(), i.intValue()));
+ assertLogical( new CheeseEqual( p.getName(), p.getAge() ) );
end
rule "modify"
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNoLoop.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNoLoop.drl 2006-10-24 10:03:23 UTC (rev 7072)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsNoLoop.drl 2006-10-24 11:31:53 UTC (rev 7073)
@@ -1,17 +1,17 @@
package org.drools.test;
-import java.lang.String;
+import org.drools.Person;
import java.util.List;
-global java.lang.String a;
-global java.util.List l;
+global Person a;
+global List l;
rule "r"
no-loop true
when
- not String()
+ not Person()
then
- l.add(new Integer(0));
+ l.add(new Person("0"));
if (l.size() > 2)
{
throw new Exception( "this should not loop" );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsSelfreferencing.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsSelfreferencing.drl 2006-10-24 10:03:23 UTC (rev 7072)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_LogicalAssertionsSelfreferencing.drl 2006-10-24 11:31:53 UTC (rev 7073)
@@ -1,11 +1,13 @@
package org.drools.test;
-global java.lang.String b;
-import java.lang.String;
+import org.drools.Person;
-rule "String => b"
+global Person b;
+
+
+rule "Person => b"
when
- s : String()
+ s : Person()
then
assertLogical( b );
end
More information about the jboss-svn-commits
mailing list