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

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

Author: tirelli
Date: 2007-06-13 08:48:39 -0400 (Wed, 13 Jun 2007)
New Revision: 12541

Modified:
   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:
Fixing failing test

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-06-13 12:31:07 UTC (rev 12540)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java	2007-06-13 12:48:39 UTC (rev 12541)
@@ -305,24 +305,24 @@
             buf = b;
         }
 
-        public void visitActionAssertFact(final ActionInsertFact action) {
-            this.generateAssertCall( action,
+        public void visitActionInsertFact(final ActionInsertFact action) {
+            this.generateInsertCall( action,
                                      false );
         }
 
-        public void visitActionAssertLogicalFact(final ActionInsertLogicalFact action) {
-            this.generateAssertCall( action,
+        public void visitActionInsertLogicalFact(final ActionInsertLogicalFact action) {
+            this.generateInsertCall( action,
                                      false );
         }
 
-        private void generateAssertCall(final ActionInsertFact action,
+        private void generateInsertCall(final ActionInsertFact action,
                                         final boolean isLogic) {
             buf.append( "\t\t" );
             if( isDSLEnhanced ) {
                 buf.append( ">" );
             }
             if ( action.fieldValues.length == 0 ) {
-                buf.append( "assert( new " );
+                buf.append( "insert( new " );
                 buf.append( action.factType );
                 buf.append( "() );\n" );
             } else {
@@ -335,22 +335,22 @@
                 generateSetMethodCalls( "fact" + idx,
                                         action.fieldValues );
                 if ( isLogic ) {
-                    buf.append( "\t\tassertLogical( fact" );
+                    buf.append( "\t\tinsertLogical( fact" );
                 } else {
-                    buf.append( "\t\tassert( fact" );
+                    buf.append( "\t\tinsert( fact" );
                 }
                 buf.append( idx++ );
                 buf.append( " );\n" );
             }
         }
 
-        public void visitActionModifyField(final ActionUpdateField action) {
+        public void visitActionUpdateField(final ActionUpdateField action) {
             this.visitActionSetField( action );
             buf.append( "\t\t" );
             if( isDSLEnhanced ) {
                 buf.append( ">" );
             }
-            buf.append( "modify( " );
+            buf.append( "update( " );
             buf.append( action.variable );
             buf.append( " );\n" );
         }

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-06-13 12:31:07 UTC (rev 12540)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java	2007-06-13 12:48:39 UTC (rev 12541)
@@ -38,7 +38,7 @@
 
     public void testBasics() {
         String expected = "rule \"my rule\"\n\tno-loop true\n\twhen\n\t\tPerson( )\n" + 
-                          "\t\tAccident( )\n\tthen\n\t\tassert( new Report() );\nend\n";
+                          "\t\tAccident( )\n\tthen\n\t\tinsert( new Report() );\nend\n";
         final RuleModel m = new RuleModel();
         m.addLhsItem( new FactPattern( "Person" ) );
         m.addLhsItem( new FactPattern( "Accident" ) );
@@ -64,7 +64,7 @@
                           "\t\t>not Cancel( )\n"+
                           "\tthen\n"+
                           "\t\t>p1.setStatus( \"rejected\" );\n"+
-                          "\t\t>modify( p1 );\n"+
+                          "\t\t>update( p1 );\n"+
                           "\t\t>retract( p1 );\n"+
                           "\t\tSend an email to administrator\n"+
                           "end\n";
@@ -80,7 +80,7 @@
         //to satisfy JBRULES-850
         RuleModel m = getModelWithNoConstraints();
         String s = BRDRLPersistence.getInstance().marshal( m );
-        System.out.println(s);
+        //System.out.println(s);
         assertTrue(s.indexOf( "Person( f1 : age)" ) != -1);
     }
 
@@ -257,7 +257,7 @@
                 "p1 : Person( ) " + 
                 "Goober( goo == \"foo\"  || == \"bar\" || goo2 == \"foo\" || ( goo == \"whee\" && gabba == \"whee\" ), goo3 == \"foo\" )" +
             " then " +
-                "assert( new Whee() );" +
+                "insert( new Whee() );" +
         "end";
         assertEqualsIgnoreWhitespace( expected, actual );
         
@@ -361,7 +361,7 @@
         m.addLhsItem( p );
         
         String actual = BRDRLPersistence.getInstance().marshal( m );
-        System.err.println(actual);
+        //System.err.println(actual);
         
         
         String expected = "rule \"yeah\" " +