Skip to content

Commit

Permalink
JBRULES-3052: fixing from accumulate
Browse files Browse the repository at this point in the history
  • Loading branch information
@etirelli
etirelli committed May 26, 2011
1 parent e615a47 commit 0054ce1
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 46 deletions.
12 changes: 0 additions & 12 deletions drools-compiler/src/main/java/org/drools/lang/DRLParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3042,18 +3042,6 @@ private void fromAccumulate( PatternDescrBuilder< ? > pattern ) throws Recogniti
// accumulate functions
accumulateFunction( accumulate );
if ( state.failed ) return;

while ( input.LA( 1 ) == DRLLexer.COMMA ) {
match( input,
DRLLexer.COMMA,
null,
null,
DroolsEditorType.SYMBOL );
if ( state.failed ) return;

accumulateFunction( accumulate );
if ( state.failed ) return;
}
}

match( input,
Expand Down
138 changes: 104 additions & 34 deletions drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,19 @@ public KnowledgeBase loadKnowledgeBase( final String resource,

}

public KnowledgeBase loadKnowledgeBaseFromString( final String content ) {
final KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
kbuilder.add( ResourceFactory.newReaderResource( new StringReader( content ) ),
ResourceType.DRL );
if ( kbuilder.hasErrors() ) {
fail( kbuilder.getErrors().toString() );
}

final KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
return kbase;
}

@Test
public void testAccumulateModify() throws Exception {
// read in the source
Expand Down Expand Up @@ -930,17 +943,17 @@ public void testAccumulateCollectSetJava() throws Exception {
public void testAccumulateCollectSetMVEL() throws Exception {
execTestAccumulateCollectSet( "test_AccumulateCollectSetMVEL.drl" );
}

@Test
public void testAccumulateMultipleFunctionsJava() throws Exception {
execTestAccumulateMultipleFunctions( "test_AccumulateMultipleFunctions.drl" );
}

@Test
public void testAccumulateMultipleFunctionsMVEL() throws Exception {
execTestAccumulateMultipleFunctions( "test_AccumulateMultipleFunctionsMVEL.drl" );
}

public void execTestAccumulateSum( String fileName ) throws Exception {
// read in the source
final Reader reader = new InputStreamReader( getClass().getResourceAsStream( fileName ) );
Expand Down Expand Up @@ -1648,26 +1661,24 @@ public void testAccumulateZeroParams() {
kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
}




public void execTestAccumulateMultipleFunctions( String fileName ) throws Exception {
KnowledgeBase kbase = loadKnowledgeBase( fileName, null );
KnowledgeBase kbase = loadKnowledgeBase( fileName,
null );
StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();

AgendaEventListener ael = mock( AgendaEventListener.class );
ksession.addEventListener( ael );

final Cheese[] cheese = new Cheese[]{ new Cheese( "stilton",
10 ),
final Cheese[] cheese = new Cheese[]{new Cheese( "stilton",
10 ),
new Cheese( "stilton",
3 ),
3 ),
new Cheese( "stilton",
5 ),
5 ),
new Cheese( "brie",
15 ),
15 ),
new Cheese( "brie",
17 ),
17 ),
new Cheese( "provolone",
8 )};
final Person bob = new Person( "Bob",
Expand All @@ -1678,58 +1689,70 @@ public void execTestAccumulateMultipleFunctions( String fileName ) throws Except
cheeseHandles[i] = (FactHandle) ksession.insert( cheese[i] );
}
final FactHandle bobHandle = (FactHandle) ksession.insert( bob );

// ---------------- 1st scenario
ksession.fireAllRules();
ArgumentCaptor<AfterActivationFiredEvent> cap = ArgumentCaptor.forClass(AfterActivationFiredEvent.class);

ArgumentCaptor<AfterActivationFiredEvent> cap = ArgumentCaptor.forClass( AfterActivationFiredEvent.class );
Mockito.verify( ael ).afterActivationFired( cap.capture() );

Activation activation = cap.getValue().getActivation();
assertThat( ((Number)activation.getDeclarationValue( "$sum" )).intValue(), is( 18 ) );
assertThat( ((Number)activation.getDeclarationValue( "$min" )).intValue(), is( 3 ) );
assertThat( ((Number)activation.getDeclarationValue( "$avg" )).intValue(), is( 6 ) );
assertThat( ((Number) activation.getDeclarationValue( "$sum" )).intValue(),
is( 18 ) );
assertThat( ((Number) activation.getDeclarationValue( "$min" )).intValue(),
is( 3 ) );
assertThat( ((Number) activation.getDeclarationValue( "$avg" )).intValue(),
is( 6 ) );

Mockito.reset( ael );
// ---------------- 2nd scenario
final int index = 1;
cheese[index].setPrice( 9 );
ksession.update( cheeseHandles[index],
cheese[index] );
cheese[index] );
ksession.fireAllRules();

Mockito.verify( ael ).afterActivationFired( cap.capture() );

activation = cap.getValue().getActivation();
assertThat( ((Number)activation.getDeclarationValue( "$sum" )).intValue(), is( 24 ) );
assertThat( ((Number)activation.getDeclarationValue( "$min" )).intValue(), is( 5 ) );
assertThat( ((Number)activation.getDeclarationValue( "$avg" )).intValue(), is( 8 ) );
assertThat( ((Number) activation.getDeclarationValue( "$sum" )).intValue(),
is( 24 ) );
assertThat( ((Number) activation.getDeclarationValue( "$min" )).intValue(),
is( 5 ) );
assertThat( ((Number) activation.getDeclarationValue( "$avg" )).intValue(),
is( 8 ) );

Mockito.reset( ael );
// ---------------- 3rd scenario
bob.setLikes( "brie" );
ksession.update( bobHandle,
bob );
bob );
ksession.fireAllRules();

Mockito.verify( ael ).afterActivationFired( cap.capture() );

activation = cap.getValue().getActivation();
assertThat( ((Number)activation.getDeclarationValue( "$sum" )).intValue(), is( 32 ) );
assertThat( ((Number)activation.getDeclarationValue( "$min" )).intValue(), is( 15 ) );
assertThat( ((Number)activation.getDeclarationValue( "$avg" )).intValue(), is( 16 ) );
assertThat( ((Number) activation.getDeclarationValue( "$sum" )).intValue(),
is( 32 ) );
assertThat( ((Number) activation.getDeclarationValue( "$min" )).intValue(),
is( 15 ) );
assertThat( ((Number) activation.getDeclarationValue( "$avg" )).intValue(),
is( 16 ) );

Mockito.reset( ael );
// ---------------- 4th scenario
ksession.retract( cheeseHandles[3] );
ksession.fireAllRules();

Mockito.verify( ael ).afterActivationFired( cap.capture() );

activation = cap.getValue().getActivation();
assertThat( ((Number)activation.getDeclarationValue( "$sum" )).intValue(), is( 17 ) );
assertThat( ((Number)activation.getDeclarationValue( "$min" )).intValue(), is( 17 ) );
assertThat( ((Number)activation.getDeclarationValue( "$avg" )).intValue(), is( 17 ) );
assertThat( ((Number) activation.getDeclarationValue( "$sum" )).intValue(),
is( 17 ) );
assertThat( ((Number) activation.getDeclarationValue( "$min" )).intValue(),
is( 17 ) );
assertThat( ((Number) activation.getDeclarationValue( "$avg" )).intValue(),
is( 17 ) );
}

public static class DataSet {
Expand All @@ -1739,4 +1762,51 @@ public static class DataSet {
public FactHandle bobHandle;
public List< ? > results;
}

@Test
public void testAccumulateMinMax() throws Exception {
String drl = "package org.drools.test \n" +
"import org.drools.Cheese \n" +
"global java.util.List results \n " +
"rule minMax \n" +
"when \n" +
" accumulate( Cheese( $p: price ), $min: min($p), $max: max($p) ) \n" +
"then \n" +
" results.add($min); results.add($max); \n" +
"end \n";

KnowledgeBase kbase = loadKnowledgeBaseFromString( drl );
StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();

final List<Number> results = new ArrayList<Number>();
ksession.setGlobal( "results",
results );
final Cheese[] cheese = new Cheese[]{new Cheese( "Emmentaler",
4 ),
new Cheese( "Appenzeller",
6 ),
new Cheese( "Greyerzer",
2 ),
new Cheese( "Raclette",
3 ),
new Cheese( "Olmützer Quargel",
15 ),
new Cheese( "Brie",
17 ),
new Cheese( "Dolcelatte",
8 )};

for ( int i = 0; i < cheese.length; i++ ) {
ksession.insert( cheese[i] );
}

// ---------------- 1st scenario
ksession.fireAllRules();
assertEquals( 2,
results.size() );
assertEquals( results.get( 0 ).intValue(),
2 );
assertEquals( results.get( 1 ).intValue(),
17 );
}
}

0 comments on commit 0054ce1

Please sign in to comment.