[jboss-svn-commits] JBL Code SVN: r12093 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/brms/server/util and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: michael.neale at jboss.com
Date: 2007-05-22 23:51:46 -0400 (Tue, 22 May 2007)
New Revision: 12093

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/converter/BRXMLToDescrConverter.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java
Log:
JBRULES-850 Allow binding without constraints

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/converter/BRXMLToDescrConverter.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/converter/BRXMLToDescrConverter.java	2007-05-23 03:28:38 UTC (rev 12092)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/converter/BRXMLToDescrConverter.java	2007-05-23 03:51:46 UTC (rev 12093)
@@ -35,6 +35,7 @@
  * It will work off the RuleModel object graph, primarily.
  * 
  * @author Edson Tirelli
+ * @deprecated Use BRDRLPersistence instead
  */
 public class BRXMLToDescrConverter {
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java	2007-05-23 03:28:38 UTC (rev 12092)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java	2007-05-23 03:51:46 UTC (rev 12093)
@@ -237,6 +237,10 @@
                                          final int type,
                                          final String operator,
                                          final String value) {
+            if (operator == null) {
+                return;
+            }
+            
             buf.append( " " );
             buf.append( operator );
             buf.append( " " );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java	2007-05-23 03:28:38 UTC (rev 12092)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java	2007-05-23 03:51:46 UTC (rev 12093)
@@ -71,6 +71,15 @@
         assertEquals( expected, drl );
 
     }
+    
+    
+    public void testFieldBindingWithNoConstraints() {
+        //to satisfy JBRULES-850
+        RuleModel m = getModelWithNoConstraints();
+        String s = BRDRLPersistence.getInstance().marshal( m );
+        System.out.println(s);
+        assertTrue(s.indexOf( "Person( f1 : age)" ) != -1);
+    }
 
     //
     //    public void testRoundTrip() {
@@ -101,6 +110,25 @@
     //
     //    }
     //
+    
+    private RuleModel getModelWithNoConstraints() {
+        final RuleModel m = new RuleModel();
+        m.name = "Complex Rule";
+        final FactPattern pat = new FactPattern();
+        pat.boundName = "p1";
+        pat.factType = "Person";
+        final Constraint con = new Constraint();
+        con.fieldBinding = "f1";
+        con.fieldName = "age";
+//        con.operator = "<";
+//        con.value = "42";
+        pat.addConstraint( con );
+
+        m.addLhsItem( pat );
+        
+        return m;
+    }
+    
     private RuleModel getComplexModel() {
         final RuleModel m = new RuleModel();
         m.name = "Complex Rule";