Skip to content

Commit

Permalink
[DROOLS-1025] new tests + improved flush + implement insertPeerRightT…
Browse files Browse the repository at this point in the history 
…uple
  • Loading branch information
@mariofusco
Mark Proctor authored and mariofusco committed Mar 9, 2016
1 parent 8d52a6a commit d1cdd56
Show file tree
Hide file tree
Showing 11 changed files with 478 additions and 262 deletions.
16 changes: 0 additions & 16 deletions ...ompiler/integrationtests/incrementalcompilation/AbstractAddRemoveGenerated2RulesTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ private static List<String> getConstraintsCombinations(final List<String> constr
@Test(timeout = 10000)
public void testInsertFactsFireRulesRemoveRules() {
checkRunTurtleTests();
logger.info("Rule 1: \n" + rule1);
logger.info("Rule 2: \n" + rule2);
final List<List<TestOperation>> testPlans =
AddRemoveTestBuilder.createInsertFactsFireRulesRemoveRulesTestPlan(
rule1, rule2, RULE1_NAME, RULE2_NAME, getFacts());
Expand All @@ -95,8 +93,6 @@ public void testInsertFactsFireRulesRemoveRules() {
@Test(timeout = 10000)
public void testInsertFactsFireRulesRemoveRulesRevertedRules() {
checkRunTurtleTests();
logger.info("Rule 1: \n" + rule2);
logger.info("Rule 2: \n" + rule1);
final List<List<TestOperation>> testPlans =
AddRemoveTestBuilder.createInsertFactsFireRulesRemoveRulesTestPlan(
rule2, rule1, RULE2_NAME, RULE1_NAME, getFacts());
Expand All @@ -107,8 +103,6 @@ public void testInsertFactsFireRulesRemoveRulesRevertedRules() {
@Test(timeout = 10000)
public void testFireRulesInsertFactsFireRulesRemoveRules() {
checkRunTurtleTests();
logger.info("Rule 1: \n" + rule1);
logger.info("Rule 2: \n" + rule2);
final List<List<TestOperation>> testPlans =
AddRemoveTestBuilder.createFireRulesInsertFactsFireRulesRemoveRulesTestPlan(
rule1, rule2, RULE1_NAME, RULE2_NAME, getFacts());
Expand All @@ -119,8 +113,6 @@ public void testFireRulesInsertFactsFireRulesRemoveRules() {
@Test(timeout = 10000)
public void testFireRulesInsertFactsFireRulesRemoveRulesRevertedRules() {
checkRunTurtleTests();
logger.info("Rule 1: \n" + rule2);
logger.info("Rule 2: \n" + rule1);
final List<List<TestOperation>> testPlans =
AddRemoveTestBuilder.createFireRulesInsertFactsFireRulesRemoveRulesTestPlan(
rule2, rule1, RULE2_NAME, RULE1_NAME, getFacts());
Expand All @@ -131,8 +123,6 @@ public void testFireRulesInsertFactsFireRulesRemoveRulesRevertedRules() {
@Test(timeout = 10000)
public void testInsertFactsRemoveRulesFireRulesRemoveRules() {
checkRunTurtleTests();
logger.info("Rule 1: \n" + rule1);
logger.info("Rule 2: \n" + rule2);
final List<List<TestOperation>> testPlans =
AddRemoveTestBuilder.createInsertFactsRemoveRulesFireRulesRemoveRulesTestPlan(
rule1, rule2, RULE1_NAME, RULE2_NAME, getFacts());
Expand All @@ -143,8 +133,6 @@ public void testInsertFactsRemoveRulesFireRulesRemoveRules() {
@Test(timeout = 10000)
public void testInsertFactsRemoveRulesFireRulesRemoveRulesRevertedRules() {
checkRunTurtleTests();
logger.info("Rule 1: \n" + rule2);
logger.info("Rule 2: \n" + rule1);
final List<List<TestOperation>> testPlans =
AddRemoveTestBuilder.createInsertFactsRemoveRulesFireRulesRemoveRulesTestPlan(
rule2, rule1, RULE2_NAME, RULE1_NAME, getFacts());
Expand All @@ -155,8 +143,6 @@ public void testInsertFactsRemoveRulesFireRulesRemoveRulesRevertedRules() {
@Test(timeout = 10000)
public void testInsertFactsFireRulesRemoveRulesReinsertRules() {
checkRunTurtleTests();
logger.info("Rule 1: \n" + rule1);
logger.info("Rule 2: \n" + rule2);
final List<List<TestOperation>> testPlans =
AddRemoveTestBuilder.createInsertFactsFireRulesRemoveRulesReinsertRulesTestPlan(
rule1, rule2, RULE1_NAME, RULE2_NAME, getFacts());
Expand All @@ -167,8 +153,6 @@ public void testInsertFactsFireRulesRemoveRulesReinsertRules() {
@Test(timeout = 10000)
public void testInsertFactsFireRulesRemoveRulesReinsertRulesRevertedRules() {
checkRunTurtleTests();
logger.info("Rule 1: \n" + rule2);
logger.info("Rule 2: \n" + rule1);
final List<List<TestOperation>> testPlans =
AddRemoveTestBuilder.createInsertFactsFireRulesRemoveRulesReinsertRulesTestPlan(
rule2, rule1, RULE2_NAME, RULE1_NAME, getFacts());
Expand Down
78 changes: 39 additions & 39 deletions ...g/drools/compiler/integrationtests/incrementalcompilation/AbstractAddRemoveRulesTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,47 +116,47 @@ protected StatefulKnowledgeSession runAddRemoveTest(final List<TestOperation> te
if (testOperationType != TestOperationType.CREATE_SESSION) {
checkSessionInitialized(session);
}
switch (testOperationType) {
case CREATE_SESSION:
session = createNewSession((String[]) testOperationParameter, resultsList, additionalGlobals);
break;
case ADD_RULES:
addRulesToSession(session, (String[]) testOperationParameter, false);
break;
case ADD_RULES_REINSERT_OLD:
addRulesToSession(session, (String[]) testOperationParameter, true);
break;
case REMOVE_RULES:
removeRulesFromSession(session, (String[]) testOperationParameter);
break;
case FIRE_RULES:
try {
try {
switch (testOperationType) {
case CREATE_SESSION:
session = createNewSession((String[]) testOperationParameter, resultsList, additionalGlobals);
break;
case ADD_RULES:
addRulesToSession(session, (String[]) testOperationParameter, false);
break;
case ADD_RULES_REINSERT_OLD:
addRulesToSession(session, (String[]) testOperationParameter, true);
break;
case REMOVE_RULES:
removeRulesFromSession(session, (String[]) testOperationParameter);
break;
case FIRE_RULES:
session.fireAllRules();
} catch (Exception e) {
throw new RuntimeException( createTestFailMessage(testOperations, index, null, null), e );
}
break;
case CHECK_RESULTS:
final Set<String> expectedResultsSet = new HashSet<String>();
expectedResultsSet.addAll(Arrays.asList((String[])testOperationParameter));
if (expectedResultsSet.size() > 0) {
break;
case CHECK_RESULTS:
final Set<String> expectedResultsSet = new HashSet<String>();
expectedResultsSet.addAll(Arrays.asList((String[]) testOperationParameter));
if (expectedResultsSet.size() > 0) {
assertTrue(createTestFailMessage(testOperations, index, expectedResultsSet, resultsList),
resultsList.size() > 0);
}
assertTrue(createTestFailMessage(testOperations, index, expectedResultsSet, resultsList),
resultsList.size() > 0);
}
assertTrue(createTestFailMessage(testOperations, index, expectedResultsSet, resultsList),
expectedResultsSet.containsAll(resultsList));
assertTrue(createTestFailMessage(testOperations, index, expectedResultsSet, resultsList),
resultsList.containsAll(expectedResultsSet));
resultsList.clear();
break;
case INSERT_FACTS:
insertFactsIntoSession(session, (Object[]) testOperationParameter);
break;
case DUMP_RETE:
ReteDumper.dumpRete( (KieSession)session );
break;
default:
throw new IllegalArgumentException("Unsupported test operation: " + testOperationType + "!");
expectedResultsSet.containsAll(resultsList));
assertTrue(createTestFailMessage(testOperations, index, expectedResultsSet, resultsList),
resultsList.containsAll(expectedResultsSet));
resultsList.clear();
break;
case INSERT_FACTS:
insertFactsIntoSession(session, (Object[]) testOperationParameter);
break;
case DUMP_RETE:
ReteDumper.dumpRete((KieSession) session);
break;
default:
throw new IllegalArgumentException("Unsupported test operation: " + testOperationType + "!");
}
} catch (Exception e) {
throw new RuntimeException(createTestFailMessage(testOperations, index, null, null), e);
}
index++;
}
Expand Down
22 changes: 22 additions & 0 deletions .../compiler/integrationtests/incrementalcompilation/AddRemoveGenerated2RulesNotNotTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package org.drools.compiler.integrationtests.incrementalcompilation;

import java.util.Collection;

import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;

@RunWith(Parameterized.class)
public class AddRemoveGenerated2RulesNotNotTest extends AbstractAddRemoveGenerated2RulesTest {

public AddRemoveGenerated2RulesNotNotTest(final ConstraintsPair constraintsPair) {
super(constraintsPair);
}

@Parameterized.Parameters
public static Collection<ConstraintsPair[]> getRulesConstraints() {
return generateRulesConstraintsCombinations(
" Integer() \n",
" Integer() not(not(exists(Integer() and Integer()))) \n",
" exists(Integer() and exists(Integer() and Integer())) \n");
}
}
Loading

0 comments on commit d1cdd56

Please sign in to comment.