Skip to content

Commit

Permalink
import fix (JBRULES-380) and test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Marco Rietveld committed Feb 8, 2012
1 parent 209ec88 commit 0770ea9
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 88 deletions.
20 changes: 20 additions & 0 deletions jbpm-flow-builder/src/test/java/org/jbpm/JbpmBaseTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package org.jbpm;

import junit.framework.Assert;

import org.drools.compiler.ProcessBuilderFactory;
import org.drools.marshalling.impl.ProcessMarshallerFactory;
import org.drools.runtime.process.ProcessRuntimeFactory;
import org.jbpm.marshalling.impl.ProcessMarshallerFactoryServiceImpl;
import org.jbpm.process.builder.ProcessBuilderFactoryServiceImpl;
import org.jbpm.process.instance.ProcessRuntimeFactoryServiceImpl;

public abstract class JbpmBaseTest extends Assert {

static {
ProcessBuilderFactory.setProcessBuilderFactoryService(new ProcessBuilderFactoryServiceImpl());
ProcessMarshallerFactory.setProcessMarshallerFactoryService(new ProcessMarshallerFactoryServiceImpl());
ProcessRuntimeFactory.setProcessRuntimeFactoryService(new ProcessRuntimeFactoryServiceImpl());
}

}
160 changes: 84 additions & 76 deletions jbpm-flow-builder/src/test/java/org/jbpm/integrationtests/ProcessEventListenerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,52 +35,17 @@
import org.drools.event.process.ProcessVariableChangedEvent;
import org.drools.rule.Package;
import org.drools.runtime.process.ProcessInstance;
import org.jbpm.JbpmTestCase;
import org.jbpm.JbpmBaseTest;
import org.jbpm.process.core.context.variable.VariableScope;
import org.jbpm.process.instance.context.variable.VariableScopeInstance;
import org.junit.Test;

public class ProcessEventListenerTest extends JbpmTestCase{
public class ProcessEventListenerTest extends JbpmBaseTest {

@Test
public void testInternalNodeSignalEvent() {
PackageBuilder builder = new PackageBuilder();
Reader source = new StringReader(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<process xmlns=\"http://drools.org/drools-5.0/process\"\n" +
" xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
" xs:schemaLocation=\"http://drools.org/drools-5.0/process drools-processes-5.0.xsd\"\n" +
" type=\"RuleFlow\" name=\"flow\" id=\"org.drools.event\" package-name=\"org.drools\" version=\"1\" >\n" +
"\n" +
" <header>\n" +
" <variables>\n" +
" <variable name=\"MyVar\" >\n" +
" <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
" <value>SomeText</value>\n" +
" </variable>\n" +
" </variables>\n" +
" </header>\n" +
"\n" +
" <nodes>\n" +
" <start id=\"1\" name=\"Start\" />\n" +
" <eventNode id=\"2\" name=\"Event\" variableName=\"MyVar\" >\n" +
" <eventFilters>\n" +
" <eventFilter type=\"eventType\" eventType=\"MyEvent\" />\n" +
" </eventFilters>\n" +
" </eventNode>\n" +
" <actionNode id=\"3\" name=\"Signal Event\" >\n" +
" <action type=\"expression\" dialect=\"java\" >context.getProcessInstance().signalEvent(\"MyEvent\", \"MyValue\");</action>\n" +
" </actionNode>\n" +
" <join id=\"4\" name=\"Join\" type=\"1\" />\n" +
" <end id=\"5\" name=\"End\" />\n" +
" </nodes>\n" +
"\n" +
" <connections>\n" +
" <connection from=\"1\" to=\"3\" />\n" +
" <connection from=\"2\" to=\"4\" />\n" +
" <connection from=\"3\" to=\"4\" />\n" +
" <connection from=\"4\" to=\"5\" />\n" +
" </connections>\n" +
"\n" +
"</process>");
Reader source = new StringReader(process);
builder.addRuleFlow(source);
Package pkg = builder.getPackage();
RuleBase ruleBase = RuleBaseFactory.newRuleBase();
Expand All @@ -89,62 +54,105 @@ public void testInternalNodeSignalEvent() {

final List<ProcessEvent> processEventList = new ArrayList<ProcessEvent>();

final ProcessEventListener listener = new ProcessEventListener() {
final ProcessEventListener listener = createProcessEventListener(processEventList);

public void afterNodeLeft(ProcessNodeLeftEvent event) {
processEventList.add(event);
}
((InternalWorkingMemory)session).getProcessRuntime().addEventListener(listener);
ProcessInstance processInstance =
((InternalWorkingMemory)session).getProcessRuntime().startProcess("org.drools.event");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
assertEquals("MyValue", ((VariableScopeInstance)
((org.jbpm.process.instance.ProcessInstance) processInstance)
.getContextInstance(VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
assertEquals( 28, processEventList.size() );
for (ProcessEvent e: processEventList) {
System.out.println(e);
}
assertEquals( "org.drools.event", ((ProcessStartedEvent) processEventList.get(2)).getProcessInstance().getProcessId());

}

private ProcessEventListener createProcessEventListener(final List<ProcessEvent> processEventList) {
return new ProcessEventListener() {

public void afterNodeTriggered(ProcessNodeTriggeredEvent event) {
public void afterNodeLeft(ProcessNodeLeftEvent event) {
processEventList.add(event);
}
}

public void afterProcessCompleted(ProcessCompletedEvent event) {
public void afterNodeTriggered(ProcessNodeTriggeredEvent event) {
processEventList.add(event);
}
}

public void afterProcessStarted(ProcessStartedEvent event) {
public void afterProcessCompleted(ProcessCompletedEvent event) {
processEventList.add(event);
}
}

public void beforeNodeLeft(ProcessNodeLeftEvent event) {
public void afterProcessStarted(ProcessStartedEvent event) {
processEventList.add(event);
}
}

public void beforeNodeTriggered(ProcessNodeTriggeredEvent event) {
public void beforeNodeLeft(ProcessNodeLeftEvent event) {
processEventList.add(event);
}
}

public void beforeProcessCompleted(ProcessCompletedEvent event) {
public void beforeNodeTriggered(ProcessNodeTriggeredEvent event) {
processEventList.add(event);
}
}

public void beforeProcessStarted(ProcessStartedEvent event) {
public void beforeProcessCompleted(ProcessCompletedEvent event) {
processEventList.add(event);
}
}

public void beforeVariableChanged(ProcessVariableChangedEvent event) {
public void beforeProcessStarted(ProcessStartedEvent event) {
processEventList.add(event);
}
}

public void afterVariableChanged(ProcessVariableChangedEvent event) {
public void beforeVariableChanged(ProcessVariableChangedEvent event) {
processEventList.add(event);
}
}

public void afterVariableChanged(ProcessVariableChangedEvent event) {
processEventList.add(event);
}
};

((InternalWorkingMemory)session).getProcessRuntime().addEventListener(listener);
ProcessInstance processInstance =
((InternalWorkingMemory)session).getProcessRuntime().startProcess("org.drools.event");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
assertEquals("MyValue", ((VariableScopeInstance)
((org.jbpm.process.instance.ProcessInstance) processInstance)
.getContextInstance(VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
assertEquals( 28, processEventList.size() );
for (ProcessEvent e: processEventList) {
System.out.println(e);
}
assertEquals( "org.drools.event", ((ProcessStartedEvent) processEventList.get(2)).getProcessInstance().getProcessId());

}

private static final String process =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<process xmlns=\"http://drools.org/drools-5.0/process\"\n" +
" xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
" xs:schemaLocation=\"http://drools.org/drools-5.0/process drools-processes-5.0.xsd\"\n" +
" type=\"RuleFlow\" name=\"flow\" id=\"org.drools.event\" package-name=\"org.drools\" version=\"1\" >\n" +
"\n" +
" <header>\n" +
" <variables>\n" +
" <variable name=\"MyVar\" >\n" +
" <type name=\"org.drools.process.core.datatype.impl.type.StringDataType\" />\n" +
" <value>SomeText</value>\n" +
" </variable>\n" +
" </variables>\n" +
" </header>\n" +
"\n" +
" <nodes>\n" +
" <start id=\"1\" name=\"Start\" />\n" +
" <eventNode id=\"2\" name=\"Event\" variableName=\"MyVar\" >\n" +
" <eventFilters>\n" +
" <eventFilter type=\"eventType\" eventType=\"MyEvent\" />\n" +
" </eventFilters>\n" +
" </eventNode>\n" +
" <actionNode id=\"3\" name=\"Signal Event\" >\n" +
" <action type=\"expression\" dialect=\"java\" >context.getProcessInstance().signalEvent(\"MyEvent\", \"MyValue\");</action>\n" +
" </actionNode>\n" +
" <join id=\"4\" name=\"Join\" type=\"1\" />\n" +
" <end id=\"5\" name=\"End\" />\n" +
" </nodes>\n" +
"\n" +
" <connections>\n" +
" <connection from=\"1\" to=\"3\" />\n" +
" <connection from=\"2\" to=\"4\" />\n" +
" <connection from=\"3\" to=\"4\" />\n" +
" <connection from=\"4\" to=\"5\" />\n" +
" </connections>\n" +
"\n" +
"</process>";

}
4 changes: 2 additions & 2 deletions jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/MilestoneNodeInstance.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@

import org.drools.common.InternalFactHandle;
import org.drools.common.InternalKnowledgeRuntime;
import org.drools.event.RuleFlowGroupActivatedEvent;
import org.drools.event.RuleFlowGroupDeactivatedEvent;
import org.drools.event.rule.ActivationCancelledEvent;
import org.drools.event.rule.ActivationCreatedEvent;
import org.drools.event.rule.AfterActivationFiredEvent;
import org.drools.event.rule.AgendaEventListener;
import org.drools.event.rule.AgendaGroupPoppedEvent;
import org.drools.event.rule.AgendaGroupPushedEvent;
import org.drools.event.rule.BeforeActivationFiredEvent;
import org.drools.event.rule.RuleFlowGroupActivatedEvent;
import org.drools.event.rule.RuleFlowGroupDeactivatedEvent;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.rule.Declaration;
import org.drools.rule.Rule;
Expand Down
27 changes: 17 additions & 10 deletions jbpm-flow/src/test/java/org/jbpm/process/TimerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.jbpm.process;

import junit.framework.Assert;

import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.common.AbstractRuleBase;
Expand All @@ -24,21 +26,26 @@
import org.drools.concurrent.DefaultExecutorService;
import org.drools.concurrent.ExecutorService;
import org.drools.reteoo.ReteooStatefulSession;
import org.jbpm.JbpmTestCase;
import org.drools.runtime.process.ProcessRuntimeFactory;
import org.jbpm.process.instance.InternalProcessRuntime;
import org.jbpm.process.instance.ProcessRuntimeFactoryServiceImpl;
import org.jbpm.process.instance.timer.TimerInstance;
import org.jbpm.process.instance.timer.TimerManager;
import org.jbpm.ruleflow.instance.RuleFlowProcessInstance;
import org.junit.Ignore;
import org.junit.Test;

public class TimerTest extends JbpmTestCase {
public class TimerTest extends Assert {

private int counter = 0;

public void testEmpty() {

}

public void FIXMEtestTimer() {

static {
ProcessRuntimeFactory.setProcessRuntimeFactoryService(new ProcessRuntimeFactoryServiceImpl());
}

@Test
@Ignore
public void testTimer() {
AbstractRuleBase ruleBase = (AbstractRuleBase) RuleBaseFactory.newRuleBase();
ExecutorService executorService = new DefaultExecutorService();
final StatefulSession workingMemory = new ReteooStatefulSession(1, ruleBase, executorService);
Expand All @@ -56,8 +63,8 @@ public void signalEvent(String type, Object event) {
};
processInstance.setKnowledgeRuntime(((InternalWorkingMemory) workingMemory).getKnowledgeRuntime());
processInstance.setId(1234);
((InternalProcessRuntime) ((InternalWorkingMemory) workingMemory).getProcessRuntime()).getProcessInstanceManager()
.internalAddProcessInstance(processInstance);
InternalProcessRuntime processRuntime = ((InternalProcessRuntime) ((InternalWorkingMemory) workingMemory).getProcessRuntime());
processRuntime.getProcessInstanceManager().internalAddProcessInstance(processInstance);

new Thread(new Runnable() {
public void run() {
Expand Down

0 comments on commit 0770ea9

Please sign in to comment.