[jboss-svn-commits] JBL Code SVN: r18898 - in labs/jbossrules/branches/4.0.x: drools-compiler/src/test/java/org/drools/lang and 2 other directories.

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

Author: tirelli
Date: 2008-03-12 15:15:54 -0400 (Wed, 12 Mar 2008)
New Revision: 18898

Added:
   labs/jbossrules/branches/4.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_MatchesMVEL.drl
Modified:
   labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
   labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/lang/MVELDumperTest.java
   labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java
Log:
JBRULES-1459: adding test cases

Modified: labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2008-03-12 18:02:51 UTC (rev 18897)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2008-03-12 19:15:54 UTC (rev 18898)
@@ -2812,6 +2812,29 @@
 		assertEquals(provolone, list.get(3));
 	}
 
+    public void testMatchesMVEL() throws Exception {
+        final PackageBuilder builder = new PackageBuilder();
+        builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_MatchesMVEL.drl" ) ) );
+        final Package pkg = builder.getPackage();
+
+        final RuleBase ruleBase = getRuleBase();
+        ruleBase.addPackage( pkg );
+        final StatefulSession session = ruleBase.newStatefulSession();
+
+        final List results = new ArrayList();
+        session.setGlobal( "results",
+                                 results );
+        
+        Map map = new HashMap();
+        map.put( "content", "hello ;=" );
+        session.insert( map );
+
+        session.fireAllRules();
+
+        assertEquals( 1,
+                      results.size() );
+    }
+
 	public void testAutomaticBindings() throws Exception {
 		final PackageBuilder builder = new PackageBuilder();
 		builder.addPackageFromDrl(new InputStreamReader(getClass()

Modified: labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/lang/MVELDumperTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/lang/MVELDumperTest.java	2008-03-12 18:02:51 UTC (rev 18897)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/test/java/org/drools/lang/MVELDumperTest.java	2008-03-12 19:15:54 UTC (rev 18898)
@@ -23,7 +23,7 @@
         super.tearDown();
     }
 
-    public void xxxtestDump() throws Exception {
+    public void testDump() throws Exception {
         String input = "Cheese( price > 10 && < 20 || == $val || == 30 )";
         String expected = "( ( price > 10 && price < 20 ) || price == $val || price == 30 )" ;
         DRLParser parser = parse( input );
@@ -59,7 +59,18 @@
         assertEquals( expected, result );
     }
 
-    
+    public void testDumpMatches3() throws Exception {
+        String input = "Map( this[\"content\"] matches \"hello ;=\" )";
+        String expected = "this[\"content\"] ~= \"hello ;=\"" ;
+        DRLParser parser = parse( input );
+        PatternDescr pattern = (PatternDescr) parser.fact( null );
+        
+        FieldConstraintDescr fieldDescr = (FieldConstraintDescr) pattern.getConstraint().getDescrs().get( 0 );
+        String result = dumper.dump( fieldDescr );
+        
+        assertEquals( expected, result );
+    }
+
     private DRLParser parse(final String text) throws Exception {
         return newParser( newTokenStream( newLexer( newCharStream( text ) ) ) );
     }

Added: labs/jbossrules/branches/4.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_MatchesMVEL.drl
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_MatchesMVEL.drl	                        (rev 0)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/test/resources/org/drools/integrationtests/test_MatchesMVEL.drl	2008-03-12 19:15:54 UTC (rev 18898)
@@ -0,0 +1,12 @@
+package org.drools;
+
+import java.util.Map;
+
+global java.util.List results;
+
+rule "Matches mvel"
+when
+    Map( this["content"] matches "hello ;=" )
+then
+    results.add( "OK" );
+end
\ No newline at end of file

Modified: labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java	2008-03-12 18:02:51 UTC (rev 18897)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java	2008-03-12 19:15:54 UTC (rev 18898)
@@ -101,7 +101,6 @@
                                  {Boolean.FALSE, "!=", "xyz", Boolean.FALSE},
                                  {Boolean.FALSE, "!=", "true", Boolean.TRUE},
                                  {Boolean.FALSE, "!=", "false", Boolean.FALSE}
-
         };
 
         runEvaluatorTest( data,
@@ -156,6 +155,10 @@
                                  {"foo", "matches", ".*foo", Boolean.TRUE},
                                  {"foo", "matches", "bar", Boolean.FALSE},
                                  {null, "matches", ".*foo", Boolean.FALSE},
+                                 {"something", "matches", "something", Boolean.TRUE},
+                                 {"something", "matches", "hello ;=", Boolean.FALSE},
+                                 {"something", "not matches", "something", Boolean.FALSE},
+                                 {"something", "not matches", "hello ;=", Boolean.TRUE},
                                  {"foo", "==", null, Boolean.FALSE},
                                  {"foo", "!=", null, Boolean.TRUE},
                                  {null, "==", null, Boolean.TRUE},