[jboss-svn-commits] JBL Code SVN: r17284 - in labs/jbossrules/branches/temporal_rete/drools-compiler/src/test: java/org/drools/testframework and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Dec 17 09:35:23 EST 2007
Author: mgroch
Date: 2007-12-17 09:35:23 -0500 (Mon, 17 Dec 2007)
New Revision: 17284
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/testframework/MockWorkingMemory.java
labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl
Log:
JBRULES-1374
addition of an alternative insert() method which takes a duration as additional parameter in order to support durative events => adaptation of associated classes
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-17 06:40:29 UTC (rev 17283)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java 2007-12-17 14:35:23 UTC (rev 17284)
@@ -126,6 +126,12 @@
final List results_met_by = new ArrayList();
final List results_overlaps = new ArrayList();
final List results_overlapped_by = new ArrayList();
+ final List results_during = new ArrayList();
+ final List results_includes = new ArrayList();
+ final List results_starts = new ArrayList();
+ final List results_started_by = new ArrayList();
+ final List results_finishes = new ArrayList();
+ final List results_finished_by = new ArrayList();
wm.setGlobal( "results_coincides",
results_coincides );
@@ -137,6 +143,22 @@
results_meets );
wm.setGlobal( "results_met_by",
results_met_by );
+ wm.setGlobal( "results_overlaps",
+ results_overlaps );
+ wm.setGlobal( "results_overlapped_by",
+ results_overlapped_by );
+ wm.setGlobal( "results_during",
+ results_during );
+ wm.setGlobal( "results_includes",
+ results_includes );
+ wm.setGlobal( "results_starts",
+ results_starts );
+ wm.setGlobal( "results_started_by",
+ results_started_by );
+ wm.setGlobal( "results_finishes",
+ results_finishes );
+ wm.setGlobal( "results_finished_by",
+ results_finished_by );
StockTick tick1 = new StockTick( 1,
"DROO",
@@ -158,27 +180,49 @@
"ACME",
10,
System.currentTimeMillis() );
+ StockTick tick6 = new StockTick( 6,
+ "ACME",
+ 10,
+ System.currentTimeMillis() );
+ StockTick tick7 = new StockTick( 7,
+ "ACME",
+ 10,
+ System.currentTimeMillis() );
+ StockTick tick8 = new StockTick( 8,
+ "ACME",
+ 10,
+ System.currentTimeMillis() );
- InternalFactHandle handle1 = (InternalFactHandle) wm.insert( tick1 );
+ InternalFactHandle handle1 = (InternalFactHandle) wm.insert( tick1, 3 );
clock.advanceTime( 4 );
- InternalFactHandle handle2 = (InternalFactHandle) wm.insert( tick2 );
+ InternalFactHandle handle2 = (InternalFactHandle) wm.insert( tick2, 3 );
clock.advanceTime( 4 );
- InternalFactHandle handle3 = (InternalFactHandle) wm.insert( tick3 );
+ InternalFactHandle handle3 = (InternalFactHandle) wm.insert( tick3, 3 );
clock.advanceTime( 4 );
- InternalFactHandle handle4 = (InternalFactHandle) wm.insert( tick4 );
- InternalFactHandle handle5 = (InternalFactHandle) wm.insert( tick5 );
-
+ InternalFactHandle handle4 = (InternalFactHandle) wm.insert( tick4, 5 );
+ InternalFactHandle handle5 = (InternalFactHandle) wm.insert( tick5, 5 );
+ clock.advanceTime( 1 );
+ InternalFactHandle handle6 = (InternalFactHandle) wm.insert( tick6, 3 );
+ InternalFactHandle handle7 = (InternalFactHandle) wm.insert( tick7, 5 );
+ clock.advanceTime( 2 );
+ InternalFactHandle handle8 = (InternalFactHandle) wm.insert( tick8, 3 );
+
assertNotNull( handle1 );
assertNotNull( handle2 );
assertNotNull( handle3 );
assertNotNull( handle4 );
assertNotNull( handle5 );
+ assertNotNull( handle6 );
+ assertNotNull( handle7 );
+ assertNotNull( handle8 );
assertTrue( handle1.isEvent() );
assertTrue( handle2.isEvent() );
assertTrue( handle3.isEvent() );
assertTrue( handle4.isEvent() );
- assertTrue( handle5.isEvent() );
+ assertTrue( handle6.isEvent() );
+ assertTrue( handle7.isEvent() );
+ assertTrue( handle8.isEvent() );
wm.fireAllRules();
@@ -197,12 +241,10 @@
assertEquals( tick3,
results_after.get( 0 ) );
- assertEquals( 2,
+ assertEquals( 1,
results_meets.size() );
- assertEquals( tick5,
+ assertEquals( tick3,
results_meets.get( 0 ) );
- assertEquals( tick3,
- results_meets.get( 1 ) );
assertEquals( 1,
results_met_by.size() );
@@ -213,6 +255,47 @@
results_met_by.size() );
assertEquals( tick2,
results_met_by.get( 0 ) );
+
+ assertEquals( 1,
+ results_overlaps.size() );
+ assertEquals( tick4,
+ results_overlaps.get( 0 ) );
+
+ assertEquals( 1,
+ results_overlapped_by.size() );
+ assertEquals( tick7,
+ results_overlapped_by.get( 0 ) );
+
+ assertEquals( 1,
+ results_during.size() );
+ assertEquals( tick6,
+ results_during.get( 0 ) );
+
+ assertEquals( 1,
+ results_includes.size() );
+ assertEquals( tick4,
+ results_includes.get( 0 ) );
+
+ assertEquals( 1,
+ results_starts.size() );
+ assertEquals( tick6,
+ results_starts.get( 0 ) );
+
+ assertEquals( 1,
+ results_started_by.size() );
+ assertEquals( tick7,
+ results_started_by.get( 0 ) );
+
+ assertEquals( 1,
+ results_finishes.size() );
+ assertEquals( tick8,
+ results_finishes.get( 0 ) );
+
+ assertEquals( 1,
+ results_finished_by.size() );
+ assertEquals( tick7,
+ results_finished_by.get( 0 ) );
+
}
public void testSimpleTimeWindow() throws Exception {
Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2007-12-17 06:40:29 UTC (rev 17283)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2007-12-17 14:35:23 UTC (rev 17284)
@@ -245,12 +245,24 @@
this.facts .add(object);
return new MockFactHandle(object.hashCode());
}
+
+ public FactHandle insert(Object object, long duration)
+ throws FactException {
+ // TODO Auto-generated method stub
+ return null;
+ }
public FactHandle insert(Object object, boolean dynamic)
throws FactException {
// TODO Auto-generated method stub
return null;
}
+
+ public FactHandle insert(Object object, long duration, boolean dynamic)
+ throws FactException {
+ // TODO Auto-generated method stub
+ return null;
+ }
public Iterator iterateFactHandles() {
// TODO Auto-generated method stub
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-17 06:40:29 UTC (rev 17283)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl 2007-12-17 14:35:23 UTC (rev 17284)
@@ -7,19 +7,19 @@
global java.util.List results_before;
global java.util.List results_meets;
global java.util.List results_met_by;
-/*global java.util.List results_overlaps;
+global java.util.List results_overlaps;
global java.util.List results_overlapped_by;
global java.util.List results_during;
global java.util.List results_includes;
global java.util.List results_starts;
global java.util.List results_started_by;
global java.util.List results_finishes;
-global java.util.List results_finished_by;*/
+global java.util.List results_finished_by;
rule "coincides operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this ~coincides[2] $a )
+ $b : StockTick( company == "ACME", this ~coincides $a )
then
results_coincides.add( $b );
end
@@ -27,7 +27,7 @@
rule "before operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this ~before[5,10] $a )
+ $b : StockTick( company == "ACME", this ~before[5,8] $a )
then
results_before.add( $b );
end
@@ -35,7 +35,7 @@
rule "after operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this ~after[5,10] $a )
+ $b : StockTick( company == "ACME", this ~after[5,8] $a )
then
results_after.add( $b );
end
@@ -43,7 +43,7 @@
rule "meets operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this ~meets[4] $a )
+ $b : StockTick( company == "ACME", this ~meets[1] $a )
then
results_meets.add( $b );
end
@@ -51,16 +51,16 @@
rule "met-by operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this ~metby[4] $a )
+ $b : StockTick( company == "ACME", this ~metby[1] $a )
then
results_met_by.add( $b );
end
-/*
+
rule "overlaps operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "DROO", this ~overlaps[4] $a )
+ $b : StockTick( company == "DROO", this ~overlaps[1] $a )
then
results_overlaps.add( $b );
end
@@ -68,7 +68,7 @@
rule "overlapped-by operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this ~overlappedby[4] $a )
+ $b : StockTick( company == "ACME", this ~overlappedby[1] $a )
then
results_overlapped_by.add( $b );
end
@@ -76,7 +76,7 @@
rule "during operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this ~during[2,0] $a )
+ $b : StockTick( company == "ACME", this ~during[1] $a )
then
results_during.add( $b );
end
@@ -84,15 +84,15 @@
rule "includes operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "DROO", this ~includes[2,0] $a )
+ $b : StockTick( company == "DROO", this ~includes[1] $a )
then
results_includes.add( $b );
end
rule "starts operator"
when
- $a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this ~starts[2,0,1] $a )
+ $a : StockTick( company == "ACME" )
+ $b : StockTick( company == "ACME", this ~starts[2] $a )
then
results_starts.add( $b );
end
@@ -100,14 +100,14 @@
rule "started-by operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "DROO", this ~startedby[2,0,1] $a )
+ $b : StockTick( company == "ACME", this ~startedby[2] $a )
then
results_started_by.add( $b );
end
rule "finishes operator"
when
- $a : StockTick( company == "DROO" )
+ $a : StockTick( company == "ACME" )
$b : StockTick( company == "ACME", this ~finishes[2] $a )
then
results_finishes.add( $b );
@@ -116,7 +116,7 @@
rule "finished-by operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "DROO", this ~finishedby[2] $a )
+ $b : StockTick( company == "ACME", this ~finishedby[2] $a )
then
results_finished_by.add( $b );
-end*/
\ No newline at end of file
+end
\ No newline at end of file
More information about the jboss-svn-commits
mailing list