[jboss-svn-commits] JBL Code SVN: r17177 - in labs/jbossrules/branches/temporal_rete/drools-compiler/src/test: resources/org/drools/integrationtests and 1 other directory.

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

Author: mgroch
Date: 2007-12-11 05:20:26 -0500 (Tue, 11 Dec 2007)
New Revision: 17177

Modified:
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl
Log:
fixing meets & met-by
additional support for coincides ( = equals)

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java	2007-12-11 06:16:57 UTC (rev 17176)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java	2007-12-11 10:20:26 UTC (rev 17177)
@@ -119,11 +119,14 @@
         final SessionPseudoClock clock = wm.getSessionClock();
 
         clock.setStartupTime( 1000 );
+        final List results_coincides = new ArrayList();
         final List results_before = new ArrayList();
         final List results_after = new ArrayList();
         final List results_meets = new ArrayList();
         final List results_met_by = new ArrayList();
 
+        wm.setGlobal( "results_coincides",
+                results_coincides );
         wm.setGlobal( "results_before",
                 results_before );
         wm.setGlobal( "results_after",
@@ -149,6 +152,10 @@
                                          "DROO",
                                          50,
                                          System.currentTimeMillis() );
+        StockTick tick5 = new StockTick( 5,
+                						 "ACME",
+                						 10,
+                						 System.currentTimeMillis() );
 
         InternalFactHandle handle1 = (InternalFactHandle) wm.insert( tick1 );
         clock.advanceTime( 4 );
@@ -157,20 +164,28 @@
         InternalFactHandle handle3 = (InternalFactHandle) wm.insert( tick3 );
         clock.advanceTime( 4 );
         InternalFactHandle handle4 = (InternalFactHandle) wm.insert( tick4 );
+        InternalFactHandle handle5 = (InternalFactHandle) wm.insert( tick5 );
 
         assertNotNull( handle1 );
         assertNotNull( handle2 );
         assertNotNull( handle3 );
         assertNotNull( handle4 );
+        assertNotNull( handle5 );
 
         assertTrue( handle1.isEvent() );
         assertTrue( handle2.isEvent() );
         assertTrue( handle3.isEvent() );
         assertTrue( handle4.isEvent() );
+        assertTrue( handle5.isEvent() );
 
         wm.fireAllRules();
 
         assertEquals( 1,
+                results_coincides.size() );
+        assertEquals( tick5,
+                results_coincides.get( 0 ) );
+        
+        assertEquals( 1,
                 results_before.size() );
         assertEquals( tick2,
                 results_before.get( 0 ) );
@@ -180,16 +195,23 @@
         assertEquals( tick3,
                       results_after.get( 0 ) );
         
-        assertEquals( 1,
+        assertEquals( 2,
                 results_meets.size() );
+        assertEquals( tick5,
+                results_meets.get( 0 ) );
         assertEquals( tick3,
-                results_meets.get( 0 ) );
+                results_meets.get( 1 ) );
         
         assertEquals( 1,
                       results_met_by.size() );
         assertEquals( tick2,
                       results_met_by.get( 0 ) );
         
+        assertEquals( 1,
+                results_met_by.size() );
+        assertEquals( tick2,
+                results_met_by.get( 0 ) );
+        
 
     }
 

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl	2007-12-11 06:16:57 UTC (rev 17176)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl	2007-12-11 10:20:26 UTC (rev 17177)
@@ -2,11 +2,20 @@
 
 import event org.drools.StockTick;
 
+global java.util.List results_coincides;
 global java.util.List results_after;
 global java.util.List results_before;
 global java.util.List results_meets;
 global java.util.List results_met_by;
 
+rule "coincides operator"
+when
+    $a : StockTick( company == "DROO" )
+    $b : StockTick( company == "ACME", this ~coincides $a )
+then
+    results_coincides.add( $b );
+end
+
 rule "before operator"
 when
     $a : StockTick( company == "DROO" )